97 files changed, 1548 insertions, 950 deletions
diff --git a/common/changereplay.cpp b/common/changereplay.cpp
index 0096bd0..4b7d593 100644
--- a/common/changereplay.cpp
+++ b/common/changereplay.cpp
@@ -26,13 +26,12 @@
 using namespace Sink;
-#undef DEBUG_AREA
+SINK_DEBUG_AREA("changereplay");
-#define DEBUG_AREA "resource.changereplay"
 ChangeReplay::ChangeReplay(const QByteArray &resourceName)
    : mStorage(storageLocation(), resourceName, Storage::ReadOnly), mChangeReplayStore(storageLocation(), resourceName + ".changereplay", Storage::ReadWrite), mReplayInProgress(false)
 {
-    Trace() << "Created change replay: " << resourceName;
+    SinkTrace() << "Created change replay: " << resourceName;
 }
 qint64 ChangeReplay::getLastReplayedRevision()
@@ -51,10 +50,10 @@ qint64 ChangeReplay::getLastReplayedRevision()
 bool ChangeReplay::allChangesReplayed()
 {
    const qint64 topRevision = Storage::maxRevision(mStorage.createTransaction(Storage::ReadOnly, [](const Sink::Storage::Error &error) {
-        Warning() << error.message;
+        SinkWarning() << error.message;
    }));
    const qint64 lastReplayedRevision = getLastReplayedRevision();
-    Trace() << "All changes replayed " << topRevision << lastReplayedRevision;
+    SinkTrace() << "All changes replayed " << topRevision << lastReplayedRevision;
    return (lastReplayedRevision >= topRevision);
 }
@@ -62,10 +61,10 @@ KAsync::Job<void> ChangeReplay::replayNextRevision()
 {
    mReplayInProgress = true;
    auto mainStoreTransaction = mStorage.createTransaction(Storage::ReadOnly, [](const Sink::Storage::Error &error) {
-        Warning() << error.message;
+        SinkWarning() << error.message;
    });
    auto replayStoreTransaction = mChangeReplayStore.createTransaction(Storage::ReadOnly, [](const Sink::Storage::Error &error) {
-        Warning() << error.message;
+        SinkWarning() << error.message;
    });
    qint64 lastReplayedRevision = 0;
    replayStoreTransaction.openDatabase().scan("lastReplayedRevision",
@@ -78,14 +77,14 @@ KAsync::Job<void> ChangeReplay::replayNextRevision()
    auto recordReplayedRevision = [this](qint64 revision) {
        auto replayStoreTransaction = mChangeReplayStore.createTransaction(Storage::ReadWrite, [](const Sink::Storage::Error &error) {
-            Warning() << error.message;
+            SinkWarning() << error.message;
        });
        replayStoreTransaction.openDatabase().write("lastReplayedRevision", QByteArray::number(revision));
        replayStoreTransaction.commit();
    };
    if (lastReplayedRevision < topRevision) {
-        Trace() << "Changereplay from " << lastReplayedRevision << " to " << topRevision;
+        SinkTrace() << "Changereplay from " << lastReplayedRevision << " to " << topRevision;
        qint64 revision = lastReplayedRevision + 1;
        const auto uid = Storage::getUidFromRevision(mainStoreTransaction, revision);
        const auto type = Storage::getTypeFromRevision(mainStoreTransaction, revision);
@@ -94,25 +93,25 @@ KAsync::Job<void> ChangeReplay::replayNextRevision()
        Storage::mainDatabase(mainStoreTransaction, type)
            .scan(key,
                [&lastReplayedRevision, type, this, &replayJob](const QByteArray &key, const QByteArray &value) -> bool {
-                    Trace() << "Replaying " << key;
+                    SinkTrace() << "Replaying " << key;
                    replayJob = replay(type, key, value);
                    return false;
                },
-                [key](const Storage::Error &) { ErrorMsg() << "Failed to replay change " << key; });
+                [key](const Storage::Error &) { SinkError() << "Failed to replay change " << key; });
        return replayJob.then<void>([this, revision, recordReplayedRevision]() {
-            Trace() << "Replayed until " << revision;
+            SinkTrace() << "Replayed until " << revision;
            recordReplayedRevision(revision);
            //replay until we're done
            replayNextRevision().exec();
        },
        [this, revision, recordReplayedRevision](int, QString) {
-            Trace() << "Change replay failed" << revision;
+            SinkTrace() << "Change replay failed" << revision;
            //We're probably not online or so, so postpone retrying
            mReplayInProgress = false;
            emit changesReplayed();
        });
    } else {
-        Trace() << "No changes to replay";
+        SinkTrace() << "No changes to replay";
        mReplayInProgress = false;
        emit changesReplayed();
    }
@@ -122,6 +121,7 @@ KAsync::Job<void> ChangeReplay::replayNextRevision()
 void ChangeReplay::revisionChanged()
 {
    if (!mReplayInProgress) {
+        emit replayingChanges();
        replayNextRevision().exec();
    }
 }
diff --git a/common/changereplay.h b/common/changereplay.h
index aba3dd0..6c1c1db 100644
--- a/common/changereplay.h
+++ b/common/changereplay.h
@@ -45,6 +45,7 @@ public:
 signals:
    void changesReplayed();
+    void replayingChanges();
 public slots:
    void revisionChanged();
diff --git a/common/commands/notification.fbs b/common/commands/notification.fbs
index 8750ff5..c82fad3 100644
--- a/common/commands/notification.fbs
+++ b/common/commands/notification.fbs
@@ -1,13 +1,10 @@
 namespace Sink.Commands;
-enum NotificationType : byte { Shutdown = 1, Status, Warning, Progress, Inspection, RevisionUpdate }
-enum NotificationCode : byte { Success = 0, Failure = 1, UserCode }
 table Notification {
-    type: NotificationType = Status;
+    type: int = 0; //See notification.h
    identifier: string; //An identifier that links back to the something related to the notification (e.g. an entity id or a command id)
    message: string;
-    code: int = 0; //Of type NotificationCode
+    code: int = 0; //See notification.h
 }
 root_type Notification;
diff --git a/common/configstore.cpp b/common/configstore.cpp
index a8469ba..9a68662 100644
--- a/common/configstore.cpp
+++ b/common/configstore.cpp
@@ -20,13 +20,15 @@
 #include <QSettings>
 #include <QSharedPointer>
-#include <QStandardPaths>
 #include <QFile>
 #include <log.h>
+#include <definitions.h>
+SINK_DEBUG_AREA("configstore")
 static QSharedPointer<QSettings> getConfig(const QByteArray &identifier)
 {
-    return QSharedPointer<QSettings>::create(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/sink/" + identifier + ".ini", QSettings::IniFormat);
+    return QSharedPointer<QSettings>::create(Sink::configLocation() + "/" + identifier + ".ini", QSettings::IniFormat);
 }
 ConfigStore::ConfigStore(const QByteArray &identifier)
@@ -50,7 +52,7 @@ QMap<QByteArray, QByteArray> ConfigStore::getEntries()
 void ConfigStore::add(const QByteArray &identifier, const QByteArray &type)
 {
-    Trace() << "Adding " << identifier;
+    SinkTrace() << "Adding " << identifier;
    mConfig->beginGroup(QString::fromLatin1(identifier));
    mConfig->setValue("type", type);
    mConfig->endGroup();
@@ -59,7 +61,7 @@ void ConfigStore::add(const QByteArray &identifier, const QByteArray &type)
 void ConfigStore::remove(const QByteArray &identifier)
 {
-    Trace() << "Removing " << identifier;
+    SinkTrace() << "Removing " << identifier;
    mConfig->beginGroup(QString::fromLatin1(identifier));
    mConfig->remove("");
    mConfig->endGroup();
@@ -75,7 +77,7 @@ void ConfigStore::clear()
 void ConfigStore::modify(const QByteArray &identifier, const QMap<QByteArray, QVariant> &configuration)
 {
-    Trace() << "Modifying " << identifier;
+    SinkTrace() << "Modifying " << identifier;
    auto config = getConfig(identifier);
    config->clear();
    for (const auto &key : configuration.keys()) {
diff --git a/common/definitions.cpp b/common/definitions.cpp
index 362faf7..3fc4700 100644
--- a/common/definitions.cpp
+++ b/common/definitions.cpp
@@ -25,12 +25,22 @@
 QString Sink::storageLocation()
 {
-    return QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/sink/storage";
+    return dataLocation() + "/storage";
+}
+QString Sink::dataLocation()
+{
+    return QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/sink";
+}
+QString Sink::configLocation()
+{
+    return QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/sink";
 }
 QString Sink::temporaryFileLocation()
 {
-    auto path = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/sink/temporaryFiles";
+    auto path = dataLocation() + "/temporaryFiles";
    //FIXME create in a singleton on startup?
    QDir dir;
    dir.mkpath(path);
diff --git a/common/definitions.h b/common/definitions.h
index 1008235..e8cd45e 100644
--- a/common/definitions.h
+++ b/common/definitions.h
@@ -26,6 +26,8 @@
 namespace Sink {
 QString SINK_EXPORT storageLocation();
+QString SINK_EXPORT dataLocation();
+QString SINK_EXPORT configLocation();
 QString SINK_EXPORT temporaryFileLocation();
 QString SINK_EXPORT resourceStorageLocation(const QByteArray &resourceInstanceIdentifier);
 }
diff --git a/common/domain/applicationdomaintype.cpp b/common/domain/applicationdomaintype.cpp
index 44eeb13..ce113c2 100644
--- a/common/domain/applicationdomaintype.cpp
+++ b/common/domain/applicationdomaintype.cpp
@@ -24,6 +24,8 @@
 #include "storage.h" //for generateUid()
 #include <QFile>
+SINK_DEBUG_AREA("applicationdomaintype");
 namespace Sink {
 namespace ApplicationDomain {
@@ -82,7 +84,7 @@ QVariant ApplicationDomainType::getProperty(const QByteArray &key) const
 {
    Q_ASSERT(mAdaptor);
    if (!mAdaptor->availableProperties().contains(key)) {
-        Warning() << "No such property available " << key;
+        SinkWarning() << "No such property available " << key;
    }
    return mAdaptor->getProperty(key);
 }
@@ -105,7 +107,7 @@ QByteArray ApplicationDomainType::getBlobProperty(const QByteArray &key) const
    const auto path = getProperty(key).toByteArray();
    QFile file(path);
    if (!file.open(QIODevice::ReadOnly)) {
-        ErrorMsg() << "Failed to open the file: " << file.errorString() << path;
+        SinkError() << "Failed to open the file: " << file.errorString() << path;
        return QByteArray();
    }
    return file.readAll();
@@ -116,7 +118,7 @@ void ApplicationDomainType::setBlobProperty(const QByteArray &key, const QByteAr
    const auto path = Sink::temporaryFileLocation() + "/" + QUuid::createUuid().toString();
    QFile file(path);
    if (!file.open(QIODevice::WriteOnly)) {
-        ErrorMsg() << "Failed to open the file: " << file.errorString() << path;
+        SinkError() << "Failed to open the file: " << file.errorString() << path;
        return;
    }
    file.write(value);
@@ -251,7 +253,7 @@ namespace DummyResource {
    SinkResource create(const QByteArray &account)
    {
        auto &&resource = ApplicationDomainType::createEntity<SinkResource>();
-        resource.setProperty("type", "org.kde.dummy");
+        resource.setProperty("type", "sink.dummy");
        resource.setProperty("account", account);
        resource.setProperty("capabilities", QVariant::fromValue(QByteArrayList() << ResourceCapabilities::Mail::storage << "-folder.rename"));
        // resource.setProperty("capabilities", QVariant::fromValue(QByteArrayList() << ResourceCapabilities::Mail::storage << ResourceCapabilities::Mail::drafts << "-folder.rename" << ResourceCapabilities::Mail::trash));
@@ -263,7 +265,7 @@ namespace MaildirResource {
    SinkResource create(const QByteArray &account)
    {
        auto &&resource = ApplicationDomainType::createEntity<SinkResource>();
-        resource.setProperty("type", "org.kde.maildir");
+        resource.setProperty("type", "sink.maildir");
        resource.setProperty("account", account);
        resource.setProperty("capabilities", QVariant::fromValue(QByteArrayList() << ResourceCapabilities::Mail::storage << ResourceCapabilities::Mail::drafts << "-folder.rename" << ResourceCapabilities::Mail::trash));
        return resource;
@@ -274,7 +276,7 @@ namespace MailtransportResource {
    SinkResource create(const QByteArray &account)
    {
        auto &&resource = ApplicationDomainType::createEntity<SinkResource>();
-        resource.setProperty("type", "org.kde.mailtransport");
+        resource.setProperty("type", "sink.mailtransport");
        resource.setProperty("account", account);
        resource.setProperty("capabilities", QVariant::fromValue(QByteArrayList() << ResourceCapabilities::Mail::transport));
        return resource;
@@ -285,7 +287,7 @@ namespace ImapResource {
    SinkResource create(const QByteArray &account)
    {
        auto &&resource = ApplicationDomainType::createEntity<SinkResource>();
-        resource.setProperty("type", "org.kde.imap");
+        resource.setProperty("type", "sink.imap");
        resource.setProperty("account", account);
        resource.setProperty("capabilities", QVariant::fromValue(QByteArrayList() << ResourceCapabilities::Mail::storage << ResourceCapabilities::Mail::drafts << ResourceCapabilities::Mail::folderhierarchy << ResourceCapabilities::Mail::trash));
        return resource;
diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index 849c3e2..5efb936 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -52,6 +52,13 @@
    void setExtracted##NAME(const TYPE &value) { setProperty(NAME::name, QVariant::fromValue(value)); } \
    TYPE get##NAME() const { return getProperty(NAME::name).value<TYPE>(); } \
+#define SINK_STATUS_PROPERTY(TYPE, NAME, LOWERCASENAME) \
+    struct NAME { \
+        static constexpr const char *name = #LOWERCASENAME; \
+        typedef TYPE Type; \
+    }; \
+    void setStatus##NAME(const TYPE &value) { setProperty(NAME::name, QVariant::fromValue(value)); } \
+    TYPE get##NAME() const { return getProperty(NAME::name).value<TYPE>(); } \
 #define SINK_BLOB_PROPERTY(NAME, LOWERCASENAME) \
    struct NAME { \
@@ -76,6 +83,14 @@
 namespace Sink {
 namespace ApplicationDomain {
+struct SINK_EXPORT Error {
+};
+struct SINK_EXPORT Progress {
+};
 /**
 * The domain type interface has two purposes:
 * * provide a unified interface to read buffers (for zero-copy reading)
@@ -215,6 +230,38 @@ struct SINK_EXPORT Mail : public Entity {
 };
 /**
+ * The status of an account or resource.
+ *
+ * It is set as follows:
+ * * By default the status is offline.
+ * * If a connection to the server could be established the status is Connected.
+ * * If an error occurred that keeps the resource from operating (so non transient), the resource enters the error state.
+ * * If a long running operation is started the resource goes to the busy state (and return to the previous state after that).
+ */
+enum SINK_EXPORT Status {
+    OfflineStatus,
+    ConnectedStatus,
+    BusyStatus,
+    ErrorStatus
+};
+struct SINK_EXPORT SinkAccount : public ApplicationDomainType {
+    typedef QSharedPointer<SinkAccount> Ptr;
+    explicit SinkAccount(const QByteArray &resourceInstanceIdentifier, const QByteArray &identifier, qint64 revision, const QSharedPointer<BufferAdaptor> &adaptor);
+    explicit SinkAccount(const QByteArray &identifier);
+    SinkAccount();
+    virtual ~SinkAccount();
+    SINK_PROPERTY(QString, Name, name);
+    SINK_PROPERTY(QString, Icon, icon);
+    SINK_PROPERTY(QString, AccountType, accountType);
+    SINK_STATUS_PROPERTY(int, Status, status);
+    SINK_STATUS_PROPERTY(ApplicationDomain::Error, Error, error);
+    SINK_STATUS_PROPERTY(ApplicationDomain::Progress, Progress, progress);
+};
+/**
 * Represents an sink resource.
 *
 * This type is used for configuration of resources,
@@ -226,14 +273,13 @@ struct SINK_EXPORT SinkResource : public ApplicationDomainType {
    explicit SinkResource(const QByteArray &identifier);
    SinkResource();
    virtual ~SinkResource();
-};
-struct SINK_EXPORT SinkAccount : public ApplicationDomainType {
+    SINK_REFERENCE_PROPERTY(SinkAccount, Account, account);
-    typedef QSharedPointer<SinkAccount> Ptr;
+    SINK_PROPERTY(QString, ResourceType, resourceType);
-    explicit SinkAccount(const QByteArray &resourceInstanceIdentifier, const QByteArray &identifier, qint64 revision, const QSharedPointer<BufferAdaptor> &adaptor);
+    SINK_PROPERTY(QByteArrayList, Capabilities, capabilities);
-    explicit SinkAccount(const QByteArray &identifier);
+    SINK_STATUS_PROPERTY(int, Status, status);
-    SinkAccount();
+    SINK_STATUS_PROPERTY(ApplicationDomain::Error, Error, error);
-    virtual ~SinkAccount();
+    SINK_STATUS_PROPERTY(ApplicationDomain::Progress, Progress, progress);
 };
 struct SINK_EXPORT Identity : public ApplicationDomainType {
@@ -330,3 +376,5 @@ Q_DECLARE_METATYPE(Sink::ApplicationDomain::SinkAccount)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::SinkAccount::Ptr)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::Identity)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::Identity::Ptr)
+Q_DECLARE_METATYPE(Sink::ApplicationDomain::Error)
+Q_DECLARE_METATYPE(Sink::ApplicationDomain::Progress)
diff --git a/common/domain/folder.cpp b/common/domain/folder.cpp
index 309ca3f..ddb0c10 100644
--- a/common/domain/folder.cpp
+++ b/common/domain/folder.cpp
@@ -35,6 +35,8 @@
 #include "folder_generated.h"
+SINK_DEBUG_AREA("folder");
 static QMutex sMutex;
 using namespace Sink::ApplicationDomain;
@@ -58,7 +60,7 @@ ResultSet TypeImplementation<Folder>::queryIndexes(const Sink::Query &query, con
 void TypeImplementation<Folder>::index(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Sink::Storage::Transaction &transaction)
 {
-    Trace() << "Indexing " << identifier;
+    SinkTrace() << "Indexing " << identifier;
    getIndex().add(identifier, bufferAdaptor, transaction);
 }
diff --git a/common/domain/mail.cpp b/common/domain/mail.cpp
index 5b35a9a..13e1305 100644
--- a/common/domain/mail.cpp
+++ b/common/domain/mail.cpp
@@ -35,6 +35,8 @@
 #include "mail_generated.h"
+SINK_DEBUG_AREA("mail");
 static QMutex sMutex;
 using namespace Sink::ApplicationDomain;
@@ -63,7 +65,7 @@ ResultSet TypeImplementation<Mail>::queryIndexes(const Sink::Query &query, const
 void TypeImplementation<Mail>::index(const QByteArray &identifier, const BufferAdaptor &bufferAdaptor, Sink::Storage::Transaction &transaction)
 {
-    Trace() << "Indexing " << identifier;
+    SinkTrace() << "Indexing " << identifier;
    getIndex().add(identifier, bufferAdaptor, transaction);
 }
diff --git a/common/domainadaptor.h b/common/domainadaptor.h
index 8ac8171..25448f3 100644
--- a/common/domainadaptor.h
+++ b/common/domainadaptor.h
@@ -47,12 +47,12 @@ createBufferPart(const Sink::ApplicationDomain::ApplicationDomainType &domainObj
    // First create a primitives such as strings using the mappings
    QList<std::function<void(Builder &)>> propertiesToAddToResource;
    for (const auto &property : domainObject.changedProperties()) {
-        // Trace() << "copying property " << property;
+        // SinkTrace() << "copying property " << property;
        const auto value = domainObject.getProperty(property);
        if (mapper.hasMapping(property)) {
            mapper.setProperty(property, domainObject.getProperty(property), propertiesToAddToResource, fbb);
        } else {
-            // Trace() << "no mapping for property available " << property;
+            // SinkTrace() << "no mapping for property available " << property;
        }
    }
@@ -79,7 +79,7 @@ static void createBufferPartBuffer(const Sink::ApplicationDomain::ApplicationDom
    fbb.Finish(pos, "AKFB");
    flatbuffers::Verifier verifier(fbb.GetBufferPointer(), fbb.GetSize());
    if (!verifier.VerifyBuffer<Buffer>()) {
-        Warning() << "Created invalid uffer";
+        SinkWarning_(0, "bufferadaptor") << "Created invalid uffer";
    }
 }
@@ -89,6 +89,7 @@ static void createBufferPartBuffer(const Sink::ApplicationDomain::ApplicationDom
 template <class LocalBuffer, class ResourceBuffer>
 class GenericBufferAdaptor : public Sink::ApplicationDomain::BufferAdaptor
 {
+    SINK_DEBUG_AREA("bufferadaptor")
 public:
    GenericBufferAdaptor() : BufferAdaptor()
    {
@@ -96,7 +97,7 @@ public:
    virtual void setProperty(const QByteArray &key, const QVariant &value) Q_DECL_OVERRIDE
    {
-        Warning() << "Can't set property " << key;
+        SinkWarning() << "Can't set property " << key;
        Q_ASSERT(false);
    }
@@ -107,7 +108,7 @@ public:
        } else if (mLocalBuffer && mLocalMapper->hasMapping(key)) {
            return mLocalMapper->getProperty(key, mLocalBuffer);
        }
-        Warning() << "No mapping available for key " << key << mLocalBuffer << mResourceBuffer;
+        SinkWarning() << "No mapping available for key " << key << mLocalBuffer << mResourceBuffer;
        return QVariant();
    }
@@ -168,13 +169,13 @@ public:
    {
        flatbuffers::FlatBufferBuilder localFbb;
        if (mLocalWriteMapper) {
-            // Trace() << "Creating local buffer part";
+            // SinkTrace() << "Creating local buffer part";
            createBufferPartBuffer<LocalBuffer, LocalBuilder>(domainObject, localFbb, *mLocalWriteMapper);
        }
        flatbuffers::FlatBufferBuilder resFbb;
        if (mResourceWriteMapper) {
-            // Trace() << "Creating resouce buffer part";
+            // SinkTrace() << "Creating resouce buffer part";
            createBufferPartBuffer<ResourceBuffer, ResourceBuilder>(domainObject, resFbb, *mResourceWriteMapper);
        }
diff --git a/common/entityreader.cpp b/common/entityreader.cpp
index c15f73f..411e7e4 100644
--- a/common/entityreader.cpp
+++ b/common/entityreader.cpp
@@ -23,6 +23,8 @@
 #include "storage.h"
 #include "query.h"
+SINK_DEBUG_AREA("entityreader")
 using namespace Sink;
 QSharedPointer<Sink::ApplicationDomain::BufferAdaptor> EntityReaderUtils::getLatest(const Sink::Storage::NamedDatabase &db, const QByteArray &uid, DomainTypeAdaptorFactoryInterface &adaptorFactory, qint64 &retrievedRevision)
@@ -32,15 +34,15 @@ QSharedPointer<Sink::ApplicationDomain::BufferAdaptor> EntityReaderUtils::getLat
        [&current, &adaptorFactory, &retrievedRevision](const QByteArray &key, const QByteArray &data) -> bool {
            Sink::EntityBuffer buffer(const_cast<const char *>(data.data()), data.size());
            if (!buffer.isValid()) {
-                Warning() << "Read invalid buffer from disk";
+                SinkWarning() << "Read invalid buffer from disk";
            } else {
-                Trace() << "Found value " << key;
+                SinkTrace() << "Found value " << key;
                current = adaptorFactory.createAdaptor(buffer.entity());
                retrievedRevision = Sink::Storage::revisionFromKey(key);
            }
            return false;
        },
-        [](const Sink::Storage::Error &error) { Warning() << "Failed to read current value from storage: " << error.message; });
+        [](const Sink::Storage::Error &error) { SinkWarning() << "Failed to read current value from storage: " << error.message; });
    return current;
 }
@@ -51,14 +53,14 @@ QSharedPointer<Sink::ApplicationDomain::BufferAdaptor> EntityReaderUtils::get(co
        [&current, &adaptorFactory, &retrievedRevision](const QByteArray &key, const QByteArray &data) -> bool {
            Sink::EntityBuffer buffer(const_cast<const char *>(data.data()), data.size());
            if (!buffer.isValid()) {
-                Warning() << "Read invalid buffer from disk";
+                SinkWarning() << "Read invalid buffer from disk";
            } else {
                current = adaptorFactory.createAdaptor(buffer.entity());
                retrievedRevision = Sink::Storage::revisionFromKey(key);
            }
            return false;
        },
-        [](const Sink::Storage::Error &error) { Warning() << "Failed to read current value from storage: " << error.message; });
+        [](const Sink::Storage::Error &error) { SinkWarning() << "Failed to read current value from storage: " << error.message; });
    return current;
 }
@@ -74,7 +76,7 @@ QSharedPointer<Sink::ApplicationDomain::BufferAdaptor> EntityReaderUtils::getPre
            }
            return true;
        },
-        [](const Sink::Storage::Error &error) { Warning() << "Failed to read current value from storage: " << error.message; }, true);
+        [](const Sink::Storage::Error &error) { SinkWarning() << "Failed to read current value from storage: " << error.message; }, true);
    return get(db, Sink::Storage::assembleKey(uid, latestRevision), adaptorFactory, retrievedRevision);
 }
@@ -86,7 +88,7 @@ EntityReader<DomainType>::EntityReader(const QByteArray &resourceType, const QBy
    mDomainTypeAdaptorFactory(*mDomainTypeAdaptorFactoryPtr)
 {
    Q_ASSERT(!resourceType.isEmpty());
-    Trace() << "resourceType " << resourceType;
+    SinkTrace() << "resourceType " << resourceType;
    Q_ASSERT(mDomainTypeAdaptorFactoryPtr);
 }
@@ -165,13 +167,13 @@ void EntityReader<DomainType>::readEntity(const Sink::Storage::NamedDatabase &db
            resultCallback(DomainType::Ptr::create(mResourceInstanceIdentifier, Sink::Storage::uidFromKey(key), revision, adaptor), operation);
            return false;
        },
-        [&](const Sink::Storage::Error &error) { Warning() << "Error during query: " << error.message << key; });
+        [&](const Sink::Storage::Error &error) { SinkWarning() << "Error during query: " << error.message << key; });
 }
 static inline ResultSet fullScan(const Sink::Storage::Transaction &transaction, const QByteArray &bufferType)
 {
    // TODO use a result set with an iterator, to read values on demand
-    Trace() << "Looking for : " << bufferType;
+    SinkTrace() << "Looking for : " << bufferType;
    //The scan can return duplicate results if we have multiple revisions, so we use a set to deduplicate.
    QSet<QByteArray> keys;
    Storage::mainDatabase(transaction, bufferType)
@@ -179,14 +181,14 @@ static inline ResultSet fullScan(const Sink::Storage::Transaction &transaction,
            [&](const QByteArray &key, const QByteArray &value) -> bool {
                if (keys.contains(Sink::Storage::uidFromKey(key))) {
                    //Not something that should persist if the replay works, so we keep a message for now.
-                    Trace() << "Multiple revisions for key: " << key;
+                    SinkTrace() << "Multiple revisions for key: " << key;
                }
                keys << Sink::Storage::uidFromKey(key);
                return true;
            },
-            [](const Sink::Storage::Error &error) { Warning() << "Error during query: " << error.message; });
+            [](const Sink::Storage::Error &error) { SinkWarning() << "Error during query: " << error.message; });
-    Trace() << "Full scan retrieved " << keys.size() << " results.";
+    SinkTrace() << "Full scan retrieved " << keys.size() << " results.";
    return ResultSet(keys.toList().toVector());
 }
@@ -224,7 +226,7 @@ ResultSet EntityReader<DomainType>::loadIncrementalResultSet(qint64 baseRevision
        while (*revisionCounter <= topRevision) {
            const auto uid = Sink::Storage::getUidFromRevision(mTransaction, *revisionCounter);
            const auto type = Sink::Storage::getTypeFromRevision(mTransaction, *revisionCounter);
-            // Trace() << "Revision" << *revisionCounter << type << uid;
+            // SinkTrace() << "Revision" << *revisionCounter << type << uid;
            Q_ASSERT(!uid.isEmpty());
            Q_ASSERT(!type.isEmpty());
            if (type != bufferType) {
@@ -236,7 +238,7 @@ ResultSet EntityReader<DomainType>::loadIncrementalResultSet(qint64 baseRevision
            *revisionCounter += 1;
            return key;
        }
-        Trace() << "Finished reading incremental result set:" << *revisionCounter;
+        SinkTrace() << "Finished reading incremental result set:" << *revisionCounter;
        // We're done
        return QByteArray();
    });
@@ -248,7 +250,7 @@ ResultSet EntityReader<DomainType>::filterAndSortSet(ResultSet &resultSet, const
 {
    const bool sortingRequired = !sortProperty.isEmpty();
    if (initialQuery && sortingRequired) {
-        Trace() << "Sorting the resultset in memory according to property: " << sortProperty;
+        SinkTrace() << "Sorting the resultset in memory according to property: " << sortProperty;
        // Sort the complete set by reading the sort property and filling into a sorted map
        auto sortedMap = QSharedPointer<QMap<QByteArray, QByteArray>>::create();
        while (resultSet.next()) {
@@ -271,7 +273,7 @@ ResultSet EntityReader<DomainType>::filterAndSortSet(ResultSet &resultSet, const
                });
        }
-        Trace() << "Sorted " << sortedMap->size() << " values.";
+        SinkTrace() << "Sorted " << sortedMap->size() << " values.";
        auto iterator = QSharedPointer<QMapIterator<QByteArray, QByteArray>>::create(*sortedMap);
        ResultSet::ValueGenerator generator = [this, iterator, sortedMap, &db, filter, initialQuery](
            std::function<void(const Sink::ApplicationDomain::ApplicationDomainType::Ptr &, Sink::Operation)> callback) -> bool {
@@ -330,11 +332,11 @@ QPair<qint64, qint64> EntityReader<DomainType>::load(const Sink::Query &query, c
    QSet<QByteArray> remainingFilters;
    QByteArray remainingSorting;
    auto resultSet = baseSetRetriever(remainingFilters, remainingSorting);
-    Trace() << "Base set retrieved. " << Log::TraceTime(time.elapsed());
+    SinkTrace() << "Base set retrieved. " << Log::TraceTime(time.elapsed());
    auto filteredSet = filterAndSortSet(resultSet, getFilter(remainingFilters, query), db, initialQuery, remainingSorting);
-    Trace() << "Filtered set retrieved. " << Log::TraceTime(time.elapsed());
+    SinkTrace() << "Filtered set retrieved. " << Log::TraceTime(time.elapsed());
    auto replayedEntities = replaySet(filteredSet, offset, batchSize, callback);
-    // Trace() << "Filtered set replayed. " << Log::TraceTime(time.elapsed());
+    // SinkTrace() << "Filtered set replayed. " << Log::TraceTime(time.elapsed());
    return qMakePair(Sink::Storage::maxRevision(mTransaction), replayedEntities);
 }
@@ -346,7 +348,7 @@ QPair<qint64, qint64> EntityReader<DomainType>::executeInitialQuery(const Sink::
    auto revisionAndReplayedEntities = load(query, [&](QSet<QByteArray> &remainingFilters, QByteArray &remainingSorting) -> ResultSet {
        return loadInitialResultSet(query, remainingFilters, remainingSorting);
    }, true, offset, batchsize, callback);
-    Trace() << "Initial query took: " << Log::TraceTime(time.elapsed());
+    SinkTrace() << "Initial query took: " << Log::TraceTime(time.elapsed());
    return revisionAndReplayedEntities;
 }
@@ -359,7 +361,7 @@ QPair<qint64, qint64> EntityReader<DomainType>::executeIncrementalQuery(const Si
    auto revisionAndReplayedEntities = load(query, [&](QSet<QByteArray> &remainingFilters, QByteArray &remainingSorting) -> ResultSet {
        return loadIncrementalResultSet(baseRevision, query, remainingFilters);
    }, false, 0, 0, callback);
-    Trace() << "Initial query took: " << Log::TraceTime(time.elapsed());
+    SinkTrace() << "Initial query took: " << Log::TraceTime(time.elapsed());
    return revisionAndReplayedEntities;
 }
@@ -377,7 +379,7 @@ EntityReader<DomainType>::getFilter(const QSet<QByteArray> remainingFilters, con
            const auto property = domainObject->getProperty(filterProperty);
            const auto comparator = query.propertyFilter.value(filterProperty);
            if (!comparator.matches(property)) {
-                Trace() << "Filtering entity due to property mismatch on filter: " << filterProperty << property << ":" << comparator.value;
+                SinkTrace() << "Filtering entity due to property mismatch on filter: " << filterProperty << property << ":" << comparator.value;
                return false;
            }
        }
@@ -388,7 +390,7 @@ EntityReader<DomainType>::getFilter(const QSet<QByteArray> remainingFilters, con
 template <class DomainType>
 qint64 EntityReader<DomainType>::replaySet(ResultSet &resultSet, int offset, int batchSize, const std::function<bool(const typename DomainType::Ptr &value, Sink::Operation operation)> &callback)
 {
-    Trace() << "Skipping over " << offset << " results";
+    SinkTrace() << "Skipping over " << offset << " results";
    resultSet.skip(offset);
    int counter = 0;
    while (!batchSize || (counter < batchSize)) {
@@ -401,7 +403,7 @@ qint64 EntityReader<DomainType>::replaySet(ResultSet &resultSet, int offset, int
            break;
        }
    };
-    Trace() << "Replayed " << counter << " results."
+    SinkTrace() << "Replayed " << counter << " results."
            << "Limit " << batchSize;
    return counter;
 }
diff --git a/common/facade.cpp b/common/facade.cpp
index 2660300..72f7414 100644
--- a/common/facade.cpp
+++ b/common/facade.cpp
@@ -30,9 +30,6 @@
 using namespace Sink;
-#undef DEBUG_AREA
-#define DEBUG_AREA "client.facade"
 template <class DomainType>
 GenericFacade<DomainType>::GenericFacade(
    const QByteArray &resourceIdentifier, const DomainTypeAdaptorFactoryInterface::Ptr &adaptorFactory, const QSharedPointer<Sink::ResourceAccessInterface> resourceAccess)
@@ -59,7 +56,7 @@ template <class DomainType>
 KAsync::Job<void> GenericFacade<DomainType>::create(const DomainType &domainObject)
 {
    if (!mDomainTypeAdaptorFactory) {
-        Warning() << "No domain type adaptor factory available";
+        SinkWarning() << "No domain type adaptor factory available";
        return KAsync::error<void>();
    }
    flatbuffers::FlatBufferBuilder entityFbb;
@@ -71,10 +68,10 @@ template <class DomainType>
 KAsync::Job<void> GenericFacade<DomainType>::modify(const DomainType &domainObject)
 {
    if (!mDomainTypeAdaptorFactory) {
-        Warning() << "No domain type adaptor factory available";
+        SinkWarning() << "No domain type adaptor factory available";
        return KAsync::error<void>();
    }
-    Trace() << "Modifying entity: " << domainObject.identifier() << domainObject.changedProperties();
+    SinkTrace() << "Modifying entity: " << domainObject.identifier() << domainObject.changedProperties();
    flatbuffers::FlatBufferBuilder entityFbb;
    mDomainTypeAdaptorFactory->createBuffer(domainObject, entityFbb);
    return mResourceAccess->sendModifyCommand(domainObject.identifier(), domainObject.revision(), bufferTypeForDomainType(), QByteArrayList(), BufferUtils::extractBuffer(entityFbb), domainObject.changedProperties());
diff --git a/common/facade.h b/common/facade.h
index 658ccb8..b193580 100644
--- a/common/facade.h
+++ b/common/facade.h
@@ -46,6 +46,9 @@ namespace Sink {
 template <typename DomainType>
 class SINK_EXPORT GenericFacade : public Sink::StoreFacade<DomainType>
 {
+protected:
+    SINK_DEBUG_AREA("facade")
+    SINK_DEBUG_COMPONENT(mResourceInstanceIdentifier)
 public:
    /**
     * Create a new GenericFacade
diff --git a/common/genericresource.cpp b/common/genericresource.cpp
index c06c22a..7136882 100644
--- a/common/genericresource.cpp
+++ b/common/genericresource.cpp
@@ -46,9 +46,6 @@ static int sCommitInterval = 10;
 using namespace Sink;
-#undef DEBUG_AREA
-#define DEBUG_AREA "resource.commandprocessor"
 /**
 * Drives the pipeline using the output from all command queues
 */
@@ -56,12 +53,13 @@ class CommandProcessor : public QObject
 {
    Q_OBJECT
    typedef std::function<KAsync::Job<void>(void const *, size_t)> InspectionFunction;
+    SINK_DEBUG_AREA("commandprocessor")
 public:
    CommandProcessor(Sink::Pipeline *pipeline, QList<MessageQueue *> commandQueues) : QObject(), mPipeline(pipeline), mCommandQueues(commandQueues), mProcessingLock(false)
    {
        mLowerBoundRevision = Storage::maxRevision(mPipeline->storage().createTransaction(Storage::ReadOnly, [](const Sink::Storage::Error &error) {
-            Warning() << error.message;
+            SinkWarning() << error.message;
        }));
        for (auto queue : mCommandQueues) {
@@ -80,7 +78,6 @@ public:
        mInspect = f;
    }
 signals:
    void error(int errorCode, const QString &errorMessage);
@@ -114,7 +111,7 @@ private slots:
    KAsync::Job<qint64> processQueuedCommand(const Sink::QueuedCommand *queuedCommand)
    {
-        Trace() << "Processing command: " << Sink::Commands::name(queuedCommand->commandId());
+        SinkTrace() << "Processing command: " << Sink::Commands::name(queuedCommand->commandId());
        // Throw command into appropriate pipeline
        switch (queuedCommand->commandId()) {
            case Sink::Commands::DeleteEntityCommand:
@@ -138,21 +135,21 @@ private slots:
    {
        flatbuffers::Verifier verifyer(reinterpret_cast<const uint8_t *>(data.constData()), data.size());
        if (!Sink::VerifyQueuedCommandBuffer(verifyer)) {
-            Warning() << "invalid buffer";
+            SinkWarning() << "invalid buffer";
            // return KAsync::error<void, qint64>(1, "Invalid Buffer");
        }
        auto queuedCommand = Sink::GetQueuedCommand(data.constData());
        const auto commandId = queuedCommand->commandId();
-        Trace() << "Dequeued Command: " << Sink::Commands::name(commandId);
+        SinkTrace() << "Dequeued Command: " << Sink::Commands::name(commandId);
        return processQueuedCommand(queuedCommand)
            .then<qint64, qint64>(
-                [commandId](qint64 createdRevision) -> qint64 {
+                [this, commandId](qint64 createdRevision) -> qint64 {
-                    Trace() << "Command pipeline processed: " << Sink::Commands::name(commandId);
+                    SinkTrace() << "Command pipeline processed: " << Sink::Commands::name(commandId);
                    return createdRevision;
                },
                [](int errorCode, QString errorMessage) {
                    // FIXME propagate error, we didn't handle it
-                    Warning() << "Error while processing queue command: " << errorMessage;
+                    SinkWarning() << "Error while processing queue command: " << errorMessage;
                });
    }
@@ -169,7 +166,7 @@ private slots:
                                 return KAsync::start<void>([this, data, time](KAsync::Future<void> &future) {
                                     processQueuedCommand(data)
                                         .then<void, qint64>([&future, this, time](qint64 createdRevision) {
-                                             Trace() << "Created revision " << createdRevision << ". Processing took: " << Log::TraceTime(time->elapsed());
+                                             SinkTrace() << "Created revision " << createdRevision << ". Processing took: " << Log::TraceTime(time->elapsed());
                                             future.setFinished();
                                         })
                                         .exec();
@@ -178,7 +175,7 @@ private slots:
                        .then<void>([&future, queue]() { future.setFinished(); },
                            [&future](int i, QString error) {
                                if (i != MessageQueue::ErrorCodes::NoMessageFound) {
-                                    Warning() << "Error while getting message from messagequeue: " << error;
+                                    SinkWarning() << "Error while getting message from messagequeue: " << error;
                                }
                                future.setFinished();
                            })
@@ -192,12 +189,12 @@ private slots:
        auto time = QSharedPointer<QTime>::create();
        time->start();
        mPipeline->startTransaction();
-        Trace() << "Cleaning up from " << mPipeline->cleanedUpRevision() + 1 << " to " << mLowerBoundRevision;
+        SinkTrace() << "Cleaning up from " << mPipeline->cleanedUpRevision() + 1 << " to " << mLowerBoundRevision;
        for (qint64 revision = mPipeline->cleanedUpRevision() + 1; revision <= mLowerBoundRevision; revision++) {
            mPipeline->cleanupRevision(revision);
        }
        mPipeline->commit();
-        Trace() << "Cleanup done." << Log::TraceTime(time->elapsed());
+        SinkTrace() << "Cleanup done." << Log::TraceTime(time->elapsed());
        // Go through all message queues
        auto it = QSharedPointer<QListIterator<MessageQueue *>>::create(mCommandQueues);
@@ -208,8 +205,8 @@ private slots:
                auto queue = it->next();
                processQueue(queue)
-                    .then<void>([&future, time]() {
+                    .then<void>([this, &future, time]() {
-                        Trace() << "Queue processed." << Log::TraceTime(time->elapsed());
+                        SinkTrace() << "Queue processed." << Log::TraceTime(time->elapsed());
                        future.setFinished();
                    })
                    .exec();
@@ -226,9 +223,6 @@ private:
    InspectionFunction mInspect;
 };
-#undef DEBUG_AREA
-#define DEBUG_AREA "resource"
 GenericResource::GenericResource(const QByteArray &resourceType, const QByteArray &resourceInstanceIdentifier, const QSharedPointer<Pipeline> &pipeline )
    : Sink::Resource(),
      mUserQueue(Sink::storageLocation(), resourceInstanceIdentifier + ".userqueue"),
@@ -240,7 +234,7 @@ GenericResource::GenericResource(const QByteArray &resourceType, const QByteArra
      mClientLowerBoundRevision(std::numeric_limits<qint64>::max())
 {
    mPipeline->setResourceType(mResourceType);
-    mProcessor = new CommandProcessor(mPipeline.data(), QList<MessageQueue *>() << &mUserQueue << &mSynchronizerQueue);
+    mProcessor = std::unique_ptr<CommandProcessor>(new CommandProcessor(mPipeline.data(), QList<MessageQueue *>() << &mUserQueue << &mSynchronizerQueue));
    mProcessor->setInspectionCommand([this](void const *command, size_t size) {
        flatbuffers::Verifier verifier((const uint8_t *)command, size);
        if (Sink::Commands::VerifyInspectionBuffer(verifier)) {
@@ -260,18 +254,18 @@ GenericResource::GenericResource(const QByteArray &resourceType, const QByteArra
                    [=]() {
                        Log_area("resource.inspection") << "Inspection was successful: " << inspectionType << inspectionId << entityId;
                        Sink::Notification n;
-                        n.type = Sink::Commands::NotificationType_Inspection;
+                        n.type = Sink::Notification::Inspection;
                        n.id = inspectionId;
-                        n.code = Sink::Commands::NotificationCode_Success;
+                        n.code = Sink::Notification::Success;
                        emit notify(n);
                    },
                    [=](int code, const QString &message) {
                        Warning_area("resource.inspection") << "Inspection failed: " << inspectionType << inspectionId << entityId << message;
                        Sink::Notification n;
-                        n.type = Sink::Commands::NotificationType_Inspection;
+                        n.type = Sink::Notification::Inspection;
                        n.message = message;
                        n.id = inspectionId;
-                        n.code = Sink::Commands::NotificationCode_Failure;
+                        n.code = Sink::Notification::Failure;
                        emit notify(n);
                    })
                .exec();
@@ -279,8 +273,14 @@ GenericResource::GenericResource(const QByteArray &resourceType, const QByteArra
        }
        return KAsync::error<void>(-1, "Invalid inspection command.");
    });
-    QObject::connect(mProcessor, &CommandProcessor::error, [this](int errorCode, const QString &msg) { onProcessorError(errorCode, msg); });
+    {
-    QObject::connect(mPipeline.data(), &Pipeline::revisionUpdated, this, &Resource::revisionUpdated);
+        auto ret =QObject::connect(mProcessor.get(), &CommandProcessor::error, [this](int errorCode, const QString &msg) { onProcessorError(errorCode, msg); });
+        Q_ASSERT(ret);
+    }
+    {
+        auto ret = QObject::connect(mPipeline.data(), &Pipeline::revisionUpdated, this, &Resource::revisionUpdated);
+        Q_ASSERT(ret);
+    }
    mClientLowerBoundRevision = mPipeline->cleanedUpRevision();
    mCommitQueueTimer.setInterval(sCommitInterval);
@@ -290,13 +290,12 @@ GenericResource::GenericResource(const QByteArray &resourceType, const QByteArra
 GenericResource::~GenericResource()
 {
-    delete mProcessor;
 }
 KAsync::Job<void> GenericResource::inspect(
    int inspectionType, const QByteArray &inspectionId, const QByteArray &domainType, const QByteArray &entityId, const QByteArray &property, const QVariant &expectedValue)
 {
-    Warning() << "Inspection not implemented";
+    SinkWarning() << "Inspection not implemented";
    return KAsync::null<void>();
 }
@@ -329,13 +328,36 @@ void GenericResource::setupSynchronizer(const QSharedPointer<Synchronizer> &sync
 void GenericResource::setupChangereplay(const QSharedPointer<ChangeReplay> &changeReplay)
 {
    mChangeReplay = changeReplay;
+    {
+        auto ret = QObject::connect(mChangeReplay.data(), &ChangeReplay::replayingChanges, [this]() {
+            Sink::Notification n;
+            n.id = "changereplay";
+            n.type = Sink::Notification::Status;
+            n.message = "Replaying changes.";
+            n.code = Sink::ApplicationDomain::BusyStatus;
+            emit notify(n);
+        });
+        Q_ASSERT(ret);
+    }
+    {
+        auto ret = QObject::connect(mChangeReplay.data(), &ChangeReplay::changesReplayed, [this]() {
+            Sink::Notification n;
+            n.id = "changereplay";
+            n.type = Sink::Notification::Status;
+            n.message = "All changes have been replayed.";
+            n.code = Sink::ApplicationDomain::ConnectedStatus;
+            emit notify(n);
+        });
+        Q_ASSERT(ret);
+    }
    mProcessor->setOldestUsedRevision(mChangeReplay->getLastReplayedRevision());
    enableChangeReplay(true);
 }
 void GenericResource::removeDataFromDisk()
 {
-    Log() << "Removing the resource from disk: " << mResourceInstanceIdentifier;
+    SinkLog() << "Removing the resource from disk: " << mResourceInstanceIdentifier;
    //Ensure we have no transaction or databases open
    mSynchronizer.clear();
    mChangeReplay.clear();
@@ -363,7 +385,7 @@ qint64 GenericResource::diskUsage(const QByteArray &instanceIdentifier)
 void GenericResource::onProcessorError(int errorCode, const QString &errorMessage)
 {
-    Warning() << "Received error from Processor: " << errorCode << errorMessage;
+    SinkWarning() << "Received error from Processor: " << errorCode << errorMessage;
    mError = errorCode;
 }
@@ -399,12 +421,27 @@ void GenericResource::processCommand(int commandId, const QByteArray &data)
 KAsync::Job<void> GenericResource::synchronizeWithSource()
 {
    return KAsync::start<void>([this](KAsync::Future<void> &future) {
-        Log() << " Synchronizing";
+        Sink::Notification n;
+        n.id = "sync";
+        n.type = Sink::Notification::Status;
+        n.message = "Synchronization has started.";
+        n.code = Sink::ApplicationDomain::BusyStatus;
+        emit notify(n);
+        SinkLog() << " Synchronizing";
        // Changereplay would deadlock otherwise when trying to open the synchronization store
        enableChangeReplay(false);
        mSynchronizer->synchronize()
            .then<void>([this, &future]() {
-                Log() << "Done Synchronizing";
+                SinkLog() << "Done Synchronizing";
+                Sink::Notification n;
+                n.id = "sync";
+                n.type = Sink::Notification::Status;
+                n.message = "Synchronization has ended.";
+                n.code = Sink::ApplicationDomain::ConnectedStatus;
+                emit notify(n);
                enableChangeReplay(true);
                future.setFinished();
            }, [this, &future](int errorCode, const QString &error) {
diff --git a/common/genericresource.h b/common/genericresource.h
index 0878968..25892ca 100644
--- a/common/genericresource.h
+++ b/common/genericresource.h
@@ -40,6 +40,9 @@ class Synchronizer;
 */
 class SINK_EXPORT GenericResource : public Resource
 {
+protected:
+    SINK_DEBUG_AREA("resource")
+    SINK_DEBUG_COMPONENT(mResourceInstanceIdentifier)
 public:
    GenericResource(const QByteArray &resourceType, const QByteArray &resourceInstanceIdentifier, const QSharedPointer<Pipeline> &pipeline);
    virtual ~GenericResource();
@@ -77,7 +80,7 @@ protected:
    QSharedPointer<Pipeline> mPipeline;
 private:
-    CommandProcessor *mProcessor;
+    std::unique_ptr<CommandProcessor> mProcessor;
    QSharedPointer<ChangeReplay> mChangeReplay;
    QSharedPointer<Synchronizer> mSynchronizer;
    int mError;
diff --git a/common/index.cpp b/common/index.cpp
index 151f7af..beed45c 100644
--- a/common/index.cpp
+++ b/common/index.cpp
@@ -2,8 +2,7 @@
 #include "log.h"
-#undef Trace
+SINK_DEBUG_AREA("index")
-#define Trace() Trace_area("index." + mName.toLatin1())
 Index::Index(const QString &storageRoot, const QString &name, Sink::Storage::AccessMode mode)
    : mTransaction(Sink::Storage(storageRoot, name, mode).createTransaction(mode)),
@@ -34,8 +33,8 @@ void Index::lookup(const QByteArray &key, const std::function<void(const QByteAr
            resultHandler(value);
            return true;
        },
-        [errorHandler](const Sink::Storage::Error &error) {
+        [this, errorHandler](const Sink::Storage::Error &error) {
-            Warning() << "Error while retrieving value" << error.message;
+            SinkWarning() << "Error while retrieving value" << error.message;
            errorHandler(Error(error.store, error.code, error.message));
        },
        matchSubStringKeys);
@@ -45,6 +44,6 @@ QByteArray Index::lookup(const QByteArray &key)
 {
    QByteArray result;
    //We have to create a deep copy, otherwise the returned data may become invalid when the transaction ends.
-    lookup(key, [&result](const QByteArray &value) { result = QByteArray(value.constData(), value.size()); }, [this](const Index::Error &error) { Trace() << "Error while retrieving value" << error.message; });
+    lookup(key, [&result](const QByteArray &value) { result = QByteArray(value.constData(), value.size()); }, [this](const Index::Error &error) { SinkTrace() << "Error while retrieving value" << error.message; });
    return result;
 }
diff --git a/common/index.h b/common/index.h
index 0345f56..bfedf9a 100644
--- a/common/index.h
+++ b/common/index.h
@@ -5,6 +5,7 @@
 #include <functional>
 #include <QString>
 #include "storage.h"
+#include "log.h"
 /**
 * An index for value pairs.
@@ -43,4 +44,5 @@ private:
    Sink::Storage::Transaction mTransaction;
    Sink::Storage::NamedDatabase mDb;
    QString mName;
+    SINK_DEBUG_COMPONENT(mName.toLatin1())
 };
diff --git a/common/listener.cpp b/common/listener.cpp
index 84afe16..2c5c1df 100644
--- a/common/listener.cpp
+++ b/common/listener.cpp
@@ -39,39 +39,35 @@
 #include <QTime>
 #include <QDataStream>
-#undef DEBUG_AREA
-#define DEBUG_AREA "resource.communication"
 Listener::Listener(const QByteArray &resourceInstanceIdentifier, const QByteArray &resourceType, QObject *parent)
    : QObject(parent),
      m_server(new QLocalServer(this)),
      m_resourceName(resourceType),
      m_resourceInstanceIdentifier(resourceInstanceIdentifier),
-      m_resource(0),
      m_clientBufferProcessesTimer(new QTimer(this)),
      m_messageId(0)
 {
-    connect(m_server, &QLocalServer::newConnection, this, &Listener::acceptConnection);
+    connect(m_server.get(), &QLocalServer::newConnection, this, &Listener::acceptConnection);
-    Trace() << "Trying to open " << m_resourceInstanceIdentifier;
+    SinkTrace() << "Trying to open " << m_resourceInstanceIdentifier;
    if (!m_server->listen(QString::fromLatin1(m_resourceInstanceIdentifier))) {
        m_server->removeServer(m_resourceInstanceIdentifier);
        if (!m_server->listen(QString::fromLatin1(m_resourceInstanceIdentifier))) {
-            Warning() << "Utter failure to start server";
+            SinkWarning() << "Utter failure to start server";
            exit(-1);
        }
    }
    if (m_server->isListening()) {
-        Log() << QString("Listening on %1").arg(m_server->serverName());
+        SinkLog() << QString("Listening on %1").arg(m_server->serverName());
    }
-    m_checkConnectionsTimer = new QTimer;
+    m_checkConnectionsTimer = std::unique_ptr<QTimer>(new QTimer);
    m_checkConnectionsTimer->setSingleShot(true);
    m_checkConnectionsTimer->setInterval(1000);
-    connect(m_checkConnectionsTimer, &QTimer::timeout, [this]() {
+    connect(m_checkConnectionsTimer.get(), &QTimer::timeout, [this]() {
        if (m_connections.isEmpty()) {
-            Log() << QString("No connections, shutting down.");
+            SinkLog() << QString("No connections, shutting down.");
            quit();
        }
    });
@@ -80,18 +76,19 @@ Listener::Listener(const QByteArray &resourceInstanceIdentifier, const QByteArra
    //      or even just drop down to invoking the method queued? => invoke queued unless we need throttling
    m_clientBufferProcessesTimer->setInterval(0);
    m_clientBufferProcessesTimer->setSingleShot(true);
-    connect(m_clientBufferProcessesTimer, &QTimer::timeout, this, &Listener::processClientBuffers);
+    connect(m_clientBufferProcessesTimer.get(), &QTimer::timeout, this, &Listener::processClientBuffers);
 }
 Listener::~Listener()
 {
+    closeAllConnections();
 }
 void Listener::emergencyAbortAllConnections()
 {
    for (Client &client : m_connections) {
        if (client.socket) {
-            Warning() << "Sending panic";
+            SinkWarning() << "Sending panic";
            client.socket->write("PANIC");
            client.socket->waitForBytesWritten();
            disconnect(client.socket, 0, this, 0);
@@ -120,11 +117,11 @@ void Listener::closeAllConnections()
 void Listener::acceptConnection()
 {
-    Trace() << "Accepting connection";
+    SinkTrace() << "Accepting connection";
    QLocalSocket *socket = m_server->nextPendingConnection();
    if (!socket) {
-        Warning() << "Accepted connection but didn't get a socket for it";
+        SinkWarning() << "Accepted connection but didn't get a socket for it";
        return;
    }
@@ -135,7 +132,7 @@ void Listener::acceptConnection()
    // If this is the first client, set the lower limit for revision cleanup
    if (m_connections.size() == 1) {
-        loadResource()->setLowerBoundRevision(0);
+        loadResource().setLowerBoundRevision(0);
    }
    if (socket->bytesAvailable()) {
@@ -156,13 +153,13 @@ void Listener::clientDropped()
        const Client &client = it.next();
        if (client.socket == socket) {
            dropped = true;
-            Log() << QString("Dropped connection: %1").arg(client.name) << socket;
+            SinkLog() << QString("Dropped connection: %1").arg(client.name) << socket;
            it.remove();
            break;
        }
    }
    if (!dropped) {
-        Warning() << "Failed to find connection for disconnected socket: " << socket;
+        SinkWarning() << "Failed to find connection for disconnected socket: " << socket;
    }
    checkConnections();
@@ -172,7 +169,7 @@ void Listener::checkConnections()
 {
    // If this was the last client, disengage the lower limit for revision cleanup
    if (m_connections.isEmpty()) {
-        loadResource()->setLowerBoundRevision(std::numeric_limits<qint64>::max());
+        loadResource().setLowerBoundRevision(std::numeric_limits<qint64>::max());
    }
    m_checkConnectionsTimer->start();
 }
@@ -188,7 +185,7 @@ void Listener::onDataAvailable()
 void Listener::readFromSocket(QLocalSocket *socket)
 {
-    Trace() << "Reading from socket...";
+    SinkTrace() << "Reading from socket...";
    for (Client &client : m_connections) {
        if (client.socket == socket) {
            client.commandBuffer += socket->readAll();
@@ -231,7 +228,7 @@ void Listener::processCommand(int commandId, uint messageId, const QByteArray &c
                auto buffer = Sink::Commands::GetHandshake(commandBuffer.constData());
                client.name = buffer->name()->c_str();
            } else {
-                Warning() << "received invalid command";
+                SinkWarning() << "received invalid command";
            }
            break;
        }
@@ -239,27 +236,27 @@ void Listener::processCommand(int commandId, uint messageId, const QByteArray &c
            flatbuffers::Verifier verifier((const uint8_t *)commandBuffer.constData(), commandBuffer.size());
            if (Sink::Commands::VerifySynchronizeBuffer(verifier)) {
                auto buffer = Sink::Commands::GetSynchronize(commandBuffer.constData());
-                Trace() << QString("Synchronize request (id %1) from %2").arg(messageId).arg(client.name);
+                SinkTrace() << QString("Synchronize request (id %1) from %2").arg(messageId).arg(client.name);
                auto timer = QSharedPointer<QTime>::create();
                timer->start();
                auto job = KAsync::null<void>();
                if (buffer->sourceSync()) {
-                    job = loadResource()->synchronizeWithSource();
+                    job = loadResource().synchronizeWithSource();
                }
                if (buffer->localSync()) {
-                    job = job.then<void>(loadResource()->processAllMessages());
+                    job = job.then<void>(loadResource().processAllMessages());
                }
                job.then<void>([callback, timer]() {
-                       Trace() << "Sync took " << Sink::Log::TraceTime(timer->elapsed());
+                       SinkTrace() << "Sync took " << Sink::Log::TraceTime(timer->elapsed());
                       callback(true);
                   }, [callback](int errorCode, const QString &msg) {
-                       Warning() << "Sync failed: " << msg;
+                       SinkWarning() << "Sync failed: " << msg;
                       callback(false);
                   })
                    .exec();
                return;
            } else {
-                Warning() << "received invalid command";
+                SinkWarning() << "received invalid command";
            }
            break;
        }
@@ -268,44 +265,43 @@ void Listener::processCommand(int commandId, uint messageId, const QByteArray &c
        case Sink::Commands::DeleteEntityCommand:
        case Sink::Commands::ModifyEntityCommand:
        case Sink::Commands::CreateEntityCommand:
-            Trace() << "Command id  " << messageId << " of type \"" << Sink::Commands::name(commandId) << "\" from " << client.name;
+            SinkTrace() << "Command id  " << messageId << " of type \"" << Sink::Commands::name(commandId) << "\" from " << client.name;
-            loadResource()->processCommand(commandId, commandBuffer);
+            loadResource().processCommand(commandId, commandBuffer);
            break;
        case Sink::Commands::ShutdownCommand:
-            Log() << QString("Received shutdown command from %1").arg(client.name);
+            SinkLog() << QString("Received shutdown command from %1").arg(client.name);
            // Immediately reject new connections
            m_server->close();
            QTimer::singleShot(0, this, &Listener::quit);
            break;
        case Sink::Commands::PingCommand:
-            Trace() << QString("Received ping command from %1").arg(client.name);
+            SinkTrace() << QString("Received ping command from %1").arg(client.name);
            break;
        case Sink::Commands::RevisionReplayedCommand: {
-            Trace() << QString("Received revision replayed command from %1").arg(client.name);
+            SinkTrace() << QString("Received revision replayed command from %1").arg(client.name);
            flatbuffers::Verifier verifier((const uint8_t *)commandBuffer.constData(), commandBuffer.size());
            if (Sink::Commands::VerifyRevisionReplayedBuffer(verifier)) {
                auto buffer = Sink::Commands::GetRevisionReplayed(commandBuffer.constData());
                client.currentRevision = buffer->revision();
            } else {
-                Warning() << "received invalid command";
+                SinkWarning() << "received invalid command";
            }
-            loadResource()->setLowerBoundRevision(lowerBoundRevision());
+            loadResource().setLowerBoundRevision(lowerBoundRevision());
        } break;
        case Sink::Commands::RemoveFromDiskCommand: {
-            Log() << QString("Received a remove from disk command from %1").arg(client.name);
+            SinkLog() << QString("Received a remove from disk command from %1").arg(client.name);
-            delete m_resource;
+            m_resource.reset(nullptr);
-            m_resource = nullptr;
+            loadResource().removeDataFromDisk();
-            loadResource()->removeDataFromDisk();
            m_server->close();
            QTimer::singleShot(0, this, &Listener::quit);
        } break;
        default:
            if (commandId > Sink::Commands::CustomCommand) {
-                Log() << QString("Received custom command from %1: ").arg(client.name) << commandId;
+                SinkLog() << QString("Received custom command from %1: ").arg(client.name) << commandId;
-                loadResource()->processCommand(commandId, commandBuffer);
+                loadResource().processCommand(commandId, commandBuffer);
            } else {
                success = false;
-                ErrorMsg() << QString("\tReceived invalid command from %1: ").arg(client.name) << commandId;
+                SinkError() << QString("\tReceived invalid command from %1: ").arg(client.name) << commandId;
            }
            break;
    }
@@ -330,7 +326,7 @@ qint64 Listener::lowerBoundRevision()
 void Listener::quit()
 {
    // Broadcast shutdown notifications to open clients, so they don't try to restart the resource
-    auto command = Sink::Commands::CreateNotification(m_fbb, Sink::Commands::NotificationType::NotificationType_Shutdown);
+    auto command = Sink::Commands::CreateNotification(m_fbb, Sink::Notification::Shutdown);
    Sink::Commands::FinishNotificationBuffer(m_fbb, command);
    for (Client &client : m_connections) {
        if (client.socket && client.socket->isOpen()) {
@@ -353,7 +349,7 @@ bool Listener::processClientBuffer(Client &client)
    const uint messageId = *(uint *)client.commandBuffer.constData();
    const int commandId = *(int *)(client.commandBuffer.constData() + sizeof(uint));
    const uint size = *(uint *)(client.commandBuffer.constData() + sizeof(int) + sizeof(uint));
-    Trace() << "Received message. Id:" << messageId << " CommandId: " << commandId << " Size: " << size;
+    SinkTrace() << "Received message. Id:" << messageId << " CommandId: " << commandId << " Size: " << size;
    // TODO: reject messages above a certain size?
@@ -366,11 +362,11 @@ bool Listener::processClientBuffer(Client &client)
        const QByteArray commandBuffer = client.commandBuffer.left(size);
        client.commandBuffer.remove(0, size);
        processCommand(commandId, messageId, commandBuffer, client, [this, messageId, commandId, socket, clientName](bool success) {
-            Trace() << QString("Completed command messageid %1 of type \"%2\" from %3").arg(messageId).arg(QString(Sink::Commands::name(commandId))).arg(clientName);
+            SinkTrace() << QString("Completed command messageid %1 of type \"%2\" from %3").arg(messageId).arg(QString(Sink::Commands::name(commandId))).arg(clientName);
            if (socket) {
                sendCommandCompleted(socket.data(), messageId, success);
            } else {
-                Log() << QString("Socket became invalid before we could send a response. client: %1").arg(clientName);
+                SinkLog() << QString("Socket became invalid before we could send a response. client: %1").arg(clientName);
            }
        });
@@ -407,7 +403,7 @@ void Listener::updateClientsWithRevision(qint64 revision)
            continue;
        }
-        Trace() << "Sending revision update for " << client.name << revision;
+        SinkTrace() << "Sending revision update for " << client.name << revision;
        Sink::Commands::write(client.socket, ++m_messageId, Sink::Commands::RevisionUpdateCommand, m_fbb);
    }
    m_fbb.Clear();
@@ -418,7 +414,7 @@ void Listener::notify(const Sink::Notification &notification)
    auto messageString = m_fbb.CreateString(notification.message.toUtf8().constData(), notification.message.toUtf8().size());
    auto idString = m_fbb.CreateString(notification.id.constData(), notification.id.size());
    Sink::Commands::NotificationBuilder builder(m_fbb);
-    builder.add_type(static_cast<Sink::Commands::NotificationType>(notification.type));
+    builder.add_type(notification.type);
    builder.add_code(notification.code);
    builder.add_identifier(idString);
    builder.add_message(messageString);
@@ -432,25 +428,25 @@ void Listener::notify(const Sink::Notification &notification)
    m_fbb.Clear();
 }
-Sink::Resource *Listener::loadResource()
+Sink::Resource &Listener::loadResource()
 {
    if (!m_resource) {
        if (Sink::ResourceFactory *resourceFactory = Sink::ResourceFactory::load(m_resourceName)) {
-            m_resource = resourceFactory->createResource(m_resourceInstanceIdentifier);
+            m_resource = std::unique_ptr<Sink::Resource>(resourceFactory->createResource(m_resourceInstanceIdentifier));
            if (!m_resource) {
-                ErrorMsg() << "Failed to instantiate the resource " << m_resourceName;
+                SinkError() << "Failed to instantiate the resource " << m_resourceName;
-                m_resource = new Sink::Resource;
+                m_resource = std::unique_ptr<Sink::Resource>(new Sink::Resource);
            }
-            Trace() << QString("Resource factory: %1").arg((qlonglong)resourceFactory);
+            SinkTrace() << QString("Resource factory: %1").arg((qlonglong)resourceFactory);
-            Trace() << QString("\tResource: %1").arg((qlonglong)m_resource);
+            SinkTrace() << QString("\tResource: %1").arg((qlonglong)m_resource.get());
-            connect(m_resource, &Sink::Resource::revisionUpdated, this, &Listener::refreshRevision);
+            connect(m_resource.get(), &Sink::Resource::revisionUpdated, this, &Listener::refreshRevision);
-            connect(m_resource, &Sink::Resource::notify, this, &Listener::notify);
+            connect(m_resource.get(), &Sink::Resource::notify, this, &Listener::notify);
        } else {
-            ErrorMsg() << "Failed to load resource " << m_resourceName;
+            SinkError() << "Failed to load resource " << m_resourceName;
-            m_resource = new Sink::Resource;
+            m_resource = std::unique_ptr<Sink::Resource>(new Sink::Resource);
        }
    }
-    return m_resource;
+    return *m_resource;
 }
 #pragma clang diagnostic push
diff --git a/common/listener.h b/common/listener.h
index 5e376c7..d6c537a 100644
--- a/common/listener.h
+++ b/common/listener.h
@@ -25,6 +25,7 @@
 #include <QPointer>
 #include <QLocalSocket>
 #include <flatbuffers/flatbuffers.h>
+#include <log.h>
 namespace Sink {
 class Resource;
@@ -54,6 +55,7 @@ public:
 class SINK_EXPORT Listener : public QObject
 {
    Q_OBJECT
+    SINK_DEBUG_AREA("communication")
 public:
    Listener(const QByteArray &resourceName, const QByteArray &resourceType, QObject *parent = 0);
@@ -81,17 +83,17 @@ private:
    bool processClientBuffer(Client &client);
    void sendCommandCompleted(QLocalSocket *socket, uint messageId, bool success);
    void updateClientsWithRevision(qint64);
-    Sink::Resource *loadResource();
+    Sink::Resource &loadResource();
    void readFromSocket(QLocalSocket *socket);
    qint64 lowerBoundRevision();
-    QLocalServer *m_server;
+    std::unique_ptr<QLocalServer> m_server;
    QVector<Client> m_connections;
    flatbuffers::FlatBufferBuilder m_fbb;
    const QByteArray m_resourceName;
    const QByteArray m_resourceInstanceIdentifier;
-    Sink::Resource *m_resource;
+    std::unique_ptr<Sink::Resource> m_resource;
-    QTimer *m_clientBufferProcessesTimer;
+    std::unique_ptr<QTimer> m_clientBufferProcessesTimer;
-    QTimer *m_checkConnectionsTimer;
+    std::unique_ptr<QTimer> m_checkConnectionsTimer;
    int m_messageId;
 };
diff --git a/common/log.cpp b/common/log.cpp
index b0f6237..099c043 100644
--- a/common/log.cpp
+++ b/common/log.cpp
@@ -4,16 +4,25 @@
 #include <QIODevice>
 #include <QCoreApplication>
 #include <QSettings>
-#include <QStandardPaths>
 #include <QSharedPointer>
+#include <QMutex>
+#include <QMutexLocker>
 #include <iostream>
 #include <unistd.h>
+#include <memory>
+#include <definitions.h>
 using namespace Sink::Log;
 static QSharedPointer<QSettings> config()
 {
-    return QSharedPointer<QSettings>::create(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/sink/log.ini", QSettings::IniFormat);
+    return QSharedPointer<QSettings>::create(Sink::configLocation() + "/log.ini", QSettings::IniFormat);
+}
+static QByteArray sPrimaryComponent;
+void Sink::Log::setPrimaryComponent(const QString &component)
+{
+    sPrimaryComponent = component.toUtf8();
 }
 class DebugStream : public QIODevice
@@ -212,9 +221,63 @@ static QByteArray getProgramName()
    }
 }
+static QSharedPointer<QSettings> debugAreasConfig()
+{
+    return QSharedPointer<QSettings>::create(Sink::dataLocation() + "/debugAreas.ini", QSettings::IniFormat);
+}
+class DebugAreaCollector {
+public:
+    DebugAreaCollector()
+    {
+        QMutexLocker locker(&mutex);
+        mDebugAreas = debugAreasConfig()->value("areas").value<QString>().split(';').toSet();
+    }
+    ~DebugAreaCollector()
+    {
+        QMutexLocker locker(&mutex);
+        mDebugAreas += debugAreasConfig()->value("areas").value<QString>().split(';').toSet();
+        debugAreasConfig()->setValue("areas", QVariant::fromValue(mDebugAreas.toList().join(';')));
+    }
+    void add(const QString &area)
+    {
+        QMutexLocker locker(&mutex);
+        mDebugAreas << area;
+    }
+    QSet<QString> debugAreas()
+    {
+        QMutexLocker locker(&mutex);
+        return mDebugAreas;
+    }
+    QMutex mutex;
+    QSet<QString> mDebugAreas;
+};
+static auto sDebugAreaCollector = std::unique_ptr<DebugAreaCollector>(new DebugAreaCollector);
+QSet<QString> Sink::Log::debugAreas()
+{
+    return sDebugAreaCollector->debugAreas();
+}
+static void collectDebugArea(const QString &debugArea)
+{
+    sDebugAreaCollector->add(debugArea);
+}
 static bool containsItemStartingWith(const QByteArray &pattern, const QByteArrayList &list)
 {
    for (const auto &item : list) {
+        if (item.startsWith('*')) {
+            auto stripped = item.mid(1);
+            if (pattern.contains(stripped)) {
+                return true;
+            }
+        }
        if (pattern.startsWith(item)) {
            return true;
        }
@@ -232,24 +295,23 @@ static bool caseInsensitiveContains(const QByteArray &pattern, const QByteArrayL
    return false;
 }
-QDebug Sink::Log::debugStream(DebugLevel debugLevel, int line, const char *file, const char *function, const char *debugArea)
+QDebug Sink::Log::debugStream(DebugLevel debugLevel, int line, const char *file, const char *function, const char *debugArea, const char *debugComponent)
 {
    static NullStream nullstream;
    if (debugLevel < debugOutputLevel()) {
        return QDebug(&nullstream);
    }
-    auto areas = debugOutputFilter(Sink::Log::Area);
+    if (sPrimaryComponent.isEmpty()) {
-    if (debugArea && !areas.isEmpty()) {
+        sPrimaryComponent = getProgramName();
-        if (!containsItemStartingWith(debugArea, areas)) {
-            return QDebug(&nullstream);
-        }
    }
-    static QByteArray programName = getProgramName();
+    QString fullDebugArea = sPrimaryComponent + "." + (debugComponent ? (QString::fromLatin1(debugComponent) + ".") : "") + (debugArea ? QString::fromLatin1(debugArea) : "");
+    collectDebugArea(fullDebugArea);
-    auto filter = debugOutputFilter(Sink::Log::ApplicationName);
+    auto areas = debugOutputFilter(Sink::Log::Area);
-    if (!filter.isEmpty() && !filter.contains(programName)) {
+    if (!areas.isEmpty()) {
-        if (!containsItemStartingWith(programName, filter)) {
+        if (!containsItemStartingWith(fullDebugArea.toUtf8(), areas)) {
            return QDebug(&nullstream);
        }
    }
@@ -293,19 +355,17 @@ QDebug Sink::Log::debugStream(DebugLevel debugLevel, int line, const char *file,
    }
    if (showProgram) {
        int width = 10;
-        output += QString(" %1(%2)").arg(QString::fromLatin1(programName).leftJustified(width, ' ', true)).arg(unsigned(getpid())).rightJustified(width + 8, ' ');
+        output += QString(" %1(%2)").arg(QString::fromLatin1(getProgramName()).leftJustified(width, ' ', true)).arg(unsigned(getpid())).rightJustified(width + 8, ' ');
    }
-    if (debugArea) {
+    if (useColor) {
-        if (useColor) {
+        output += colorCommand(QList<int>() << ANSI_Colors::Bold << prefixColorCode);
-            output += colorCommand(QList<int>() << ANSI_Colors::Bold << prefixColorCode);
+    }
-        }
+    output += QString(" %1 ").arg(fullDebugArea.leftJustified(25, ' ', true));
-        output += QString(" %1 ").arg(QString::fromLatin1(debugArea).leftJustified(25, ' ', true));
+    if (useColor) {
-        if (useColor) {
+        output += resetColor;
-            output += resetColor;
-        }
    }
    if (showFunction) {
-        output += QString(" %3").arg(QString::fromLatin1(function).leftJustified(25, ' ', true));
+        output += QString(" %3").arg(fullDebugArea.leftJustified(25, ' ', true));
    }
    if (showLocation) {
        const auto filename = QString::fromLatin1(file).split('/').last();
diff --git a/common/log.h b/common/log.h
index 0e92ea9..f47a3ae 100644
--- a/common/log.h
+++ b/common/log.h
@@ -14,6 +14,9 @@ enum DebugLevel
    Error
 };
+void SINK_EXPORT setPrimaryComponent(const QString &component);
+QSet<QString> SINK_EXPORT debugAreas();
 QByteArray SINK_EXPORT debugLevelName(DebugLevel debugLevel);
 DebugLevel SINK_EXPORT debugLevelFromName(const QByteArray &name);
@@ -55,7 +58,7 @@ QByteArrayList SINK_EXPORT debugOutputFilter(FilterType type);
 void SINK_EXPORT setDebugOutputFields(const QByteArrayList &filter);
 QByteArrayList SINK_EXPORT debugOutputFields();
-QDebug SINK_EXPORT debugStream(DebugLevel debugLevel, int line, const char *file, const char *function, const char *debugArea = 0);
+QDebug SINK_EXPORT debugStream(DebugLevel debugLevel, int line, const char *file, const char *function, const char *debugArea = 0, const char *debugComponent = 0);
 struct SINK_EXPORT TraceTime
 {
@@ -71,18 +74,23 @@ inline QDebug SINK_EXPORT operator<<(QDebug d, const TraceTime &time)
 }
 }
-#define DEBUG_AREA nullptr
+static const char *getComponentName() { return nullptr; }
-#define Trace_() Sink::Log::debugStream(Sink::Log::DebugLevel::Trace, __LINE__, __FILE__, Q_FUNC_INFO)
-#define Log_() Sink::Log::debugStream(Sink::Log::DebugLevel::Log, __LINE__, __FILE__, Q_FUNC_INFO)
 #define Trace_area(AREA) Sink::Log::debugStream(Sink::Log::DebugLevel::Trace, __LINE__, __FILE__, Q_FUNC_INFO, AREA)
 #define Log_area(AREA) Sink::Log::debugStream(Sink::Log::DebugLevel::Log, __LINE__, __FILE__, Q_FUNC_INFO, AREA)
 #define Warning_area(AREA) Sink::Log::debugStream(Sink::Log::DebugLevel::Warning, __LINE__, __FILE__, Q_FUNC_INFO, AREA)
 #define Error_area(AREA) Sink::Log::debugStream(Sink::Log::DebugLevel::Error, __LINE__, __FILE__, Q_FUNC_INFO, AREA)
-#define Trace() Sink::Log::debugStream(Sink::Log::DebugLevel::Trace, __LINE__, __FILE__, Q_FUNC_INFO, DEBUG_AREA)
+#define SinkTrace_(COMPONENT, AREA) Sink::Log::debugStream(Sink::Log::DebugLevel::Trace, __LINE__, __FILE__, Q_FUNC_INFO, AREA, COMPONENT)
-#define Log() Sink::Log::debugStream(Sink::Log::DebugLevel::Log, __LINE__, __FILE__, Q_FUNC_INFO, DEBUG_AREA)
+#define SinkLog_(COMPONENT, AREA) Sink::Log::debugStream(Sink::Log::DebugLevel::Log, __LINE__, __FILE__, Q_FUNC_INFO, AREA, COMPONENT)
-#define Warning() Sink::Log::debugStream(Sink::Log::DebugLevel::Warning, __LINE__, __FILE__, Q_FUNC_INFO, DEBUG_AREA)
+#define SinkWarning_(COMPONENT, AREA) Sink::Log::debugStream(Sink::Log::DebugLevel::Warning, __LINE__, __FILE__, Q_FUNC_INFO, AREA, COMPONENT)
-// FIXME Error clashes with Storage::Error and MessageQueue::Error
+#define SinkError_(COMPONENT, AREA) Sink::Log::debugStream(Sink::Log::DebugLevel::Error, __LINE__, __FILE__, Q_FUNC_INFO, AREA, COMPONENT)
-#define ErrorMsg() Sink::Log::debugStream(Sink::Log::DebugLevel::Error, __LINE__, __FILE__, Q_FUNC_INFO, DEBUG_AREA)
+#define SinkTrace() Sink::Log::debugStream(Sink::Log::DebugLevel::Trace, __LINE__, __FILE__, Q_FUNC_INFO, s_sinkDebugArea, getComponentName())
+#define SinkLog() Sink::Log::debugStream(Sink::Log::DebugLevel::Log, __LINE__, __FILE__, Q_FUNC_INFO, s_sinkDebugArea, getComponentName())
+#define SinkWarning() Sink::Log::debugStream(Sink::Log::DebugLevel::Warning, __LINE__, __FILE__, Q_FUNC_INFO, s_sinkDebugArea, getComponentName())
+#define SinkError() Sink::Log::debugStream(Sink::Log::DebugLevel::Error, __LINE__, __FILE__, Q_FUNC_INFO, s_sinkDebugArea, getComponentName())
+#define SINK_DEBUG_AREA(AREA) static constexpr const char* s_sinkDebugArea{AREA};
+#define SINK_DEBUG_COMPONENT(COMPONENT) const char* getComponentName() const { return COMPONENT; };
+#define SINK_DEBUG_COMPONENT_STATIC(COMPONENT) static const char* getComponentName() { return COMPONENT; };
diff --git a/common/mailpreprocessor.cpp b/common/mailpreprocessor.cpp
index 005a93e..2863ad4 100644
--- a/common/mailpreprocessor.cpp
+++ b/common/mailpreprocessor.cpp
@@ -29,6 +29,8 @@
 using namespace Sink;
+SINK_DEBUG_AREA("mailpreprocessor")
 QString MailPropertyExtractor::getFilePathFromMimeMessagePath(const QString &s) const
 {
    return s;
@@ -37,20 +39,24 @@ QString MailPropertyExtractor::getFilePathFromMimeMessagePath(const QString &s)
 void MailPropertyExtractor::updatedIndexedProperties(Sink::ApplicationDomain::Mail &mail)
 {
    const auto mimeMessagePath = getFilePathFromMimeMessagePath(mail.getMimeMessagePath());
-    Trace() << "Updating indexed properties " << mimeMessagePath;
+    if (mimeMessagePath.isNull()) {
+        SinkTrace() << "No mime message";
+        return;
+    }
+    SinkTrace() << "Updating indexed properties " << mimeMessagePath;
    QFile f(mimeMessagePath);
    if (!f.open(QIODevice::ReadOnly)) {
-        Warning() << "Failed to open the file: " << mimeMessagePath;
+        SinkWarning() << "Failed to open the file: " << mimeMessagePath;
        return;
    }
    if (!f.size()) {
-        Warning() << "The file is empty.";
+        SinkWarning() << "The file is empty.";
        return;
    }
    const auto mappedSize = qMin((qint64)8000, f.size());
    auto mapped = f.map(0, mappedSize);
    if (!mapped) {
-        Warning() << "Failed to map the file: " << f.errorString();
+        SinkWarning() << "Failed to map the file: " << f.errorString();
        return;
    }
@@ -85,15 +91,15 @@ QString MimeMessageMover::moveMessage(const QString &oldPath, const Sink::Applic
    const auto filePath = directory + "/" + mail.identifier();
    if (oldPath != filePath) {
        if (!QDir().mkpath(directory)) {
-            Warning() << "Failed to create the directory: " << directory;
+            SinkWarning() << "Failed to create the directory: " << directory;
        }
        QFile::remove(filePath);
        QFile origFile(oldPath);
        if (!origFile.open(QIODevice::ReadWrite)) {
-            Warning() << "Failed to open the original file with write rights: " << origFile.errorString();
+            SinkWarning() << "Failed to open the original file with write rights: " << origFile.errorString();
        }
        if (!origFile.rename(filePath)) {
-            Warning() << "Failed to move the file from: " << oldPath << " to " << filePath << ". " << origFile.errorString();
+            SinkWarning() << "Failed to move the file from: " << oldPath << " to " << filePath << ". " << origFile.errorString();
        }
        origFile.close();
        return filePath;
diff --git a/common/messagequeue.cpp b/common/messagequeue.cpp
index b9f11f8..a6e44e3 100644
--- a/common/messagequeue.cpp
+++ b/common/messagequeue.cpp
@@ -3,6 +3,8 @@
 #include <QDebug>
 #include <log.h>
+SINK_DEBUG_AREA("messagequeue")
 static KAsync::Job<void> waitForCompletion(QList<KAsync::Future<void>> &futures)
 {
    auto context = new QObject;
@@ -128,7 +130,7 @@ KAsync::Job<void> MessageQueue::dequeueBatch(int maxBatchSize, const std::functi
                    return false;
                },
                [](const Sink::Storage::Error &error) {
-                    ErrorMsg() << "Error while retrieving value" << error.message;
+                    SinkError() << "Error while retrieving value" << error.message;
                    // errorHandler(Error(error.store, error.code, error.message));
                });
@@ -164,7 +166,7 @@ bool MessageQueue::isEmpty()
                }
                return true;
            },
-            [](const Sink::Storage::Error &error) { ErrorMsg() << "Error while checking if empty" << error.message; });
+            [](const Sink::Storage::Error &error) { SinkError() << "Error while checking if empty" << error.message; });
    }
    return count == 0;
 }
diff --git a/common/modelresult.cpp b/common/modelresult.cpp
index 3778d4d..56a39ee 100644
--- a/common/modelresult.cpp
+++ b/common/modelresult.cpp
@@ -25,8 +25,7 @@
 #include "domain/folder.h"
 #include "log.h"
-#undef DEBUG_AREA
+SINK_DEBUG_AREA("modelresult")
-#define DEBUG_AREA "client.modelresult"
 static uint qHash(const Sink::ApplicationDomain::ApplicationDomainType &type)
 {
@@ -123,7 +122,7 @@ QModelIndex ModelResult<T, Ptr>::index(int row, int column, const QModelIndex &p
        const auto childId = list.at(row);
        return createIndex(row, column, childId);
    }
-    Warning() << "Index not available " << row << column << parent;
+    SinkWarning() << "Index not available " << row << column << parent;
    Q_ASSERT(false);
    return QModelIndex();
 }
@@ -174,7 +173,7 @@ bool ModelResult<T, Ptr>::canFetchMore(const QModelIndex &parent) const
 template <class T, class Ptr>
 void ModelResult<T, Ptr>::fetchMore(const QModelIndex &parent)
 {
-    Trace() << "Fetching more: " << parent;
+    SinkTrace() << "Fetching more: " << parent;
    fetchEntities(parent);
 }
@@ -185,7 +184,7 @@ void ModelResult<T, Ptr>::add(const Ptr &value)
    const auto id = parentId(value);
    // Ignore updates we get before the initial fetch is done
    if (!mEntityChildrenFetched.contains(id)) {
-        Trace() << "Too early" << id;
+        SinkTrace() << "Too early" << id;
        return;
    }
    auto parent = createIndexFromId(id);
@@ -198,7 +197,7 @@ void ModelResult<T, Ptr>::add(const Ptr &value)
        }
    }
    if (mEntities.contains(childId)) {
-        Warning() << "Entity already in model " << value->identifier();
+        SinkWarning() << "Entity already in model " << value->identifier();
        return;
    }
    // qDebug() << "Inserting rows " << index << parent;
@@ -234,18 +233,18 @@ void ModelResult<T, Ptr>::fetchEntities(const QModelIndex &parent)
    const auto id = getIdentifier(parent);
    mEntityChildrenFetchComplete.remove(id);
    mEntityChildrenFetched.insert(id);
-    Trace() << "Loading child entities of parent " << id;
+    SinkTrace() << "Loading child entities of parent " << id;
    if (loadEntities) {
        loadEntities(parent.data(DomainObjectRole).template value<Ptr>());
    } else {
-        Warning() << "No way to fetch entities";
+        SinkWarning() << "No way to fetch entities";
    }
 }
 template <class T, class Ptr>
 void ModelResult<T, Ptr>::setFetcher(const std::function<void(const Ptr &parent)> &fetcher)
 {
-    Trace() << "Setting fetcher";
+    SinkTrace() << "Setting fetcher";
    loadEntities = fetcher;
 }
@@ -270,7 +269,7 @@ void ModelResult<T, Ptr>::setEmitter(const typename Sink::ResultEmitter<Ptr>::Pt
        });
    });
    emitter->onInitialResultSetComplete([this](const Ptr &parent) {
-        Trace() << "Initial result set complete";
+        SinkTrace() << "Initial result set complete";
        const qint64 parentId = parent ? qHash(*parent) : 0;
        const auto parentIndex = createIndexFromId(parentId);
        mEntityChildrenFetchComplete.insert(parentId);
diff --git a/common/notification.h b/common/notification.h
index 0eb796d..0a267e6 100644
--- a/common/notification.h
+++ b/common/notification.h
@@ -30,6 +30,19 @@ namespace Sink {
 class SINK_EXPORT Notification
 {
 public:
+    enum NoticationType {
+        Shutdown,
+        Status,
+        Warning,
+        Progress,
+        Inspection,
+        RevisionUpdate
+    };
+    enum InspectionCode {
+        Success,
+        Failure
+    };
    QByteArray id;
    int type;
    QString message;
diff --git a/common/pipeline.cpp b/common/pipeline.cpp
index c6d5297..f1a4a32 100644
--- a/common/pipeline.cpp
+++ b/common/pipeline.cpp
@@ -38,8 +38,7 @@
 #include "definitions.h"
 #include "bufferutils.h"
-#undef DEBUG_AREA
+SINK_DEBUG_AREA("pipeline")
-#define DEBUG_AREA "resource.pipeline"
 namespace Sink {
@@ -52,7 +51,7 @@ public:
    Storage storage;
    Storage::Transaction transaction;
-    QHash<QString, QVector<Preprocessor *>> processors;
+    QHash<QString, QVector<QSharedPointer<Preprocessor>>> processors;
    bool revisionChanged;
    void storeNewRevision(qint64 newRevision, const flatbuffers::FlatBufferBuilder &fbb, const QByteArray &bufferType, const QByteArray &uid);
    QTime transactionTime;
@@ -63,10 +62,10 @@ public:
 void Pipeline::Private::storeNewRevision(qint64 newRevision, const flatbuffers::FlatBufferBuilder &fbb, const QByteArray &bufferType, const QByteArray &uid)
 {
-    Trace() << "Committing new revision: " << uid << newRevision;
+    SinkTrace() << "Committing new revision: " << uid << newRevision;
    Storage::mainDatabase(transaction, bufferType)
        .write(Storage::assembleKey(uid, newRevision), BufferUtils::extractBuffer(fbb),
-            [uid, newRevision](const Storage::Error &error) { Warning() << "Failed to write entity" << uid << newRevision; });
+            [uid, newRevision](const Storage::Error &error) { SinkWarning() << "Failed to write entity" << uid << newRevision; });
    revisionChanged = true;
    Storage::setMaxRevision(transaction, newRevision);
    Storage::recordRevision(transaction, newRevision, uid, bufferType);
@@ -79,15 +78,17 @@ Pipeline::Pipeline(const QString &resourceName, QObject *parent) : QObject(paren
 Pipeline::~Pipeline()
 {
-    delete d;
+    d->transaction = Storage::Transaction();
 }
 void Pipeline::setPreprocessors(const QString &entityType, const QVector<Preprocessor *> &processors)
 {
+    auto &list = d->processors[entityType];
+    list.clear();
    for (auto p : processors) {
        p->setup(d->resourceType, d->resourceInstanceIdentifier, this);
+        list.append(QSharedPointer<Preprocessor>(p));
    }
-    d->processors[entityType] = processors;
 }
 void Pipeline::setResourceType(const QByteArray &resourceType)
@@ -105,21 +106,21 @@ void Pipeline::startTransaction()
    if (d->transaction) {
        return;
    }
-    Trace() << "Starting transaction.";
+    SinkTrace() << "Starting transaction.";
    d->transactionTime.start();
    d->transactionItemCount = 0;
-    d->transaction = std::move(storage().createTransaction(Storage::ReadWrite, [](const Sink::Storage::Error &error) {
+    d->transaction = storage().createTransaction(Storage::ReadWrite, [](const Sink::Storage::Error &error) {
-        Warning() << error.message;
+        SinkWarning() << error.message;
-    }));
+    });
    //FIXME this is a temporary measure to recover from a failure to open the named databases correctly.
    //Once the actual problem is fixed it will be enough to simply crash if we open the wrong database (which we check in openDatabase already).
    //It seems like the validateNamedDatabase calls actually stops the mdb_put failures during sync...
    if (d->storage.exists()) {
        while (!d->transaction.validateNamedDatabases()) {
-            Warning() << "Opened an invalid transaction!!!!!!";
+            SinkWarning() << "Opened an invalid transaction!!!!!!";
            d->transaction = std::move(storage().createTransaction(Storage::ReadWrite, [](const Sink::Storage::Error &error) {
-                Warning() << error.message;
+                SinkWarning() << error.message;
            }));
        }
    }
@@ -139,7 +140,7 @@ void Pipeline::commit()
    }
    const auto revision = Storage::maxRevision(d->transaction);
    const auto elapsed = d->transactionTime.elapsed();
-    Log() << "Committing revision: " << revision << ":" << d->transactionItemCount << " items in: " << Log::TraceTime(elapsed) << " "
+    SinkLog() << "Committing revision: " << revision << ":" << d->transactionItemCount << " items in: " << Log::TraceTime(elapsed) << " "
            << (double)elapsed / (double)qMax(d->transactionItemCount, 1) << "[ms/item]";
    if (d->transaction) {
        d->transaction.commit();
@@ -168,7 +169,7 @@ KAsync::Job<qint64> Pipeline::newEntity(void const *command, size_t size)
    {
        flatbuffers::Verifier verifyer(reinterpret_cast<const uint8_t *>(command), size);
        if (!Commands::VerifyCreateEntityBuffer(verifyer)) {
-            Warning() << "invalid buffer, not a create entity buffer";
+            SinkWarning() << "invalid buffer, not a create entity buffer";
            return KAsync::error<qint64>(0);
        }
    }
@@ -180,7 +181,7 @@ KAsync::Job<qint64> Pipeline::newEntity(void const *command, size_t size)
    if (createEntity->entityId()) {
        key = QByteArray(reinterpret_cast<char const *>(createEntity->entityId()->Data()), createEntity->entityId()->size());
        if (Storage::mainDatabase(d->transaction, bufferType).contains(key)) {
-            ErrorMsg() << "An entity with this id already exists: " << key;
+            SinkError() << "An entity with this id already exists: " << key;
            return KAsync::error<qint64>(0);
        }
    }
@@ -188,31 +189,31 @@ KAsync::Job<qint64> Pipeline::newEntity(void const *command, size_t size)
    if (key.isEmpty()) {
        key = Sink::Storage::generateUid();
    }
-    Log() << "New Entity. Type: " << bufferType << "uid: "<< key << " replayToSource: " << replayToSource;
+    SinkLog() << "New Entity. Type: " << bufferType << "uid: "<< key << " replayToSource: " << replayToSource;
    Q_ASSERT(!key.isEmpty());
    {
        flatbuffers::Verifier verifyer(reinterpret_cast<const uint8_t *>(createEntity->delta()->Data()), createEntity->delta()->size());
        if (!VerifyEntityBuffer(verifyer)) {
-            Warning() << "invalid buffer, not an entity buffer";
+            SinkWarning() << "invalid buffer, not an entity buffer";
            return KAsync::error<qint64>(0);
        }
    }
    auto entity = GetEntity(createEntity->delta()->Data());
    if (!entity->resource()->size() && !entity->local()->size()) {
-        Warning() << "No local and no resource buffer while trying to create entity.";
+        SinkWarning() << "No local and no resource buffer while trying to create entity.";
        return KAsync::error<qint64>(0);
    }
    auto adaptorFactory = Sink::AdaptorFactoryRegistry::instance().getFactory(d->resourceType, bufferType);
    if (!adaptorFactory) {
-        Warning() << "no adaptor factory for type " << bufferType;
+        SinkWarning() << "no adaptor factory for type " << bufferType;
        return KAsync::error<qint64>(0);
    }
    auto adaptor = adaptorFactory->createAdaptor(*entity);
    auto memoryAdaptor = QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create(*(adaptor), adaptor->availableProperties());
-    for (auto processor : d->processors[bufferType]) {
+    foreach (const auto &processor, d->processors[bufferType]) {
        processor->newEntity(key, Storage::maxRevision(d->transaction) + 1, *memoryAdaptor, d->transaction);
    }
    //The maxRevision may have changed meanwhile if the entity created sub-entities
@@ -242,7 +243,7 @@ KAsync::Job<qint64> Pipeline::modifiedEntity(void const *command, size_t size)
    {
        flatbuffers::Verifier verifyer(reinterpret_cast<const uint8_t *>(command), size);
        if (!Commands::VerifyModifyEntityBuffer(verifyer)) {
-            Warning() << "invalid buffer, not a modify entity buffer";
+            SinkWarning() << "invalid buffer, not a modify entity buffer";
            return KAsync::error<qint64>(0);
        }
    }
@@ -252,21 +253,21 @@ KAsync::Job<qint64> Pipeline::modifiedEntity(void const *command, size_t size)
    if (modifyEntity->modifiedProperties()) {
        changeset = BufferUtils::fromVector(*modifyEntity->modifiedProperties());
    } else {
-        Warning() << "No changeset available";
+        SinkWarning() << "No changeset available";
    }
    const qint64 baseRevision = modifyEntity->revision();
    const bool replayToSource = modifyEntity->replayToSource();
    const QByteArray bufferType = QByteArray(reinterpret_cast<char const *>(modifyEntity->domainType()->Data()), modifyEntity->domainType()->size());
    const QByteArray key = QByteArray(reinterpret_cast<char const *>(modifyEntity->entityId()->Data()), modifyEntity->entityId()->size());
-    Log() << "Modified Entity. Type: " << bufferType << "uid: "<< key << " replayToSource: " << replayToSource;
+    SinkLog() << "Modified Entity. Type: " << bufferType << "uid: "<< key << " replayToSource: " << replayToSource;
    if (bufferType.isEmpty() || key.isEmpty()) {
-        Warning() << "entity type or key " << bufferType << key;
+        SinkWarning() << "entity type or key " << bufferType << key;
        return KAsync::error<qint64>(0);
    }
    {
        flatbuffers::Verifier verifyer(reinterpret_cast<const uint8_t *>(modifyEntity->delta()->Data()), modifyEntity->delta()->size());
        if (!VerifyEntityBuffer(verifyer)) {
-            Warning() << "invalid buffer, not an entity buffer";
+            SinkWarning() << "invalid buffer, not an entity buffer";
            return KAsync::error<qint64>(0);
        }
    }
@@ -274,7 +275,7 @@ KAsync::Job<qint64> Pipeline::modifiedEntity(void const *command, size_t size)
    // TODO use only readPropertyMapper and writePropertyMapper
    auto adaptorFactory = Sink::AdaptorFactoryRegistry::instance().getFactory(d->resourceType, bufferType);
    if (!adaptorFactory) {
-        Warning() << "no adaptor factory for type " << bufferType;
+        SinkWarning() << "no adaptor factory for type " << bufferType;
        return KAsync::error<qint64>(0);
    }
@@ -288,16 +289,16 @@ KAsync::Job<qint64> Pipeline::modifiedEntity(void const *command, size_t size)
            [&current, adaptorFactory](const QByteArray &key, const QByteArray &data) -> bool {
                EntityBuffer buffer(const_cast<const char *>(data.data()), data.size());
                if (!buffer.isValid()) {
-                    Warning() << "Read invalid buffer from disk";
+                    SinkWarning() << "Read invalid buffer from disk";
                } else {
                    current = adaptorFactory->createAdaptor(buffer.entity());
                }
                return false;
            },
-            [baseRevision](const Storage::Error &error) { Warning() << "Failed to read old revision from storage: " << error.message << "Revision: " << baseRevision; });
+            [baseRevision](const Storage::Error &error) { SinkWarning() << "Failed to read old revision from storage: " << error.message << "Revision: " << baseRevision; });
    if (!current) {
-        Warning() << "Failed to read local value " << key;
+        SinkWarning() << "Failed to read local value " << key;
        return KAsync::error<qint64>(0);
    }
@@ -305,7 +306,7 @@ KAsync::Job<qint64> Pipeline::modifiedEntity(void const *command, size_t size)
    // Apply diff
    // FIXME only apply the properties that are available in the buffer
-    Trace() << "Applying changed properties: " << changeset;
+    SinkTrace() << "Applying changed properties: " << changeset;
    for (const auto &property : changeset) {
        const auto value = diff->getProperty(property);
        if (value.isValid()) {
@@ -321,7 +322,7 @@ KAsync::Job<qint64> Pipeline::modifiedEntity(void const *command, size_t size)
    }
    newAdaptor->resetChangedProperties();
-    for (auto processor : d->processors[bufferType]) {
+    foreach (const auto &processor, d->processors[bufferType]) {
        processor->modifiedEntity(key, Storage::maxRevision(d->transaction) + 1, *current, *newAdaptor, d->transaction);
    }
    //The maxRevision may have changed meanwhile if the entity created sub-entities
@@ -355,7 +356,7 @@ KAsync::Job<qint64> Pipeline::deletedEntity(void const *command, size_t size)
    {
        flatbuffers::Verifier verifyer(reinterpret_cast<const uint8_t *>(command), size);
        if (!Commands::VerifyDeleteEntityBuffer(verifyer)) {
-            Warning() << "invalid buffer, not a delete entity buffer";
+            SinkWarning() << "invalid buffer, not a delete entity buffer";
            return KAsync::error<qint64>(0);
        }
    }
@@ -364,7 +365,7 @@ KAsync::Job<qint64> Pipeline::deletedEntity(void const *command, size_t size)
    const bool replayToSource = deleteEntity->replayToSource();
    const QByteArray bufferType = QByteArray(reinterpret_cast<char const *>(deleteEntity->domainType()->Data()), deleteEntity->domainType()->size());
    const QByteArray key = QByteArray(reinterpret_cast<char const *>(deleteEntity->entityId()->Data()), deleteEntity->entityId()->size());
-    Log() << "Deleted Entity. Type: " << bufferType << "uid: "<< key << " replayToSource: " << replayToSource;
+    SinkLog() << "Deleted Entity. Type: " << bufferType << "uid: "<< key << " replayToSource: " << replayToSource;
    bool found = false;
    bool alreadyRemoved = false;
@@ -381,14 +382,14 @@ KAsync::Job<qint64> Pipeline::deletedEntity(void const *command, size_t size)
                }
                return false;
            },
-            [](const Storage::Error &error) { Warning() << "Failed to read old revision from storage: " << error.message; });
+            [](const Storage::Error &error) { SinkWarning() << "Failed to read old revision from storage: " << error.message; });
    if (!found) {
-        Warning() << "Failed to find entity " << key;
+        SinkWarning() << "Failed to find entity " << key;
        return KAsync::error<qint64>(0);
    }
    if (alreadyRemoved) {
-        Warning() << "Entity is already removed " << key;
+        SinkWarning() << "Entity is already removed " << key;
        return KAsync::error<qint64>(0);
    }
@@ -408,7 +409,7 @@ KAsync::Job<qint64> Pipeline::deletedEntity(void const *command, size_t size)
    auto adaptorFactory = Sink::AdaptorFactoryRegistry::instance().getFactory(d->resourceType, bufferType);
    if (!adaptorFactory) {
-        Warning() << "no adaptor factory for type " << bufferType;
+        SinkWarning() << "no adaptor factory for type " << bufferType;
        return KAsync::error<qint64>(0);
    }
@@ -418,17 +419,17 @@ KAsync::Job<qint64> Pipeline::deletedEntity(void const *command, size_t size)
            [this, bufferType, newRevision, adaptorFactory, key, &current](const QByteArray &, const QByteArray &data) -> bool {
                EntityBuffer buffer(const_cast<const char *>(data.data()), data.size());
                if (!buffer.isValid()) {
-                    Warning() << "Read invalid buffer from disk";
+                    SinkWarning() << "Read invalid buffer from disk";
                } else {
                    current = adaptorFactory->createAdaptor(buffer.entity());
                }
                return false;
            },
-            [this](const Storage::Error &error) { ErrorMsg() << "Failed to find value in pipeline: " << error.message; });
+            [this](const Storage::Error &error) { SinkError() << "Failed to find value in pipeline: " << error.message; });
    d->storeNewRevision(newRevision, fbb, bufferType, key);
-    for (auto processor : d->processors[bufferType]) {
+    foreach (const auto &processor, d->processors[bufferType]) {
        processor->deletedEntity(key, newRevision, *current, d->transaction);
    }
@@ -440,13 +441,13 @@ void Pipeline::cleanupRevision(qint64 revision)
    d->revisionChanged = true;
    const auto uid = Storage::getUidFromRevision(d->transaction, revision);
    const auto bufferType = Storage::getTypeFromRevision(d->transaction, revision);
-    Trace() << "Cleaning up revision " << revision << uid << bufferType;
+    SinkTrace() << "Cleaning up revision " << revision << uid << bufferType;
    Storage::mainDatabase(d->transaction, bufferType)
        .scan(uid,
            [&](const QByteArray &key, const QByteArray &data) -> bool {
                EntityBuffer buffer(const_cast<const char *>(data.data()), data.size());
                if (!buffer.isValid()) {
-                    Warning() << "Read invalid buffer from disk";
+                    SinkWarning() << "Read invalid buffer from disk";
                } else {
                    const auto metadata = flatbuffers::GetRoot<Metadata>(buffer.metadataBuffer());
                    const qint64 rev = metadata->revision();
@@ -459,7 +460,7 @@ void Pipeline::cleanupRevision(qint64 revision)
                return true;
            },
-            [](const Storage::Error &error) { Warning() << "Error while reading: " << error.message; }, true);
+            [](const Storage::Error &error) { SinkWarning() << "Error while reading: " << error.message; }, true);
    Storage::setCleanedUpRevision(d->transaction, revision);
 }
@@ -481,7 +482,6 @@ Preprocessor::Preprocessor() : d(new Preprocessor::Private)
 Preprocessor::~Preprocessor()
 {
-    delete d;
 }
 void Preprocessor::setup(const QByteArray &resourceType, const QByteArray &resourceInstanceIdentifier, Pipeline *pipeline)
diff --git a/common/pipeline.h b/common/pipeline.h
index d04d795..ef89cf0 100644
--- a/common/pipeline.h
+++ b/common/pipeline.h
@@ -72,7 +72,7 @@ signals:
 private:
    class Private;
-    Private *const d;
+    const std::unique_ptr<Private> d;
 };
 class SINK_EXPORT Preprocessor
@@ -103,7 +103,7 @@ protected:
 private:
    friend class Pipeline;
    class Private;
-    Private *const d;
+    const std::unique_ptr<Private> d;
 };
 template<typename DomainType>
diff --git a/common/queryrunner.cpp b/common/queryrunner.cpp
index 78a4b94..2e2e96d 100644
--- a/common/queryrunner.cpp
+++ b/common/queryrunner.cpp
@@ -29,8 +29,7 @@
 #include "asyncutils.h"
 #include "entityreader.h"
-#undef DEBUG_AREA
+SINK_DEBUG_AREA("queryrunner")
-#define DEBUG_AREA "client.queryrunner"
 using namespace Sink;
@@ -43,6 +42,8 @@ using namespace Sink;
 template <typename DomainType>
 class QueryWorker : public QObject
 {
+    // SINK_DEBUG_COMPONENT(mResourceInstanceIdentifier, mId)
+    SINK_DEBUG_COMPONENT(mResourceInstanceIdentifier)
 public:
    QueryWorker(const Sink::Query &query, const QByteArray &instanceIdentifier, const DomainTypeAdaptorFactoryInterface::Ptr &, const QByteArray &bufferType,
        const QueryRunnerBase::ResultTransformation &transformation);
@@ -61,22 +62,19 @@ private:
    QByteArray mId; //Used for identification in debug output
 };
-#undef Trace
-#define Trace() Trace_area(DEBUG_AREA)
 template <class DomainType>
 QueryRunner<DomainType>::QueryRunner(const Sink::Query &query, const Sink::ResourceAccessInterface::Ptr &resourceAccess, const QByteArray &instanceIdentifier,
    const DomainTypeAdaptorFactoryInterface::Ptr &factory, const QByteArray &bufferType)
    : QueryRunnerBase(), mResourceAccess(resourceAccess), mResultProvider(new ResultProvider<typename DomainType::Ptr>), mBatchSize(query.limit)
 {
-    Trace() << "Starting query";
+    SinkTrace() << "Starting query";
    if (query.limit && query.sortProperty.isEmpty()) {
-        Warning() << "A limited query without sorting is typically a bad idea.";
+        SinkWarning() << "A limited query without sorting is typically a bad idea.";
    }
    // We delegate loading of initial data to the result provider, so it can decide for itself what it needs to load.
    mResultProvider->setFetcher([=](const typename DomainType::Ptr &parent) {
        const QByteArray parentId = parent ? parent->identifier() : QByteArray();
-        Trace() << "Running fetcher. Offset: " << mOffset[parentId] << " Batchsize: " << mBatchSize;
+        SinkTrace() << "Running fetcher. Offset: " << mOffset[parentId] << " Batchsize: " << mBatchSize;
        auto resultProvider = mResultProvider;
        if (query.synchronousQuery) {
            QueryWorker<DomainType> worker(query, instanceIdentifier, factory, bufferType, mResultTransformation);
@@ -123,12 +121,15 @@ QueryRunner<DomainType>::QueryRunner(const Sink::Query &query, const Sink::Resou
        mResourceAccess->open();
        QObject::connect(mResourceAccess.data(), &Sink::ResourceAccess::revisionChanged, this, &QueryRunner::revisionChanged);
    }
+    mResultProvider->onDone([this]() {
+        delete this;
+    });
 }
 template <class DomainType>
 QueryRunner<DomainType>::~QueryRunner()
 {
-    Trace() << "Stopped query";
+    SinkTrace() << "Stopped query";
 }
 template <class DomainType>
@@ -144,21 +145,18 @@ typename Sink::ResultEmitter<typename DomainType::Ptr>::Ptr QueryRunner<DomainTy
 }
-#undef Trace
-#define Trace() Trace_area("client.queryrunner." + mId)
 template <class DomainType>
 QueryWorker<DomainType>::QueryWorker(const Sink::Query &query, const QByteArray &instanceIdentifier, const DomainTypeAdaptorFactoryInterface::Ptr &factory,
    const QByteArray &bufferType, const QueryRunnerBase::ResultTransformation &transformation)
    : QObject(), mResultTransformation(transformation), mDomainTypeAdaptorFactory(factory), mResourceInstanceIdentifier(instanceIdentifier), mId(QUuid::createUuid().toByteArray())
 {
-    Trace() << "Starting query worker";
+    SinkTrace() << "Starting query worker";
 }
 template <class DomainType>
 QueryWorker<DomainType>::~QueryWorker()
 {
-    Trace() << "Stopped query worker";
+    SinkTrace() << "Stopped query worker";
 }
 template <class DomainType>
@@ -171,15 +169,15 @@ std::function<bool(const typename DomainType::Ptr &, Sink::Operation)> QueryWork
        }
        switch (operation) {
            case Sink::Operation_Creation:
-                // Trace() << "Got creation";
+                // SinkTrace() << "Got creation";
                resultProvider.add(valueCopy);
                break;
            case Sink::Operation_Modification:
-                // Trace() << "Got modification";
+                // SinkTrace() << "Got modification";
                resultProvider.modify(valueCopy);
                break;
            case Sink::Operation_Removal:
-                // Trace() << "Got removal";
+                // SinkTrace() << "Got removal";
                resultProvider.remove(valueCopy);
                break;
        }
@@ -197,7 +195,7 @@ QPair<qint64, qint64> QueryWorker<DomainType>::executeIncrementalQuery(const Sin
    Sink::EntityReader<DomainType> reader(*mDomainTypeAdaptorFactory, mResourceInstanceIdentifier, transaction);
    auto revisionAndReplayedEntities = reader.executeIncrementalQuery(query, resultProvider.revision(), resultProviderCallback(query, resultProvider));
-    Trace() << "Incremental query took: " << Log::TraceTime(time.elapsed());
+    SinkTrace() << "Incremental query took: " << Log::TraceTime(time.elapsed());
    return revisionAndReplayedEntities;
 }
@@ -209,10 +207,10 @@ Storage::Transaction QueryWorker<DomainType>::getTransaction()
        Sink::Storage storage(Sink::storageLocation(), mResourceInstanceIdentifier);
        if (!storage.exists()) {
            //This is not an error if the resource wasn't started before
-            Log() << "Store doesn't exist: " << mResourceInstanceIdentifier;
+            SinkLog() << "Store doesn't exist: " << mResourceInstanceIdentifier;
            return Sink::Storage::Transaction();
        }
-        storage.setDefaultErrorHandler([](const Sink::Storage::Error &error) { Warning() << "Error during query: " << error.store << error.message; });
+        storage.setDefaultErrorHandler([this](const Sink::Storage::Error &error) { SinkWarning() << "Error during query: " << error.store << error.message; });
        transaction = storage.createTransaction(Sink::Storage::ReadOnly);
    }
@@ -235,10 +233,10 @@ QPair<qint64, qint64> QueryWorker<DomainType>::executeInitialQuery(
    auto modifiedQuery = query;
    if (!query.parentProperty.isEmpty()) {
        if (parent) {
-            Trace() << "Running initial query for parent:" << parent->identifier();
+            SinkTrace() << "Running initial query for parent:" << parent->identifier();
            modifiedQuery.propertyFilter.insert(query.parentProperty, Query::Comparator(parent->identifier()));
        } else {
-            Trace() << "Running initial query for toplevel";
+            SinkTrace() << "Running initial query for toplevel";
            modifiedQuery.propertyFilter.insert(query.parentProperty, Query::Comparator(QVariant()));
        }
    }
@@ -247,7 +245,7 @@ QPair<qint64, qint64> QueryWorker<DomainType>::executeInitialQuery(
    Sink::EntityReader<DomainType> reader(*mDomainTypeAdaptorFactory, mResourceInstanceIdentifier, transaction);
    auto revisionAndReplayedEntities = reader.executeInitialQuery(modifiedQuery, offset, batchsize, resultProviderCallback(query, resultProvider));
-    Trace() << "Initial query took: " << Log::TraceTime(time.elapsed());
+    SinkTrace() << "Initial query took: " << Log::TraceTime(time.elapsed());
    return revisionAndReplayedEntities;
 }
diff --git a/common/queryrunner.h b/common/queryrunner.h
index e6d5a54..155528e 100644
--- a/common/queryrunner.h
+++ b/common/queryrunner.h
@@ -32,6 +32,8 @@
 class QueryRunnerBase : public QObject
 {
    Q_OBJECT
+protected:
+    SINK_DEBUG_AREA("queryrunner")
 public:
    typedef std::function<void(Sink::ApplicationDomain::ApplicationDomainType &domainObject)> ResultTransformation;
@@ -52,7 +54,7 @@ protected slots:
     */
    void revisionChanged(qint64 newRevision)
    {
-        Trace() << "New revision: " << newRevision;
+        SinkTrace() << "New revision: " << newRevision;
        run().exec();
    }
diff --git a/common/remoteidmap.cpp b/common/remoteidmap.cpp
index bbcd641..20a054d 100644
--- a/common/remoteidmap.cpp
+++ b/common/remoteidmap.cpp
@@ -25,6 +25,8 @@
 using namespace Sink;
+SINK_DEBUG_AREA("remoteidmap")
 RemoteIdMap::RemoteIdMap(Sink::Storage::Transaction &transaction)
    : mTransaction(transaction)
 {
@@ -67,7 +69,7 @@ QByteArray RemoteIdMap::resolveLocalId(const QByteArray &bufferType, const QByte
 {
    QByteArray remoteId = Index("localid.mapping." + bufferType, mTransaction).lookup(localId);
    if (remoteId.isEmpty()) {
-        Warning() << "Couldn't find the remote id for " << localId;
+        SinkWarning() << "Couldn't find the remote id for " << localId;
        return QByteArray();
    }
    return remoteId;
diff --git a/common/resource.h b/common/resource.h
index d6c3c5f..1c35838 100644
--- a/common/resource.h
+++ b/common/resource.h
@@ -91,4 +91,4 @@ private:
 } // namespace Sink
-Q_DECLARE_INTERFACE(Sink::ResourceFactory, "org.kde.sink.resourcefactory")
+Q_DECLARE_INTERFACE(Sink::ResourceFactory, "sink.sink.resourcefactory")
diff --git a/common/resourceaccess.cpp b/common/resourceaccess.cpp
index d3bd85f..c878143 100644
--- a/common/resourceaccess.cpp
+++ b/common/resourceaccess.cpp
@@ -44,12 +44,6 @@
 #include <QBuffer>
 #include <QTime>
-#undef Trace
-#define TracePrivate() Trace_area("client.communication." + resourceInstanceIdentifier)
-#define Trace() Trace_area("client.communication." + d->resourceInstanceIdentifier)
-#undef Log
-#define Log() Log_area("client.communication." + d->resourceInstanceIdentifier)
 static void queuedInvoke(const std::function<void()> &f, QObject *context = 0)
 {
    auto timer = QSharedPointer<QTimer>::create();
@@ -100,8 +94,10 @@ public:
    QHash<uint, bool> completeCommands;
    uint messageId;
    bool openingSocket;
+    SINK_DEBUG_COMPONENT(resourceInstanceIdentifier)
 };
 ResourceAccess::Private::Private(const QByteArray &name, const QByteArray &instanceIdentifier, ResourceAccess *q)
    : resourceName(name), resourceInstanceIdentifier(instanceIdentifier), messageId(0), openingSocket(false)
 {
@@ -111,7 +107,7 @@ void ResourceAccess::Private::abortPendingOperations()
 {
    callCallbacks();
    if (!resultHandler.isEmpty()) {
-        Warning() << "Aborting pending operations " << resultHandler.keys();
+        SinkWarning() << "Aborting pending operations " << resultHandler.keys();
    }
    auto handlers = resultHandler.values();
    resultHandler.clear();
@@ -165,7 +161,7 @@ KAsync::Job<void> ResourceAccess::Private::tryToConnect()
    auto counter = QSharedPointer<int>::create(0);
    return KAsync::dowhile([this]() -> bool { return !socket; },
        [this, counter](KAsync::Future<void> &future) {
-            TracePrivate() << "Loop";
+            SinkTrace() << "Loop";
            connectToServer(resourceInstanceIdentifier)
                .then<void, QSharedPointer<QLocalSocket>>(
                    [this, &future](const QSharedPointer<QLocalSocket> &s) {
@@ -178,7 +174,7 @@ KAsync::Job<void> ResourceAccess::Private::tryToConnect()
                        static int timeout = 500;
                        static int maxRetries = timeout / waitTime;
                        if (*counter > maxRetries) {
-                            TracePrivate() << "Giving up";
+                            SinkTrace() << "Giving up";
                            future.setError(-1, "Failed to connect to socket");
                        } else {
                            KAsync::wait(waitTime).then<void>([&future]() { future.setFinished(); }).exec();
@@ -192,17 +188,17 @@ KAsync::Job<void> ResourceAccess::Private::tryToConnect()
 KAsync::Job<void> ResourceAccess::Private::initializeSocket()
 {
    return KAsync::start<void>([this](KAsync::Future<void> &future) {
-        TracePrivate() << "Trying to connect";
+        SinkTrace() << "Trying to connect";
        connectToServer(resourceInstanceIdentifier)
            .then<void, QSharedPointer<QLocalSocket>>(
                [this, &future](const QSharedPointer<QLocalSocket> &s) {
-                    TracePrivate() << "Connected to resource, without having to start it.";
+                    SinkTrace() << "Connected to resource, without having to start it.";
                    Q_ASSERT(s);
                    socket = s;
                    future.setFinished();
                },
                [this, &future](int errorCode, const QString &errorString) {
-                    TracePrivate() << "Failed to connect, starting resource";
+                    SinkTrace() << "Failed to connect, starting resource";
                    // We failed to connect, so let's start the resource
                    QStringList args;
                    if (Sink::Test::testModeEnabled()) {
@@ -211,16 +207,16 @@ KAsync::Job<void> ResourceAccess::Private::initializeSocket()
                    args << resourceInstanceIdentifier << resourceName;
                    qint64 pid = 0;
                    if (QProcess::startDetached("sink_synchronizer", args, QDir::homePath(), &pid)) {
-                        TracePrivate() << "Started resource " << pid;
+                        SinkTrace() << "Started resource " << pid;
                        tryToConnect()
                            .then<void>([&future]() { future.setFinished(); },
                                [this, &future](int errorCode, const QString &errorString) {
-                                    Warning() << "Failed to connect to started resource";
+                                    SinkWarning() << "Failed to connect to started resource";
                                    future.setError(errorCode, errorString);
                                })
                            .exec();
                    } else {
-                        Warning() << "Failed to start resource";
+                        SinkWarning() << "Failed to start resource";
                    }
                })
            .exec();
@@ -230,14 +226,15 @@ KAsync::Job<void> ResourceAccess::Private::initializeSocket()
 ResourceAccess::ResourceAccess(const QByteArray &resourceInstanceIdentifier, const QByteArray &resourceType)
    : ResourceAccessInterface(), d(new Private(resourceType, resourceInstanceIdentifier, this))
 {
-    Trace() << "Starting access";
+    mResourceStatus = Sink::ApplicationDomain::OfflineStatus;
+    SinkTrace() << "Starting access";
 }
 ResourceAccess::~ResourceAccess()
 {
-    Log() << "Closing access";
+    SinkLog() << "Closing access";
    if (!d->resultHandler.isEmpty()) {
-        Warning() << "Left jobs running while shutting down ResourceAccess: " << d->resultHandler.keys();
+        SinkWarning() << "Left jobs running while shutting down ResourceAccess: " << d->resultHandler.keys();
    }
 }
@@ -294,7 +291,7 @@ KAsync::Job<void> ResourceAccess::sendCommand(int commandId, flatbuffers::FlatBu
 KAsync::Job<void> ResourceAccess::synchronizeResource(bool sourceSync, bool localSync)
 {
-    Trace() << "Sending synchronize command: " << sourceSync << localSync;
+    SinkTrace() << "Sending synchronize command: " << sourceSync << localSync;
    flatbuffers::FlatBufferBuilder fbb;
    auto command = Sink::Commands::CreateSynchronize(fbb, sourceSync, localSync);
    Sink::Commands::FinishSynchronizeBuffer(fbb, command);
@@ -375,7 +372,7 @@ ResourceAccess::sendInspectionCommand(int inspectionType, const QByteArray &insp
 void ResourceAccess::open()
 {
    if (d->socket && d->socket->isValid()) {
-        // Trace() << "Socket valid, so not opening again";
+        // SinkTrace() << "Socket valid, so not opening again";
        return;
    }
    if (d->openingSocket) {
@@ -387,7 +384,7 @@ void ResourceAccess::open()
    d->initializeSocket()
        .then<void>(
            [this, time]() {
-                Trace() << "Socket is initialized." << Log::TraceTime(time->elapsed());
+                SinkTrace() << "Socket is initialized." << Log::TraceTime(time->elapsed());
                d->openingSocket = false;
                QObject::connect(d->socket.data(), &QLocalSocket::disconnected, this, &ResourceAccess::disconnected);
                QObject::connect(d->socket.data(), SIGNAL(error(QLocalSocket::LocalSocketError)), this, SLOT(connectionError(QLocalSocket::LocalSocketError)));
@@ -396,16 +393,16 @@ void ResourceAccess::open()
            },
            [this](int error, const QString &errorString) {
                d->openingSocket = false;
-                Warning() << "Failed to initialize socket " << errorString;
+                SinkWarning() << "Failed to initialize socket " << errorString;
            })
        .exec();
 }
 void ResourceAccess::close()
 {
-    Log() << QString("Closing %1").arg(d->socket->fullServerName());
+    SinkLog() << QString("Closing %1").arg(d->socket->fullServerName());
-    Trace() << "Pending commands: " << d->pendingCommands.size();
+    SinkTrace() << "Pending commands: " << d->pendingCommands.size();
-    Trace() << "Queued commands: " << d->commandQueue.size();
+    SinkTrace() << "Queued commands: " << d->commandQueue.size();
    d->socket->close();
 }
@@ -415,10 +412,10 @@ void ResourceAccess::sendCommand(const QSharedPointer<QueuedCommand> &command)
    // TODO: we should have a timeout for commands
    d->messageId++;
    const auto messageId = d->messageId;
-    Trace() << QString("Sending command \"%1\" with messageId %2").arg(QString(Sink::Commands::name(command->commandId))).arg(d->messageId);
+    SinkTrace() << QString("Sending command \"%1\" with messageId %2").arg(QString(Sink::Commands::name(command->commandId))).arg(d->messageId);
    Q_ASSERT(command->callback);
    registerCallback(d->messageId, [this, messageId, command](int errorCode, QString errorMessage) {
-        Trace() << "Command complete " << messageId;
+        SinkTrace() << "Command complete " << messageId;
        d->pendingCommands.remove(messageId);
        command->callback(errorCode, errorMessage);
    });
@@ -430,8 +427,8 @@ void ResourceAccess::sendCommand(const QSharedPointer<QueuedCommand> &command)
 void ResourceAccess::processCommandQueue()
 {
    // TODO: serialize instead of blast them all through the socket?
-    Trace() << "We have " << d->commandQueue.size() << " queued commands";
+    SinkTrace() << "We have " << d->commandQueue.size() << " queued commands";
-    Trace() << "Pending commands: " << d->pendingCommands.size();
+    SinkTrace() << "Pending commands: " << d->pendingCommands.size();
    for (auto command : d->commandQueue) {
        sendCommand(command);
    }
@@ -440,9 +437,9 @@ void ResourceAccess::processCommandQueue()
 void ResourceAccess::processPendingCommandQueue()
 {
-    Trace() << "We have " << d->pendingCommands.size() << " pending commands";
+    SinkTrace() << "We have " << d->pendingCommands.size() << " pending commands";
    for (auto command : d->pendingCommands) {
-        Trace() << "Reenquing command " << command->commandId;
+        SinkTrace() << "Reenquing command " << command->commandId;
        d->commandQueue << command;
    }
    d->pendingCommands.clear();
@@ -452,11 +449,11 @@ void ResourceAccess::processPendingCommandQueue()
 void ResourceAccess::connected()
 {
    if (!isReady()) {
-        Trace() << "Connected but not ready?";
+        SinkTrace() << "Connected but not ready?";
        return;
    }
-    Trace() << QString("Connected: %1").arg(d->socket->fullServerName());
+    SinkTrace() << QString("Connected: %1").arg(d->socket->fullServerName());
    {
        flatbuffers::FlatBufferBuilder fbb;
@@ -476,7 +473,7 @@ void ResourceAccess::connected()
 void ResourceAccess::disconnected()
 {
-    Log() << QString("Disconnected from %1").arg(d->socket->fullServerName());
+    SinkLog() << QString("Disconnected from %1").arg(d->socket->fullServerName());
    d->socket->close();
    emit ready(false);
 }
@@ -485,15 +482,15 @@ void ResourceAccess::connectionError(QLocalSocket::LocalSocketError error)
 {
    const bool resourceCrashed = d->partialMessageBuffer.contains("PANIC");
    if (resourceCrashed) {
-        ErrorMsg() << "The resource crashed!";
+        SinkError() << "The resource crashed!";
        d->abortPendingOperations();
    } else if (error == QLocalSocket::PeerClosedError) {
-        Log() << "The resource closed the connection.";
+        SinkLog() << "The resource closed the connection.";
        d->abortPendingOperations();
    } else {
-        Warning() << QString("Connection error: %1 : %2").arg(error).arg(d->socket->errorString());
+        SinkWarning() << QString("Connection error: %1 : %2").arg(error).arg(d->socket->errorString());
        if (d->pendingCommands.size()) {
-            Trace() << "Reconnecting due to pending operations: " << d->pendingCommands.size();
+            SinkTrace() << "Reconnecting due to pending operations: " << d->pendingCommands.size();
            open();
        }
    }
@@ -502,7 +499,7 @@ void ResourceAccess::connectionError(QLocalSocket::LocalSocketError error)
 void ResourceAccess::readResourceMessage()
 {
    if (!d->socket || !d->socket->isValid()) {
-        Warning() << "No socket available";
+        SinkWarning() << "No socket available";
        return;
    }
@@ -513,11 +510,27 @@ void ResourceAccess::readResourceMessage()
    }
 }
+static Sink::Notification getNotification(const Sink::Commands::Notification *buffer)
+{
+    Sink::Notification n;
+    if (buffer->identifier()) {
+        // Don't use fromRawData, the buffer is gone once we invoke emit notification
+        n.id = BufferUtils::extractBufferCopy(buffer->identifier());
+    }
+    if (buffer->message()) {
+        // Don't use fromRawData, the buffer is gone once we invoke emit notification
+        n.message = BufferUtils::extractBufferCopy(buffer->message());
+    }
+    n.type = buffer->type();
+    n.code = buffer->code();
+    return n;
+}
 bool ResourceAccess::processMessageBuffer()
 {
    static const int headerSize = Commands::headerSize();
    if (d->partialMessageBuffer.size() < headerSize) {
-        Warning() << "command too small";
+        SinkWarning() << "command too small";
        return false;
    }
@@ -526,16 +539,16 @@ bool ResourceAccess::processMessageBuffer()
    const uint size = *(int *)(d->partialMessageBuffer.constData() + sizeof(int) + sizeof(uint));
    if (size > (uint)(d->partialMessageBuffer.size() - headerSize)) {
-        Warning() << "command too small";
+        SinkWarning() << "command too small";
        return false;
    }
    switch (commandId) {
        case Commands::RevisionUpdateCommand: {
            auto buffer = Commands::GetRevisionUpdate(d->partialMessageBuffer.constData() + headerSize);
-            Trace() << QString("Revision updated to: %1").arg(buffer->revision());
+            SinkTrace() << QString("Revision updated to: %1").arg(buffer->revision());
            Notification n;
-            n.type = Sink::Commands::NotificationType::NotificationType_RevisionUpdate;
+            n.type = Sink::Notification::RevisionUpdate;
            emit notification(n);
            emit revisionChanged(buffer->revision());
@@ -543,7 +556,7 @@ bool ResourceAccess::processMessageBuffer()
        }
        case Commands::CommandCompletionCommand: {
            auto buffer = Commands::GetCommandCompletion(d->partialMessageBuffer.constData() + headerSize);
-            Trace() << QString("Command with messageId %1 completed %2").arg(buffer->id()).arg(buffer->success() ? "sucessfully" : "unsuccessfully");
+            SinkTrace() << QString("Command with messageId %1 completed %2").arg(buffer->id()).arg(buffer->success() ? "sucessfully" : "unsuccessfully");
            d->completeCommands.insert(buffer->id(), buffer->success());
            // The callbacks can result in this object getting destroyed directly, so we need to ensure we finish our work first
@@ -553,32 +566,34 @@ bool ResourceAccess::processMessageBuffer()
        case Commands::NotificationCommand: {
            auto buffer = Commands::GetNotification(d->partialMessageBuffer.constData() + headerSize);
            switch (buffer->type()) {
-                case Sink::Commands::NotificationType::NotificationType_Shutdown:
+                case Sink::Notification::Shutdown:
-                    Log() << "Received shutdown notification.";
+                    SinkLog() << "Received shutdown notification.";
                    close();
                    break;
-                case Sink::Commands::NotificationType::NotificationType_Inspection: {
+                case Sink::Notification::Inspection: {
-                    Trace() << "Received inspection notification.";
+                    SinkTrace() << "Received inspection notification.";
-                    Notification n;
+                    auto n = getNotification(buffer);
-                    if (buffer->identifier()) {
-                        // Don't use fromRawData, the buffer is gone once we invoke emit notification
-                        n.id = BufferUtils::extractBufferCopy(buffer->identifier());
-                    }
-                    if (buffer->message()) {
-                        // Don't use fromRawData, the buffer is gone once we invoke emit notification
-                        n.message = BufferUtils::extractBufferCopy(buffer->message());
-                    }
-                    n.type = buffer->type();
-                    n.code = buffer->code();
                    // The callbacks can result in this object getting destroyed directly, so we need to ensure we finish our work first
                    queuedInvoke([=]() { emit notification(n); }, this);
                } break;
-                case Sink::Commands::NotificationType::NotificationType_Status:
+                case Sink::Notification::Status:
-                case Sink::Commands::NotificationType::NotificationType_Warning:
+                    if (mResourceStatus == buffer->code()) {
-                case Sink::Commands::NotificationType::NotificationType_Progress:
+                        SinkTrace() << "Got an unnecessary status notification";
-                case Sink::Commands::NotificationType::NotificationType_RevisionUpdate:
+                        break;
+                    }
+                    mResourceStatus = buffer->code();
+                    SinkTrace() << "Updated status: " << mResourceStatus;
+                    [[clang::fallthrough]];
+                case Sink::Notification::Warning:
+                    [[clang::fallthrough]];
+                case Sink::Notification::Progress: {
+                    auto n = getNotification(buffer);
+                    SinkTrace() << "Received notification: " << n.type;
+                    emit notification(n);
+                } break;
+                case Sink::Notification::RevisionUpdate:
                default:
-                    Warning() << "Received unknown notification: " << buffer->type();
+                    SinkWarning() << "Received unknown notification: " << buffer->type();
                    break;
            }
            break;
@@ -624,6 +639,7 @@ Sink::ResourceAccess::Ptr ResourceAccessFactory::getAccess(const QByteArray &ins
    }
    if (!mTimer.contains(instanceIdentifier)) {
        auto timer = new QTimer;
+        timer->setSingleShot(true);
        // Drop connection after 3 seconds (which is a random value)
        QObject::connect(timer, &QTimer::timeout, timer, [this, instanceIdentifier]() { mCache.remove(instanceIdentifier); });
        timer->setInterval(3000);
diff --git a/common/resourceaccess.h b/common/resourceaccess.h
index 69d52b4..5d66246 100644
--- a/common/resourceaccess.h
+++ b/common/resourceaccess.h
@@ -29,6 +29,7 @@
 #include <flatbuffers/flatbuffers.h>
 #include "notification.h"
+#include "log.h"
 namespace Sink {
@@ -72,19 +73,28 @@ public:
        return KAsync::null<void>();
    };
+    int getResourceStatus() const
+    {
+        return mResourceStatus;
+    }
 signals:
    void ready(bool isReady);
    void revisionChanged(qint64 revision);
-    void notification(Notification revision);
+    void notification(Notification notification);
 public slots:
    virtual void open() = 0;
    virtual void close() = 0;
+protected:
+    int mResourceStatus;
 };
 class SINK_EXPORT ResourceAccess : public ResourceAccessInterface
 {
    Q_OBJECT
+    SINK_DEBUG_AREA("communication")
 public:
    typedef QSharedPointer<ResourceAccess> Ptr;
@@ -130,6 +140,7 @@ private:
    class Private;
    Private *const d;
+    // SINK_DEBUG_COMPONENT(d->resourceInstanceIdentifier)
 };
 /**
@@ -137,8 +148,9 @@ private:
 *
 * This avoids constantly recreating connections, and should allow a single process to have one connection per resource.
 */
-class ResourceAccessFactory
+class SINK_EXPORT ResourceAccessFactory
 {
+    SINK_DEBUG_AREA("ResourceAccessFactory")
 public:
    static ResourceAccessFactory &instance();
    Sink::ResourceAccess::Ptr getAccess(const QByteArray &instanceIdentifier, const QByteArray resourceType);
diff --git a/common/resourceconfig.cpp b/common/resourceconfig.cpp
index a4e5fc5..39f9ddb 100644
--- a/common/resourceconfig.cpp
+++ b/common/resourceconfig.cpp
@@ -20,13 +20,13 @@
 #include <QSettings>
 #include <QSharedPointer>
-#include <QStandardPaths>
 #include <QFile>
 #include <log.h>
+#include <definitions.h>
 static QSharedPointer<QSettings> getConfig(const QByteArray &identifier)
 {
-    return QSharedPointer<QSettings>::create(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/sink/" + identifier + ".ini", QSettings::IniFormat);
+    return QSharedPointer<QSettings>::create(Sink::configLocation() +"/" + identifier + ".ini", QSettings::IniFormat);
 }
 QByteArray ResourceConfig::newIdentifier(const QByteArray &type)
diff --git a/common/resourcecontrol.cpp b/common/resourcecontrol.cpp
index 5c2cd06..7d092a4 100644
--- a/common/resourcecontrol.cpp
+++ b/common/resourcecontrol.cpp
@@ -30,14 +30,13 @@
 #include "log.h"
 #include "notifier.h"
-#undef DEBUG_AREA
+SINK_DEBUG_AREA("resourcecontrol")
-#define DEBUG_AREA "client.resourcecontrol"
 namespace Sink {
 KAsync::Job<void> ResourceControl::shutdown(const QByteArray &identifier)
 {
-    Trace() << "shutdown " << identifier;
+    SinkTrace() << "shutdown " << identifier;
    auto time = QSharedPointer<QTime>::create();
    time->start();
    return ResourceAccess::connectToServer(identifier)
@@ -50,33 +49,33 @@ KAsync::Job<void> ResourceControl::shutdown(const QByteArray &identifier)
                resourceAccess->sendCommand(Sink::Commands::ShutdownCommand)
                    .then<void>([&future, resourceAccess, time]() {
                        resourceAccess->close();
-                        Trace() << "Shutdown complete." << Log::TraceTime(time->elapsed());
+                        SinkTrace() << "Shutdown complete." << Log::TraceTime(time->elapsed());
                        future.setFinished();
                    })
                    .exec();
            },
            [](int, const QString &) {
-                Trace() << "Resource is already closed.";
+                SinkTrace() << "Resource is already closed.";
                // Resource isn't started, nothing to shutdown
            });
 }
 KAsync::Job<void> ResourceControl::start(const QByteArray &identifier)
 {
-    Trace() << "start " << identifier;
+    SinkTrace() << "start " << identifier;
    auto time = QSharedPointer<QTime>::create();
    time->start();
    auto resourceAccess = ResourceAccessFactory::instance().getAccess(identifier, ResourceConfig::getResourceType(identifier));
    resourceAccess->open();
-    return resourceAccess->sendCommand(Sink::Commands::PingCommand).then<void>([resourceAccess, time]() { Trace() << "Start complete." << Log::TraceTime(time->elapsed()); });
+    return resourceAccess->sendCommand(Sink::Commands::PingCommand).then<void>([resourceAccess, time]() { SinkTrace() << "Start complete." << Log::TraceTime(time->elapsed()); });
 }
 KAsync::Job<void> ResourceControl::flushMessageQueue(const QByteArrayList &resourceIdentifier)
 {
-    Trace() << "flushMessageQueue" << resourceIdentifier;
+    SinkTrace() << "flushMessageQueue" << resourceIdentifier;
    return KAsync::iterate(resourceIdentifier)
        .template each<void, QByteArray>([](const QByteArray &resource, KAsync::Future<void> &future) {
-            Trace() << "Flushing message queue " << resource;
+            SinkTrace() << "Flushing message queue " << resource;
            auto resourceAccess = ResourceAccessFactory::instance().getAccess(resource, ResourceConfig::getResourceType(resource));
            resourceAccess->open();
            resourceAccess->synchronizeResource(false, true).then<void>([&future, resourceAccess]() { future.setFinished(); }).exec();
@@ -95,7 +94,7 @@ KAsync::Job<void> ResourceControl::inspect(const Inspection &inspectionCommand)
    auto time = QSharedPointer<QTime>::create();
    time->start();
-    Trace() << "Sending inspection " << resource;
+    SinkTrace() << "Sending inspection " << resource;
    auto resourceAccess = ResourceAccessFactory::instance().getAccess(resource, ResourceConfig::getResourceType(resource));
    resourceAccess->open();
    auto notifier = QSharedPointer<Sink::Notifier>::create(resourceAccess);
@@ -104,7 +103,7 @@ KAsync::Job<void> ResourceControl::inspect(const Inspection &inspectionCommand)
        .template then<void>([resourceAccess, notifier, id, time](KAsync::Future<void> &future) {
            notifier->registerHandler([&future, id, time](const Notification &notification) {
                if (notification.id == id) {
-                    Trace() << "Inspection complete." << Log::TraceTime(time->elapsed());
+                    SinkTrace() << "Inspection complete." << Log::TraceTime(time->elapsed());
                    if (notification.code) {
                        future.setError(-1, "Inspection returned an error: " + notification.message);
                    } else {
diff --git a/common/resourcefacade.cpp b/common/resourcefacade.cpp
index 3901f43..583d6ec 100644
--- a/common/resourcefacade.cpp
+++ b/common/resourcefacade.cpp
@@ -22,23 +22,19 @@
 #include "query.h"
 #include "definitions.h"
 #include "storage.h"
+#include "store.h"
+#include "resourceaccess.h"
 #include <QDir>
-template <typename DomainType>
+using namespace Sink;
-ConfigNotifier LocalStorageFacade<DomainType>::sConfigNotifier;
-template <typename DomainType>
+SINK_DEBUG_AREA("ResourceFacade")
-LocalStorageFacade<DomainType>::LocalStorageFacade(const QByteArray &identifier) : Sink::StoreFacade<DomainType>(), mConfigStore(identifier), mResourceInstanceIdentifier(identifier)
-{
-}
-template <typename DomainType>
+template<typename DomainType>
-LocalStorageFacade<DomainType>::~LocalStorageFacade()
+ConfigNotifier LocalStorageFacade<DomainType>::sConfigNotifier;
-{
-}
 template <typename DomainType>
-typename DomainType::Ptr LocalStorageFacade<DomainType>::readFromConfig(ConfigStore &configStore, const QByteArray &id, const QByteArray &type)
+static typename DomainType::Ptr readFromConfig(ConfigStore &configStore, const QByteArray &id, const QByteArray &type)
 {
    auto object = DomainType::Ptr::create(id);
    object->setProperty("type", type);
@@ -49,10 +45,127 @@ typename DomainType::Ptr LocalStorageFacade<DomainType>::readFromConfig(ConfigSt
    return object;
 }
+static bool matchesFilter(const QHash<QByteArray, Query::Comparator> &filter, const QMap<QByteArray, QVariant> &properties)
+{
+    for (const auto &filterProperty : filter.keys()) {
+        if (filterProperty == "type") {
+            continue;
+        }
+        if (!filter.value(filterProperty).matches(properties.value(filterProperty))) {
+            return false;
+        }
+    }
+    return true;
+}
+template<typename DomainType>
+LocalStorageQueryRunner<DomainType>::LocalStorageQueryRunner(const Query &query, const QByteArray &identifier, ConfigNotifier &configNotifier)
+    : mResultProvider(new ResultProvider<typename DomainType::Ptr>), mConfigStore(identifier), mGuard(new QObject)
+{
+    QObject *guard = new QObject;
+    mResultProvider->setFetcher([this, query, guard, &configNotifier](const QSharedPointer<DomainType> &) {
+        const auto entries = mConfigStore.getEntries();
+        for (const auto &res : entries.keys()) {
+            const auto type = entries.value(res);
+            if (query.propertyFilter.contains("type") && query.propertyFilter.value("type").value.toByteArray() != type) {
+                SinkTrace() << "Skipping due to type.";
+                continue;
+            }
+            if (!query.ids.isEmpty() && !query.ids.contains(res)) {
+                continue;
+            }
+            const auto configurationValues = mConfigStore.get(res);
+            if (!matchesFilter(query.propertyFilter, configurationValues)){
+                SinkTrace() << "Skipping due to filter.";
+                continue;
+            }
+            SinkTrace() << "Found match " << res;
+            auto entity = readFromConfig<DomainType>(mConfigStore, res, type);
+            updateStatus(*entity);
+            mResultProvider->add(entity);
+        }
+        if (query.liveQuery) {
+            {
+                auto ret = QObject::connect(&configNotifier, &ConfigNotifier::added, guard, [this](const ApplicationDomain::ApplicationDomainType::Ptr &entry) {
+                    auto entity = entry.staticCast<DomainType>();
+                    updateStatus(*entity);
+                    mResultProvider->add(entity);
+                });
+                Q_ASSERT(ret);
+            }
+            {
+                auto ret = QObject::connect(&configNotifier, &ConfigNotifier::modified, guard, [this](const ApplicationDomain::ApplicationDomainType::Ptr &entry) {
+                    auto entity = entry.staticCast<DomainType>();
+                    updateStatus(*entity);
+                    mResultProvider->modify(entity);
+                });
+                Q_ASSERT(ret);
+            }
+            {
+                auto ret = QObject::connect(&configNotifier, &ConfigNotifier::removed, guard, [this](const ApplicationDomain::ApplicationDomainType::Ptr &entry) {
+                    mResultProvider->remove(entry.staticCast<DomainType>());
+                });
+                Q_ASSERT(ret);
+            }
+        }
+        // TODO initialResultSetComplete should be implicit
+        mResultProvider->initialResultSetComplete(typename DomainType::Ptr());
+        mResultProvider->complete();
+    });
+    mResultProvider->onDone([=]() { delete guard; delete this; });
+}
+template<typename DomainType>
+QObject *LocalStorageQueryRunner<DomainType>::guard() const
+{
+    return mGuard.get();
+}
+template<typename DomainType>
+void LocalStorageQueryRunner<DomainType>::updateStatus(DomainType &entity)
+{
+    if (mStatusUpdater) {
+        mStatusUpdater(entity);
+    }
+}
+template<typename DomainType>
+void LocalStorageQueryRunner<DomainType>::setStatusUpdater(const std::function<void(DomainType &)> &updater)
+{
+    mStatusUpdater = updater;
+}
+template<typename DomainType>
+void LocalStorageQueryRunner<DomainType>::statusChanged(const QByteArray &identifier)
+{
+    SinkTrace() << "Status changed " << identifier;
+    auto entity = readFromConfig<DomainType>(mConfigStore, identifier, ApplicationDomain::getTypeName<DomainType>());
+    updateStatus(*entity);
+    mResultProvider->modify(entity);
+}
+template<typename DomainType>
+typename Sink::ResultEmitter<typename DomainType::Ptr>::Ptr LocalStorageQueryRunner<DomainType>::emitter()
+{
+    return mResultProvider->emitter();
+}
+template <typename DomainType>
+LocalStorageFacade<DomainType>::LocalStorageFacade(const QByteArray &identifier) : StoreFacade<DomainType>(), mIdentifier(identifier), mConfigStore(identifier)
+{
+}
+template <typename DomainType>
+LocalStorageFacade<DomainType>::~LocalStorageFacade()
+{
+}
 template <typename DomainType>
 typename DomainType::Ptr LocalStorageFacade<DomainType>::readFromConfig(const QByteArray &id, const QByteArray &type)
 {
-    return readFromConfig(mConfigStore, id, type);
+    return ::readFromConfig<DomainType>(mConfigStore, id, type);
 }
 template <typename DomainType>
@@ -84,7 +197,7 @@ KAsync::Job<void> LocalStorageFacade<DomainType>::modify(const DomainType &domai
    return KAsync::start<void>([domainObject, this]() {
        const QByteArray identifier = domainObject.identifier();
        if (identifier.isEmpty()) {
-            Warning() << "We need an \"identifier\" property to identify the entity to configure.";
+            SinkWarning() << "We need an \"identifier\" property to identify the entity to configure.";
            return;
        }
        auto changedProperties = domainObject.changedProperties();
@@ -110,77 +223,22 @@ KAsync::Job<void> LocalStorageFacade<DomainType>::remove(const DomainType &domai
    return KAsync::start<void>([domainObject, this]() {
        const QByteArray identifier = domainObject.identifier();
        if (identifier.isEmpty()) {
-            Warning() << "We need an \"identifier\" property to identify the entity to configure";
+            SinkWarning() << "We need an \"identifier\" property to identify the entity to configure";
            return;
        }
-        Trace() << "Removing: " << identifier;
+        SinkTrace() << "Removing: " << identifier;
        mConfigStore.remove(identifier);
        sConfigNotifier.remove(QSharedPointer<DomainType>::create(domainObject));
    });
 }
-static bool matchesFilter(const QHash<QByteArray, Sink::Query::Comparator> &filter, const QMap<QByteArray, QVariant> &properties)
-{
-    for (const auto &filterProperty : filter.keys()) {
-        if (filterProperty == "type") {
-            continue;
-        }
-        if (!filter.value(filterProperty).matches(properties.value(filterProperty))) {
-            return false;
-        }
-    }
-    return true;
-}
 template <typename DomainType>
-QPair<KAsync::Job<void>, typename Sink::ResultEmitter<typename DomainType::Ptr>::Ptr> LocalStorageFacade<DomainType>::load(const Sink::Query &query)
+QPair<KAsync::Job<void>, typename ResultEmitter<typename DomainType::Ptr>::Ptr> LocalStorageFacade<DomainType>::load(const Query &query)
 {
-    QObject *guard = new QObject;
+    auto runner = new LocalStorageQueryRunner<DomainType>(query, mIdentifier, sConfigNotifier);
-    auto resultProvider = new Sink::ResultProvider<typename DomainType::Ptr>();
+    return qMakePair(KAsync::null<void>(), runner->emitter());
-    auto emitter = resultProvider->emitter();
-    auto identifier = mResourceInstanceIdentifier;
-    resultProvider->setFetcher([identifier, query, guard, resultProvider](const QSharedPointer<DomainType> &) {
-        ConfigStore mConfigStore(identifier);
-        const auto entries = mConfigStore.getEntries();
-        for (const auto &res : entries.keys()) {
-            const auto type = entries.value(res);
-            if (query.propertyFilter.contains("type") && query.propertyFilter.value("type").value.toByteArray() != type) {
-                Trace() << "Skipping due to type.";
-                continue;
-            }
-            if (!query.ids.isEmpty() && !query.ids.contains(res)) {
-                continue;
-            }
-            const auto configurationValues = mConfigStore.get(res);
-            if (!matchesFilter(query.propertyFilter, configurationValues)){
-                Trace() << "Skipping due to filter.";
-                continue;
-            }
-            Trace() << "Found match " << res;
-            resultProvider->add(readFromConfig(mConfigStore, res, type));
-        }
-        if (query.liveQuery) {
-            QObject::connect(&sConfigNotifier, &ConfigNotifier::modified, guard, [resultProvider](const Sink::ApplicationDomain::ApplicationDomainType::Ptr &entry) {
-                resultProvider->modify(entry.staticCast<DomainType>());
-            });
-            QObject::connect(&sConfigNotifier, &ConfigNotifier::added, guard, [resultProvider](const Sink::ApplicationDomain::ApplicationDomainType::Ptr &entry) {
-                resultProvider->add(entry.staticCast<DomainType>());
-            });
-            QObject::connect(&sConfigNotifier, &ConfigNotifier::removed, guard,[resultProvider](const Sink::ApplicationDomain::ApplicationDomainType::Ptr &entry) {
-                resultProvider->remove(entry.staticCast<DomainType>());
-            });
-        }
-        // TODO initialResultSetComplete should be implicit
-        resultProvider->initialResultSetComplete(typename DomainType::Ptr());
-        resultProvider->complete();
-    });
-    resultProvider->onDone([=]() { delete resultProvider; delete guard; });
-    return qMakePair(KAsync::null<void>(), emitter);
 }
 ResourceFacade::ResourceFacade() : LocalStorageFacade<Sink::ApplicationDomain::SinkResource>("resources")
 {
 }
@@ -192,13 +250,28 @@ ResourceFacade::~ResourceFacade()
 KAsync::Job<void> ResourceFacade::remove(const Sink::ApplicationDomain::SinkResource &resource)
 {
    const auto identifier = resource.identifier();
-    return LocalStorageFacade<Sink::ApplicationDomain::SinkResource>::remove(resource).then<void>([identifier]() {
+    return Sink::Store::removeDataFromDisk(identifier).then(LocalStorageFacade<Sink::ApplicationDomain::SinkResource>::remove(resource));
-        // TODO shutdown resource, or use the resource process with a --remove option to cleanup (so we can take advantage of the file locking)
+}
-        QDir dir(Sink::storageLocation());
-        for (const auto &folder : dir.entryList(QStringList() << identifier + "*")) {
+QPair<KAsync::Job<void>, typename Sink::ResultEmitter<typename ApplicationDomain::SinkResource::Ptr>::Ptr> ResourceFacade::load(const Sink::Query &query)
-            Sink::Storage(Sink::storageLocation(), folder, Sink::Storage::ReadWrite).removeFromDisk();
+{
+    auto runner = new LocalStorageQueryRunner<ApplicationDomain::SinkResource>(query, mIdentifier, sConfigNotifier);
+    auto monitoredResources = QSharedPointer<QSet<QByteArray>>::create();
+    runner->setStatusUpdater([runner, monitoredResources](ApplicationDomain::SinkResource &resource) {
+        auto resourceAccess = ResourceAccessFactory::instance().getAccess(resource.identifier(), ResourceConfig::getResourceType(resource.identifier()));
+        if (!monitoredResources->contains(resource.identifier())) {
+            auto ret = QObject::connect(resourceAccess.data(), &ResourceAccess::notification, runner->guard(), [resource, runner, resourceAccess](const Notification &notification) {
+                SinkTrace() << "Received notification in facade: " << notification.type;
+                if (notification.type == Notification::Status) {
+                    runner->statusChanged(resource.identifier());
+                }
+            });
+            Q_ASSERT(ret);
+            monitoredResources->insert(resource.identifier());
        }
+        resource.setStatusStatus(resourceAccess->getResourceStatus());
    });
+    return qMakePair(KAsync::null<void>(), runner->emitter());
 }
@@ -210,6 +283,55 @@ AccountFacade::~AccountFacade()
 {
 }
+QPair<KAsync::Job<void>, typename Sink::ResultEmitter<typename ApplicationDomain::SinkAccount::Ptr>::Ptr> AccountFacade::load(const Sink::Query &query)
+{
+    auto runner = new LocalStorageQueryRunner<ApplicationDomain::SinkAccount>(query, mIdentifier, sConfigNotifier);
+    auto monitoredResources = QSharedPointer<QSet<QByteArray>>::create();
+    runner->setStatusUpdater([runner, monitoredResources](ApplicationDomain::SinkAccount &account) {
+        Query query;
+        query.filter<ApplicationDomain::SinkResource::Account>(account.identifier());
+        const auto resources = Store::read<ApplicationDomain::SinkResource>(query);
+        SinkTrace() << "Found resource belonging to the account " << account.identifier() << " : " << resources;
+        auto accountIdentifier = account.identifier();
+        ApplicationDomain::Status status = ApplicationDomain::ConnectedStatus;
+        for (const auto &resource : resources) {
+            auto resourceAccess = ResourceAccessFactory::instance().getAccess(resource.identifier(), ResourceConfig::getResourceType(resource.identifier()));
+            if (!monitoredResources->contains(resource.identifier())) {
+                auto ret = QObject::connect(resourceAccess.data(), &ResourceAccess::notification, runner->guard(), [resource, runner, resourceAccess, accountIdentifier](const Notification &notification) {
+                    SinkTrace() << "Received notification in facade: " << notification.type;
+                    if (notification.type == Notification::Status) {
+                        runner->statusChanged(accountIdentifier);
+                    }
+                });
+                Q_ASSERT(ret);
+                monitoredResources->insert(resource.identifier());
+            }
+            //Figure out overall status
+            auto s = resourceAccess->getResourceStatus();
+            switch (s) {
+                case ApplicationDomain::ErrorStatus:
+                    status = ApplicationDomain::ErrorStatus;
+                    break;
+                case ApplicationDomain::OfflineStatus:
+                    if (status == ApplicationDomain::ConnectedStatus) {
+                        status = ApplicationDomain::OfflineStatus;
+                    }
+                    break;
+                case ApplicationDomain::ConnectedStatus:
+                    break;
+                case ApplicationDomain::BusyStatus:
+                    if (status != ApplicationDomain::ErrorStatus) {
+                        status = ApplicationDomain::BusyStatus;
+                    }
+                    break;
+            }
+        }
+        account.setStatusStatus(status);
+    });
+    return qMakePair(KAsync::null<void>(), runner->emitter());
+}
 IdentityFacade::IdentityFacade() : LocalStorageFacade<Sink::ApplicationDomain::Identity>("identities")
 {
 }
diff --git a/common/resourcefacade.h b/common/resourcefacade.h
index 989375d..23c453a 100644
--- a/common/resourcefacade.h
+++ b/common/resourcefacade.h
@@ -56,6 +56,24 @@ signals:
 };
 template <typename DomainType>
+class LocalStorageQueryRunner
+{
+public:
+    LocalStorageQueryRunner(const Sink::Query &query, const QByteArray &identifier, ConfigNotifier &configNotifier);
+    typename Sink::ResultEmitter<typename DomainType::Ptr>::Ptr emitter();
+    void setStatusUpdater(const std::function<void(DomainType &)> &);
+    void statusChanged(const QByteArray &identifier);
+    QObject *guard() const;
+private:
+    void updateStatus(DomainType &entity);
+    std::function<void(DomainType &)> mStatusUpdater;
+    QSharedPointer<Sink::ResultProvider<typename DomainType::Ptr>> mResultProvider;
+    ConfigStore mConfigStore;
+    std::unique_ptr<QObject> mGuard;
+};
+template <typename DomainType>
 class LocalStorageFacade : public Sink::StoreFacade<DomainType>
 {
 public:
@@ -65,13 +83,14 @@ public:
    virtual KAsync::Job<void> modify(const DomainType &resource) Q_DECL_OVERRIDE;
    virtual KAsync::Job<void> remove(const DomainType &resource) Q_DECL_OVERRIDE;
    virtual QPair<KAsync::Job<void>, typename Sink::ResultEmitter<typename DomainType::Ptr>::Ptr> load(const Sink::Query &query) Q_DECL_OVERRIDE;
+protected:
+    QByteArray mIdentifier;
+    static ConfigNotifier sConfigNotifier;
 private:
    typename DomainType::Ptr readFromConfig(const QByteArray &id, const QByteArray &type);
-    static typename DomainType::Ptr readFromConfig(ConfigStore &store, const QByteArray &id, const QByteArray &type);
    ConfigStore mConfigStore;
-    static ConfigNotifier sConfigNotifier;
-    QByteArray mResourceInstanceIdentifier;
 };
 class ResourceFacade : public LocalStorageFacade<Sink::ApplicationDomain::SinkResource>
@@ -80,6 +99,7 @@ public:
    ResourceFacade();
    virtual ~ResourceFacade();
    virtual KAsync::Job<void> remove(const Sink::ApplicationDomain::SinkResource &resource) Q_DECL_OVERRIDE;
+    virtual QPair<KAsync::Job<void>, typename Sink::ResultEmitter<typename Sink::ApplicationDomain::SinkResource::Ptr>::Ptr> load(const Sink::Query &query) Q_DECL_OVERRIDE;
 };
 class AccountFacade : public LocalStorageFacade<Sink::ApplicationDomain::SinkAccount>
@@ -87,6 +107,7 @@ class AccountFacade : public LocalStorageFacade<Sink::ApplicationDomain::SinkAcc
 public:
    AccountFacade();
    virtual ~AccountFacade();
+    virtual QPair<KAsync::Job<void>, typename Sink::ResultEmitter<typename Sink::ApplicationDomain::SinkAccount::Ptr>::Ptr> load(const Sink::Query &query) Q_DECL_OVERRIDE;
 };
 class IdentityFacade : public LocalStorageFacade<Sink::ApplicationDomain::Identity>
diff --git a/common/sourcewriteback.cpp b/common/sourcewriteback.cpp
index a277606..7d21ea6 100644
--- a/common/sourcewriteback.cpp
+++ b/common/sourcewriteback.cpp
@@ -26,6 +26,8 @@
 #define ENTITY_TYPE_MAIL "mail"
 #define ENTITY_TYPE_FOLDER "folder"
+SINK_DEBUG_AREA("sourcewriteback")
 using namespace Sink;
 SourceWriteBack::SourceWriteBack(const QByteArray &resourceType, const QByteArray &resourceInstanceIdentifier)
@@ -55,14 +57,14 @@ RemoteIdMap &SourceWriteBack::syncStore()
 KAsync::Job<void> SourceWriteBack::replay(const QByteArray &type, const QByteArray &key, const QByteArray &value)
 {
-    Trace() << "Replaying" << type << key;
+    SinkTrace() << "Replaying" << type << key;
    Sink::EntityBuffer buffer(value);
    const Sink::Entity &entity = buffer.entity();
    const auto metadataBuffer = Sink::EntityBuffer::readBuffer<Sink::Metadata>(entity.metadata());
    Q_ASSERT(metadataBuffer);
    if (!metadataBuffer->replayToSource()) {
-        Trace() << "Change is coming from the source";
+        SinkTrace() << "Change is coming from the source";
        return KAsync::null<void>();
    }
    Q_ASSERT(!mSyncStore);
@@ -81,11 +83,11 @@ KAsync::Job<void> SourceWriteBack::replay(const QByteArray &type, const QByteArr
    if (operation != Sink::Operation_Creation) {
        oldRemoteId = syncStore().resolveLocalId(type, uid);
        if (oldRemoteId.isEmpty()) {
-            Warning() << "Couldn't find the remote id for: " << type << uid;
+            SinkWarning() << "Couldn't find the remote id for: " << type << uid;
            return KAsync::error<void>(1, "Couldn't find the remote id.");
        }
    }
-    Trace() << "Replaying " << key << type << uid << oldRemoteId;
+    SinkTrace() << "Replaying " << key << type << uid << oldRemoteId;
    KAsync::Job<QByteArray> job = KAsync::null<QByteArray>();
    if (type == ENTITY_TYPE_FOLDER) {
@@ -98,24 +100,24 @@ KAsync::Job<void> SourceWriteBack::replay(const QByteArray &type, const QByteArr
    return job.then<void, QByteArray>([this, operation, type, uid, oldRemoteId](const QByteArray &remoteId) {
        if (operation == Sink::Operation_Creation) {
-            Trace() << "Replayed creation with remote id: " << remoteId;
+            SinkTrace() << "Replayed creation with remote id: " << remoteId;
            if (remoteId.isEmpty()) {
-                Warning() << "Returned an empty remoteId from the creation";
+                SinkWarning() << "Returned an empty remoteId from the creation";
            } else {
                syncStore().recordRemoteId(type, uid, remoteId);
            }
        } else if (operation == Sink::Operation_Modification) {
-            Trace() << "Replayed modification with remote id: " << remoteId;
+            SinkTrace() << "Replayed modification with remote id: " << remoteId;
            if (remoteId.isEmpty()) {
-                Warning() << "Returned an empty remoteId from the creation";
+                SinkWarning() << "Returned an empty remoteId from the creation";
            } else {
               syncStore().updateRemoteId(type, uid, remoteId);
            }
        } else if (operation == Sink::Operation_Removal) {
-            Trace() << "Replayed removal with remote id: " << oldRemoteId;
+            SinkTrace() << "Replayed removal with remote id: " << oldRemoteId;
            syncStore().removeRemoteId(type, uid, oldRemoteId);
        } else {
-            ErrorMsg() << "Unkown operation" << operation;
+            SinkError() << "Unkown operation" << operation;
        }
        mSyncStore.clear();
@@ -123,7 +125,7 @@ KAsync::Job<void> SourceWriteBack::replay(const QByteArray &type, const QByteArr
        mTransaction.abort();
        mSyncTransaction.commit();
    }, [this](int errorCode, const QString &errorMessage) {
-        Warning() << "Failed to replay change: " << errorMessage;
+        SinkWarning() << "Failed to replay change: " << errorMessage;
        mSyncStore.clear();
        mEntityStore.clear();
        mTransaction.abort();
diff --git a/common/specialpurposepreprocessor.cpp b/common/specialpurposepreprocessor.cpp
index 2892105..0985880 100644
--- a/common/specialpurposepreprocessor.cpp
+++ b/common/specialpurposepreprocessor.cpp
@@ -5,6 +5,8 @@
 using namespace Sink;
+SINK_DEBUG_AREA("SpecialPurposeProcessor")
 static QHash<QByteArray, QString> specialPurposeFolders()
 {
    QHash<QByteArray, QString> hash;
@@ -53,7 +55,7 @@ QByteArray SpecialPurposeProcessor::ensureFolder(Sink::Storage::Transaction &tra
                return false;
            });
        if (!mSpecialPurposeFolders.contains(specialPurpose)) {
-            Trace() << "Failed to find a drafts folder, creating a new one";
+            SinkTrace() << "Failed to find a drafts folder, creating a new one";
            auto folder = ApplicationDomain::Folder::create(mResourceInstanceIdentifier);
            folder.setSpecialPurpose(QByteArrayList() << specialPurpose);
            folder.setName(sSpecialPurposeFolders.value(specialPurpose));
diff --git a/common/storage.h b/common/storage.h
index e7b4a3e..4ef20d5 100644
--- a/common/storage.h
+++ b/common/storage.h
@@ -103,18 +103,8 @@ public:
         */
        bool contains(const QByteArray &uid);
-        NamedDatabase(NamedDatabase &&other) : d(other.d)
+        NamedDatabase(NamedDatabase &&other);
-        {
+        NamedDatabase &operator=(NamedDatabase &&other);
-            d = other.d;
-            other.d = nullptr;
-        }
-        NamedDatabase &operator=(NamedDatabase &&other)
-        {
-            d = other.d;
-            other.d = nullptr;
-            return *this;
-        }
        operator bool() const
        {
@@ -146,17 +136,8 @@ public:
        NamedDatabase openDatabase(const QByteArray &name = QByteArray("default"),
            const std::function<void(const Storage::Error &error)> &errorHandler = std::function<void(const Storage::Error &error)>(), bool allowDuplicates = false) const;
-        Transaction(Transaction &&other) : d(other.d)
+        Transaction(Transaction &&other);
-        {
+        Transaction &operator=(Transaction &&other);
-            d = other.d;
-            other.d = nullptr;
-        }
-        Transaction &operator=(Transaction &&other)
-        {
-            d = other.d;
-            other.d = nullptr;
-            return *this;
-        }
        operator bool() const;
diff --git a/common/storage_common.cpp b/common/storage_common.cpp
index 6982a4c..1f2594e 100644
--- a/common/storage_common.cpp
+++ b/common/storage_common.cpp
@@ -24,6 +24,8 @@
 #include "log.h"
 #include <QUuid>
+SINK_DEBUG_AREA("storage")
 namespace Sink {
 static const char *s_internalPrefix = "__internal";
@@ -31,7 +33,7 @@ static const int s_internalPrefixSize = strlen(s_internalPrefix);
 void errorHandler(const Storage::Error &error)
 {
-    Warning() << "Database error in " << error.store << ", code " << error.code << ", message: " << error.message;
+    SinkWarning() << "Database error in " << error.store << ", code " << error.code << ", message: " << error.message;
 }
 std::function<void(const Storage::Error &error)> Storage::basicErrorHandler()
@@ -67,7 +69,7 @@ qint64 Storage::maxRevision(const Sink::Storage::Transaction &transaction)
        },
        [](const Error &error) {
            if (error.code != Sink::Storage::NotFound) {
-                Warning() << "Coultn'd find the maximum revision.";
+                SinkWarning() << "Coultn'd find the maximum revision.";
            }
        });
    return r;
@@ -88,7 +90,7 @@ qint64 Storage::cleanedUpRevision(const Sink::Storage::Transaction &transaction)
        },
        [](const Error &error) {
            if (error.code != Sink::Storage::NotFound) {
-                Warning() << "Coultn'd find the maximum revision.";
+                SinkWarning() << "Coultn'd find the maximum revision.";
            }
        });
    return r;
@@ -103,7 +105,7 @@ QByteArray Storage::getUidFromRevision(const Sink::Storage::Transaction &transac
                uid = value;
                return false;
            },
-            [revision](const Error &error) { Warning() << "Coultn'd find uid for revision: " << revision << error.message; });
+            [revision](const Error &error) { SinkWarning() << "Coultn'd find uid for revision: " << revision << error.message; });
    return uid;
 }
@@ -116,7 +118,7 @@ QByteArray Storage::getTypeFromRevision(const Sink::Storage::Transaction &transa
                type = value;
                return false;
            },
-            [revision](const Error &error) { Warning() << "Coultn'd find type for revision " << revision; });
+            [revision](const Error &error) { SinkWarning() << "Coultn'd find type for revision " << revision; });
    return type;
 }
diff --git a/common/storage_lmdb.cpp b/common/storage_lmdb.cpp
index 3687594..79f4465 100644
--- a/common/storage_lmdb.cpp
+++ b/common/storage_lmdb.cpp
@@ -34,10 +34,8 @@
 #include <lmdb.h>
 #include "log.h"
-#undef Trace
+SINK_DEBUG_AREA("storage")
-#define Trace() Trace_area("storage." + d->storageRoot.toLatin1() + '/' + d->name.toLatin1())
+// SINK_DEBUG_COMPONENT(d->storageRoot.toLatin1() + '/' + d->name.toLatin1())
-#undef Warning
-#define Warning() Warning_area("storage")
 namespace Sink {
@@ -103,6 +101,21 @@ Storage::NamedDatabase::NamedDatabase(NamedDatabase::Private *prv) : d(prv)
 {
 }
+Storage::NamedDatabase::NamedDatabase(NamedDatabase &&other) : d(nullptr)
+{
+    *this = std::move(other);
+}
+Storage::NamedDatabase &Storage::NamedDatabase::operator=(Storage::NamedDatabase &&other)
+{
+    if (&other != this) {
+        delete d;
+        d = other.d;
+        other.d = nullptr;
+    }
+    return *this;
+}
 Storage::NamedDatabase::~NamedDatabase()
 {
    delete d;
@@ -339,7 +352,7 @@ qint64 Storage::NamedDatabase::getSize()
    MDB_stat stat;
    rc = mdb_stat(d->transaction, d->dbi, &stat);
    if (rc) {
-        Warning() << "Something went wrong " << QByteArray(mdb_strerror(rc));
+        SinkWarning() << "Something went wrong " << QByteArray(mdb_strerror(rc));
    }
    // std::cout << "overflow_pages: " << stat.ms_overflow_pages << std::endl;
    // std::cout << "page size: " << stat.ms_psize << std::endl;
@@ -398,6 +411,21 @@ Storage::Transaction::Transaction(Transaction::Private *prv) : d(prv)
    d->startTransaction();
 }
+Storage::Transaction::Transaction(Transaction &&other) : d(nullptr)
+{
+    *this = std::move(other);
+}
+Storage::Transaction &Storage::Transaction::operator=(Storage::Transaction &&other)
+{
+    if (&other != this) {
+        delete d;
+        d = other.d;
+        other.d = nullptr;
+    }
+    return *this;
+}
 Storage::Transaction::~Transaction()
 {
    if (d && d->transaction) {
@@ -452,7 +480,7 @@ static bool ensureCorrectDb(Storage::NamedDatabase &database, const QByteArray &
    bool openedTheWrongDatabase = false;
    auto count = database.scan("__internal_dbname", [db, &openedTheWrongDatabase](const QByteArray &key, const QByteArray &value) ->bool {
        if (value != db) {
-            Warning() << "Opened the wrong database, got " << value << " instead of " << db;
+            SinkWarning() << "Opened the wrong database, got " << value << " instead of " << db;
            openedTheWrongDatabase = true;
        }
        return false;
@@ -475,7 +503,7 @@ bool Storage::Transaction::validateNamedDatabases()
    for (const auto &dbName : databases) {
        auto db = openDatabase(dbName);
        if (!db) {
-            Warning() << "Failed to open the database: " << dbName;
+            SinkWarning() << "Failed to open the database: " << dbName;
            return false;
        }
    }
@@ -497,7 +525,7 @@ Storage::NamedDatabase Storage::Transaction::openDatabase(const QByteArray &db,
    }
    auto database = Storage::NamedDatabase(p);
    if (!ensureCorrectDb(database, db, d->requestedRead)) {
-        Warning() << "Failed to open the database" << db;
+        SinkWarning() << "Failed to open the database" << db;
        return Storage::NamedDatabase();
    }
    return database;
@@ -506,7 +534,7 @@ Storage::NamedDatabase Storage::Transaction::openDatabase(const QByteArray &db,
 QList<QByteArray> Storage::Transaction::getDatabaseNames() const
 {
    if (!d) {
-        Warning() << "Invalid transaction";
+        SinkWarning() << "Invalid transaction";
        return QList<QByteArray>();
    }
@@ -529,11 +557,12 @@ QList<QByteArray> Storage::Transaction::getDatabaseNames() const
                rc = 0;
            }
            if (rc) {
-                Warning() << "Failed to get a value" << rc;
+                SinkWarning() << "Failed to get a value" << rc;
            }
        }
+        mdb_cursor_close(cursor);
    } else {
-        Warning() << "Failed to open db" << rc << QByteArray(mdb_strerror(rc));
+        SinkWarning() << "Failed to open db" << rc << QByteArray(mdb_strerror(rc));
    }
    return list;
 }
@@ -580,7 +609,7 @@ Storage::Private::Private(const QString &s, const QString &n, AccessMode m) : st
            int rc = 0;
            if ((rc = mdb_env_create(&env))) {
                // TODO: handle error
-                Warning() << "mdb_env_create: " << rc << " " << mdb_strerror(rc);
+                SinkWarning() << "mdb_env_create: " << rc << " " << mdb_strerror(rc);
            } else {
                mdb_env_set_maxdbs(env, 50);
                unsigned int flags = MDB_NOTLS;
@@ -588,11 +617,13 @@ Storage::Private::Private(const QString &s, const QString &n, AccessMode m) : st
                    flags |= MDB_RDONLY;
                }
                if ((rc = mdb_env_open(env, fullPath.toStdString().data(), flags, 0664))) {
-                    Warning() << "mdb_env_open: " << rc << " " << mdb_strerror(rc);
+                    SinkWarning() << "mdb_env_open: " << rc << " " << mdb_strerror(rc);
                    mdb_env_close(env);
                    env = 0;
                } else {
                    // FIXME: dynamic resize
+                    // In order to run valgrind this size must be smaller than half your available RAM
+                    // https://github.com/BVLC/caffe/issues/2404
                    const size_t dbSize = (size_t)10485760 * (size_t)8000; // 1MB * 8000
                    mdb_env_set_mapsize(env, dbSize);
                    sEnvironments.insert(fullPath, env);
@@ -648,7 +679,7 @@ qint64 Storage::diskUsage() const
 {
    QFileInfo info(d->storageRoot + '/' + d->name + "/data.mdb");
    if (!info.exists()) {
-        Warning() << "Tried to get filesize for non-existant file: " << info.path();
+        SinkWarning() << "Tried to get filesize for non-existant file: " << info.path();
    }
    return info.size();
 }
@@ -658,7 +689,7 @@ void Storage::removeFromDisk() const
    const QString fullPath(d->storageRoot + '/' + d->name);
    QMutexLocker locker(&d->sMutex);
    QDir dir(fullPath);
-    Trace() << "Removing database from disk: " << fullPath;
+    SinkTrace() << "Removing database from disk: " << fullPath;
    if (!dir.removeRecursively()) {
        Error error(d->name.toLatin1(), ErrorCodes::GenericError, QString("Failed to remove directory %1 %2").arg(d->storageRoot).arg(d->name).toLatin1());
        defaultErrorHandler()(error);
diff --git a/common/store.cpp b/common/store.cpp
index 1162a18..a58287b 100644
--- a/common/store.cpp
+++ b/common/store.cpp
@@ -36,8 +36,7 @@
 #include "storage.h"
 #include "log.h"
-#undef DEBUG_AREA
+SINK_DEBUG_AREA("store")
-#define DEBUG_AREA "client.store"
 namespace Sink {
@@ -88,24 +87,24 @@ static QMap<QByteArray, QByteArray> getResources(const QList<QByteArray> &resour
                }
                resources.insert(res, configuredResources.value(res));
            } else {
-                Warning() << "Resource is not existing: " << res;
+                SinkWarning() << "Resource is not existing: " << res;
            }
        }
    }
-    Trace() << "Found resources: " << resources;
+    SinkTrace() << "Found resources: " << resources;
    return resources;
 }
 template <class DomainType>
 QSharedPointer<QAbstractItemModel> Store::loadModel(Query query)
 {
-    Trace() << "Query: " << ApplicationDomain::getTypeName<DomainType>();
+    SinkTrace() << "Query: " << ApplicationDomain::getTypeName<DomainType>();
-    Trace() << "  Requested: " << query.requestedProperties;
+    SinkTrace() << "  Requested: " << query.requestedProperties;
-    Trace() << "  Filter: " << query.propertyFilter;
+    SinkTrace() << "  Filter: " << query.propertyFilter;
-    Trace() << "  Parent: " << query.parentProperty;
+    SinkTrace() << "  Parent: " << query.parentProperty;
-    Trace() << "  Ids: " << query.ids;
+    SinkTrace() << "  Ids: " << query.ids;
-    Trace() << "  IsLive: " << query.liveQuery;
+    SinkTrace() << "  IsLive: " << query.liveQuery;
-    Trace() << "  Sorting: " << query.sortProperty;
+    SinkTrace() << "  Sorting: " << query.sortProperty;
    auto model = QSharedPointer<ModelResult<DomainType, typename DomainType::Ptr>>::create(query, query.requestedProperties);
    //* Client defines lifetime of model
@@ -123,16 +122,16 @@ QSharedPointer<QAbstractItemModel> Store::loadModel(Query query)
            const auto resourceType = resources.value(resourceInstanceIdentifier);
            auto facade = FacadeFactory::instance().getFacade<DomainType>(resourceType, resourceInstanceIdentifier);
            if (facade) {
-                Trace() << "Trying to fetch from resource " << resourceInstanceIdentifier;
+                SinkTrace() << "Trying to fetch from resource " << resourceInstanceIdentifier;
                auto result = facade->load(query);
                if (result.second) {
                    aggregatingEmitter->addEmitter(result.second);
                } else {
-                    Warning() << "Null emitter for resource " << resourceInstanceIdentifier;
+                    SinkWarning() << "Null emitter for resource " << resourceInstanceIdentifier;
                }
                result.first.template then<void>([&future]() { future.setFinished(); }).exec();
            } else {
-                Trace() << "Couldn' find a facade for " << resourceInstanceIdentifier;
+                SinkTrace() << "Couldn' find a facade for " << resourceInstanceIdentifier;
                // Ignore the error and carry on
                future.setFinished();
            }
@@ -164,7 +163,7 @@ KAsync::Job<void> Store::create(const DomainType &domainObject)
 {
    // Potentially move to separate thread as well
    auto facade = getFacade<DomainType>(domainObject.resourceInstanceIdentifier());
-    return facade->create(domainObject).template then<void>([facade]() {}, [](int errorCode, const QString &error) { Warning() << "Failed to create"; });
+    return facade->create(domainObject).template then<void>([facade]() {}, [](int errorCode, const QString &error) { SinkWarning() << "Failed to create"; });
 }
 template <class DomainType>
@@ -172,7 +171,7 @@ KAsync::Job<void> Store::modify(const DomainType &domainObject)
 {
    // Potentially move to separate thread as well
    auto facade = getFacade<DomainType>(domainObject.resourceInstanceIdentifier());
-    return facade->modify(domainObject).template then<void>([facade]() {}, [](int errorCode, const QString &error) { Warning() << "Failed to modify"; });
+    return facade->modify(domainObject).template then<void>([facade]() {}, [](int errorCode, const QString &error) { SinkWarning() << "Failed to modify"; });
 }
 template <class DomainType>
@@ -180,7 +179,7 @@ KAsync::Job<void> Store::remove(const DomainType &domainObject)
 {
    // Potentially move to separate thread as well
    auto facade = getFacade<DomainType>(domainObject.resourceInstanceIdentifier());
-    return facade->remove(domainObject).template then<void>([facade]() {}, [](int errorCode, const QString &error) { Warning() << "Failed to remove"; });
+    return facade->remove(domainObject).template then<void>([facade]() {}, [](int errorCode, const QString &error) { SinkWarning() << "Failed to remove"; });
 }
 KAsync::Job<void> Store::removeDataFromDisk(const QByteArray &identifier)
@@ -188,28 +187,28 @@ KAsync::Job<void> Store::removeDataFromDisk(const QByteArray &identifier)
    // All databases are going to become invalid, nuke the environments
    // TODO: all clients should react to a notification the resource
    Sink::Storage::clearEnv();
-    Trace() << "Remove data from disk " << identifier;
+    SinkTrace() << "Remove data from disk " << identifier;
    auto time = QSharedPointer<QTime>::create();
    time->start();
    auto resourceAccess = ResourceAccessFactory::instance().getAccess(identifier, ResourceConfig::getResourceType(identifier));
    resourceAccess->open();
    return resourceAccess->sendCommand(Sink::Commands::RemoveFromDiskCommand)
-        .then<void>([resourceAccess, time]() { Trace() << "Remove from disk complete." << Log::TraceTime(time->elapsed()); });
+        .then<void>([resourceAccess, time]() { SinkTrace() << "Remove from disk complete." << Log::TraceTime(time->elapsed()); });
 }
 KAsync::Job<void> Store::synchronize(const Sink::Query &query)
 {
-    Trace() << "synchronize" << query.resources;
+    SinkTrace() << "synchronize" << query.resources;
    auto resources = getResources(query.resources, query.accounts).keys();
    //FIXME only necessary because each doesn't propagate errors
    auto error = new bool;
    return KAsync::iterate(resources)
        .template each<void, QByteArray>([query, error](const QByteArray &resource, KAsync::Future<void> &future) {
-            Trace() << "Synchronizing " << resource;
+            SinkTrace() << "Synchronizing " << resource;
            auto resourceAccess = ResourceAccessFactory::instance().getAccess(resource, ResourceConfig::getResourceType(resource));
            resourceAccess->open();
-            resourceAccess->synchronizeResource(true, false).then<void>([resourceAccess, &future]() {Trace() << "synced."; future.setFinished(); },
+            resourceAccess->synchronizeResource(true, false).then<void>([resourceAccess, &future]() {SinkTrace() << "synced."; future.setFinished(); },
-                    [&future, error](int errorCode, QString msg) { *error = true; Warning() << "Error during sync."; future.setError(errorCode, msg); }).exec();
+                    [&future, error](int errorCode, QString msg) { *error = true; SinkWarning() << "Error during sync."; future.setError(errorCode, msg); }).exec();
        }).then<void>([error](KAsync::Future<void> &future) {
            if (*error) {
                future.setError(1, "Error during sync.");
@@ -306,25 +305,25 @@ QList<DomainType> Store::read(const Sink::Query &q)
    auto resources = getResources(query.resources, query.accounts, ApplicationDomain::getTypeName<DomainType>());
    auto aggregatingEmitter = AggregatingResultEmitter<typename DomainType::Ptr>::Ptr::create();
    aggregatingEmitter->onAdded([&list](const typename DomainType::Ptr &value){
-        Trace() << "Found value: " << value->identifier();
+        SinkTrace() << "Found value: " << value->identifier();
        list << *value;
    });
    for (const auto resourceInstanceIdentifier : resources.keys()) {
        const auto resourceType = resources.value(resourceInstanceIdentifier);
-        Trace() << "Looking for " << resourceType << resourceInstanceIdentifier;
+        SinkTrace() << "Looking for " << resourceType << resourceInstanceIdentifier;
        auto facade = FacadeFactory::instance().getFacade<DomainType>(resourceType, resourceInstanceIdentifier);
        if (facade) {
-            Trace() << "Trying to fetch from resource " << resourceInstanceIdentifier;
+            SinkTrace() << "Trying to fetch from resource " << resourceInstanceIdentifier;
            auto result = facade->load(query);
            if (result.second) {
                aggregatingEmitter->addEmitter(result.second);
            } else {
-                Warning() << "Null emitter for resource " << resourceInstanceIdentifier;
+                SinkWarning() << "Null emitter for resource " << resourceInstanceIdentifier;
            }
            result.first.exec();
            aggregatingEmitter->fetch(typename DomainType::Ptr());
        } else {
-            Trace() << "Couldn't find a facade for " << resourceInstanceIdentifier;
+            SinkTrace() << "Couldn't find a facade for " << resourceInstanceIdentifier;
            // Ignore the error and carry on
        }
    }
diff --git a/common/synchronizer.cpp b/common/synchronizer.cpp
index 1374d00..2d4fb8d 100644
--- a/common/synchronizer.cpp
+++ b/common/synchronizer.cpp
@@ -29,6 +29,8 @@
 #include "modifyentity_generated.h"
 #include "deleteentity_generated.h"
+SINK_DEBUG_AREA("synchronizer")
 using namespace Sink;
 Synchronizer::Synchronizer(const QByteArray &resourceType, const QByteArray &resourceInstanceIdentifier)
@@ -37,7 +39,7 @@ Synchronizer::Synchronizer(const QByteArray &resourceType, const QByteArray &res
    mResourceType(resourceType),
    mResourceInstanceIdentifier(resourceInstanceIdentifier)
 {
-    Trace() << "Starting synchronizer: " << resourceType << resourceInstanceIdentifier;
+    SinkTrace() << "Starting synchronizer: " << resourceType << resourceInstanceIdentifier;
 }
 Synchronizer::~Synchronizer()
@@ -129,11 +131,11 @@ void Synchronizer::scanForRemovals(const QByteArray &bufferType, const std::func
    entryGenerator([this, bufferType, &exists](const QByteArray &key) {
        auto sinkId = Sink::Storage::uidFromKey(key);
        const auto remoteId = syncStore().resolveLocalId(bufferType, sinkId);
-        Trace() << "Checking for removal " << key << remoteId;
+        SinkTrace() << "Checking for removal " << key << remoteId;
        // If we have no remoteId, the entity hasn't been replayed to the source yet
        if (!remoteId.isEmpty()) {
            if (!exists(remoteId)) {
-                Trace() << "Found a removed entity: " << sinkId;
+                SinkTrace() << "Found a removed entity: " << sinkId;
                deleteEntity(sinkId, Sink::Storage::maxRevision(transaction()), bufferType,
                    [this](const QByteArray &buffer) { enqueueCommand(Sink::Commands::DeleteEntityCommand, buffer); });
            }
@@ -143,14 +145,14 @@ void Synchronizer::scanForRemovals(const QByteArray &bufferType, const std::func
 void Synchronizer::createOrModify(const QByteArray &bufferType, const QByteArray &remoteId, const Sink::ApplicationDomain::ApplicationDomainType &entity)
 {
-    Trace() << "Create or modify" << bufferType << remoteId;
+    SinkTrace() << "Create or modify" << bufferType << remoteId;
    auto mainDatabase = Storage::mainDatabase(transaction(), bufferType);
    const auto sinkId = syncStore().resolveRemoteId(bufferType, remoteId);
    const auto found = mainDatabase.contains(sinkId);
    auto adaptorFactory = Sink::AdaptorFactoryRegistry::instance().getFactory(mResourceType, bufferType);
    Q_ASSERT(adaptorFactory);
    if (!found) {
-        Trace() << "Found a new entity: " << remoteId;
+        SinkTrace() << "Found a new entity: " << remoteId;
        createEntity(
            sinkId, bufferType, entity, *adaptorFactory, [this](const QByteArray &buffer) { enqueueCommand(Sink::Commands::CreateEntityCommand, buffer); });
    } else { // modification
@@ -159,17 +161,17 @@ void Synchronizer::createOrModify(const QByteArray &bufferType, const QByteArray
            bool changed = false;
            for (const auto &property : entity.changedProperties()) {
                if (entity.getProperty(property) != current->getProperty(property)) {
-                    Trace() << "Property changed " << sinkId << property;
+                    SinkTrace() << "Property changed " << sinkId << property;
                    changed = true;
                }
            }
            if (changed) {
-                Trace() << "Found a modified entity: " << remoteId;
+                SinkTrace() << "Found a modified entity: " << remoteId;
                modifyEntity(sinkId, Sink::Storage::maxRevision(transaction()), bufferType, entity, *adaptorFactory,
                    [this](const QByteArray &buffer) { enqueueCommand(Sink::Commands::ModifyEntityCommand, buffer); });
            }
        } else {
-            Warning() << "Failed to get current entity";
+            SinkWarning() << "Failed to get current entity";
        }
    }
 }
@@ -178,7 +180,7 @@ template<typename DomainType>
 void Synchronizer::createOrModify(const QByteArray &bufferType, const QByteArray &remoteId, const DomainType &entity, const QHash<QByteArray, Sink::Query::Comparator> &mergeCriteria)
 {
-    Trace() << "Create or modify" << bufferType << remoteId;
+    SinkTrace() << "Create or modify" << bufferType << remoteId;
    auto mainDatabase = Storage::mainDatabase(transaction(), bufferType);
    const auto sinkId = syncStore().resolveRemoteId(bufferType, remoteId);
    const auto found = mainDatabase.contains(sinkId);
@@ -192,17 +194,17 @@ void Synchronizer::createOrModify(const QByteArray &bufferType, const QByteArray
            reader.query(query,
                [this, bufferType, remoteId, &merge](const DomainType &o) -> bool{
                    merge = true;
-                    Trace() << "Merging local entity with remote entity: " << o.identifier() << remoteId;
+                    SinkTrace() << "Merging local entity with remote entity: " << o.identifier() << remoteId;
                    syncStore().recordRemoteId(bufferType, o.identifier(), remoteId);
                    return false;
                });
            if (!merge) {
-                Trace() << "Found a new entity: " << remoteId;
+                SinkTrace() << "Found a new entity: " << remoteId;
                createEntity(
                    sinkId, bufferType, entity, *adaptorFactory, [this](const QByteArray &buffer) { enqueueCommand(Sink::Commands::CreateEntityCommand, buffer); });
            }
        } else {
-            Trace() << "Found a new entity: " << remoteId;
+            SinkTrace() << "Found a new entity: " << remoteId;
            createEntity(
                sinkId, bufferType, entity, *adaptorFactory, [this](const QByteArray &buffer) { enqueueCommand(Sink::Commands::CreateEntityCommand, buffer); });
        }
@@ -212,17 +214,17 @@ void Synchronizer::createOrModify(const QByteArray &bufferType, const QByteArray
            bool changed = false;
            for (const auto &property : entity.changedProperties()) {
                if (entity.getProperty(property) != current->getProperty(property)) {
-                    Trace() << "Property changed " << sinkId << property;
+                    SinkTrace() << "Property changed " << sinkId << property;
                    changed = true;
                }
            }
            if (changed) {
-                Trace() << "Found a modified entity: " << remoteId;
+                SinkTrace() << "Found a modified entity: " << remoteId;
                modifyEntity(sinkId, Sink::Storage::maxRevision(transaction()), bufferType, entity, *adaptorFactory,
                    [this](const QByteArray &buffer) { enqueueCommand(Sink::Commands::ModifyEntityCommand, buffer); });
            }
        } else {
-            Warning() << "Failed to get current entity";
+            SinkWarning() << "Failed to get current entity";
        }
    }
 }
@@ -239,7 +241,7 @@ void Synchronizer::modify(const DomainType &entity)
 KAsync::Job<void> Synchronizer::synchronize()
 {
-    Trace() << "Synchronizing";
+    SinkTrace() << "Synchronizing";
    mSyncInProgress = true;
    mMessageQueue->startTransaction();
    return synchronizeWithSource().then<void>([this]() {
@@ -265,7 +267,7 @@ void Synchronizer::commit()
 Sink::Storage::Transaction &Synchronizer::transaction()
 {
    if (!mTransaction) {
-        Trace() << "Starting transaction";
+        SinkTrace() << "Starting transaction";
        mTransaction = mStorage.createTransaction(Sink::Storage::ReadOnly);
    }
    return mTransaction;
@@ -274,7 +276,7 @@ Sink::Storage::Transaction &Synchronizer::transaction()
 Sink::Storage::Transaction &Synchronizer::syncTransaction()
 {
    if (!mSyncTransaction) {
-        Trace() << "Starting transaction";
+        SinkTrace() << "Starting transaction";
        mSyncTransaction = mSyncStorage.createTransaction(Sink::Storage::ReadWrite);
    }
    return mSyncTransaction;
diff --git a/common/test.cpp b/common/test.cpp
index 59ad9ec..5b4c899 100644
--- a/common/test.cpp
+++ b/common/test.cpp
@@ -27,11 +27,17 @@
 #include "facadefactory.h"
 #include "query.h"
 #include "resourceconfig.h"
+#include "definitions.h"
+SINK_DEBUG_AREA("test")
 using namespace Sink;
 void Sink::Test::initTest()
 {
+    auto logIniFile = Sink::configLocation() + "/log.ini";
+    auto areaAutocompletionFile = Sink::dataLocation() + "/debugAreas.ini";
    setTestModeEnabled(true);
    // qDebug() << "Removing " << QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
    QDir(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)).removeRecursively();
@@ -45,6 +51,31 @@ void Sink::Test::initTest()
    QDir(QStandardPaths::writableLocation(QStandardPaths::CacheLocation)).removeRecursively();
    // qDebug() << "Removing " << QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation);
    QDir(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation)).removeRecursively();
+    Log::setPrimaryComponent("test");
+    //We copy those files so we can control debug output from outside the test with sinksh
+    {
+        QFile file(logIniFile);
+        if (!file.open(QIODevice::ReadOnly)) {
+            qWarning() << "Failed to open the file: " << logIniFile;
+        }
+        QDir dir;
+        dir.mkpath(Sink::configLocation());
+        if (!file.copy(Sink::configLocation() + "/log.ini")) {
+            qWarning() << "Failed to move the file: " << Sink::configLocation() + "/log.ini";
+        }
+    }
+    {
+        QFile file(areaAutocompletionFile);
+        if (!file.open(QIODevice::ReadOnly)) {
+            qWarning() << "Failed to open the file: " << logIniFile;
+        }
+        QDir dir;
+        dir.mkpath(Sink::dataLocation());
+        if (!file.copy(Sink::dataLocation() + "/debugAreas.ini")) {
+            qWarning() << "Failed to move the file: " << Sink::configLocation() + "/log.ini";
+        }
+    }
 }
 void Sink::Test::setTestModeEnabled(bool enabled)
@@ -102,7 +133,7 @@ public:
    {
        auto resultProvider = new Sink::ResultProvider<typename T::Ptr>();
        resultProvider->onDone([resultProvider]() {
-            Trace() << "Result provider is done";
+            SinkTrace() << "Result provider is done";
            delete resultProvider;
        });
        // We have to do it this way, otherwise we're not setting the fetcher right
@@ -110,11 +141,11 @@ public:
        resultProvider->setFetcher([query, resultProvider, this](const typename T::Ptr &parent) {
            if (parent) {
-                Trace() << "Running the fetcher " << parent->identifier();
+                SinkTrace() << "Running the fetcher " << parent->identifier();
            } else {
-                Trace() << "Running the fetcher.";
+                SinkTrace() << "Running the fetcher.";
            }
-            Trace() << "-------------------------.";
+            SinkTrace() << "-------------------------.";
            for (const auto &res : mTestAccount->entities<T>()) {
                qDebug() << "Parent filter " << query.propertyFilter.value("parent").value.toByteArray() << res->identifier() << res->getProperty("parent").toByteArray();
                auto parentProperty = res->getProperty("parent").toByteArray();
diff --git a/common/typeindex.cpp b/common/typeindex.cpp
index 05bbf5c..78195d3 100644
--- a/common/typeindex.cpp
+++ b/common/typeindex.cpp
@@ -22,8 +22,7 @@
 #include "index.h"
 #include <QDateTime>
-#undef DEBUG_AREA
+SINK_DEBUG_AREA("typeindex")
-#define DEBUG_AREA "common.typeindex"
 static QByteArray getByteArray(const QVariant &value)
 {
@@ -63,7 +62,7 @@ template <>
 void TypeIndex::addProperty<QByteArray>(const QByteArray &property)
 {
    auto indexer = [this, property](const QByteArray &identifier, const QVariant &value, Sink::Storage::Transaction &transaction) {
-        // Trace() << "Indexing " << mType + ".index." + property << value.toByteArray();
+        // SinkTrace() << "Indexing " << mType + ".index." + property << value.toByteArray();
        Index(indexName(property), transaction).add(getByteArray(value), identifier);
    };
    mIndexer.insert(property, indexer);
@@ -74,7 +73,7 @@ template <>
 void TypeIndex::addProperty<QString>(const QByteArray &property)
 {
    auto indexer = [this, property](const QByteArray &identifier, const QVariant &value, Sink::Storage::Transaction &transaction) {
-        // Trace() << "Indexing " << mType + ".index." + property << value.toByteArray();
+        // SinkTrace() << "Indexing " << mType + ".index." + property << value.toByteArray();
        Index(indexName(property), transaction).add(getByteArray(value), identifier);
    };
    mIndexer.insert(property, indexer);
@@ -85,7 +84,7 @@ template <>
 void TypeIndex::addProperty<QDateTime>(const QByteArray &property)
 {
    auto indexer = [this, property](const QByteArray &identifier, const QVariant &value, Sink::Storage::Transaction &transaction) {
-        // Trace() << "Indexing " << mType + ".index." + property << date.toString();
+        // SinkTrace() << "Indexing " << mType + ".index." + property << date.toString();
        Index(indexName(property), transaction).add(getByteArray(value), identifier);
    };
    mIndexer.insert(property, indexer);
@@ -143,12 +142,12 @@ ResultSet TypeIndex::query(const Sink::Query &query, QSet<QByteArray> &appliedFi
        if (query.propertyFilter.contains(it.key()) && query.sortProperty == it.value()) {
            Index index(indexName(it.key(), it.value()), transaction);
            const auto lookupKey = getByteArray(query.propertyFilter.value(it.key()).value);
-            Trace() << "looking for " << lookupKey;
+            SinkTrace() << "looking for " << lookupKey;
            index.lookup(lookupKey, [&](const QByteArray &value) { keys << value; },
-                [it](const Index::Error &error) { Warning() << "Error in index: " << error.message << it.key() << it.value(); }, true);
+                [it](const Index::Error &error) { SinkWarning() << "Error in index: " << error.message << it.key() << it.value(); }, true);
            appliedFilters << it.key();
            appliedSorting = it.value();
-            Trace() << "Index lookup on " << it.key() << it.value() << " found " << keys.size() << " keys.";
+            SinkTrace() << "Index lookup on " << it.key() << it.value() << " found " << keys.size() << " keys.";
            return ResultSet(keys);
        }
    }
@@ -157,12 +156,12 @@ ResultSet TypeIndex::query(const Sink::Query &query, QSet<QByteArray> &appliedFi
            Index index(indexName(property), transaction);
            const auto lookupKey = getByteArray(query.propertyFilter.value(property).value);
            index.lookup(
-                lookupKey, [&](const QByteArray &value) { keys << value; }, [property](const Index::Error &error) { Warning() << "Error in index: " << error.message << property; });
+                lookupKey, [&](const QByteArray &value) { keys << value; }, [property](const Index::Error &error) { SinkWarning() << "Error in index: " << error.message << property; });
            appliedFilters << property;
-            Trace() << "Index lookup on " << property << " found " << keys.size() << " keys.";
+            SinkTrace() << "Index lookup on " << property << " found " << keys.size() << " keys.";
            return ResultSet(keys);
        }
    }
-    Trace() << "No matching index";
+    SinkTrace() << "No matching index";
    return ResultSet(keys);
 }
diff --git a/docs/sinksh.md b/docs/sinksh.md
index 9884169..b04eb0c 100644
--- a/docs/sinksh.md
+++ b/docs/sinksh.md
@@ -33,22 +33,22 @@ Provides the same contents as "list" but in a graphical tree view. This was real
 # Setting up a new resource instance
 sink_cmd is already the primary way how you create resource instances:
-  `sinksh create resource org.kde.maildir path /home/developer/maildir1`
+  `sinksh create resource sink.maildir path /home/developer/maildir1`
-This creates a resource of type "org.kde.maildir" and a configuration of "path" with the value "home/developer/maildir1". Resources are stored in configuration files, so all this does is write to some config files.
+This creates a resource of type "sink.maildir" and a configuration of "path" with the value "home/developer/maildir1". Resources are stored in configuration files, so all this does is write to some config files.
  `sinksh list resource`
 By listing all available resources we can find the identifier of the resource that was automatically assigned.
-  `sinksh synchronize org.kde.maildir.instance1`
+  `sinksh synchronize sink.maildir.instance1`
 This triggers the actual synchronization in the resource, and from there on the data is available.
-  `sinksh list folder org.kde.maildir.instance1`
+  `sinksh list folder sink.maildir.instance1`
 This will get you all folders that are in the resource.
-  `sinksh remove resource org.kde.maildir.instance1`
+  `sinksh remove resource sink.maildir.instance1`
 And this will finally remove all traces of the resource instance.
diff --git a/examples/client/main.cpp b/examples/client/main.cpp
index 07e780e..f4b472f 100644
--- a/examples/client/main.cpp
+++ b/examples/client/main.cpp
@@ -120,7 +120,7 @@ public:
        syncButton->setText("Synchronize!");
        QObject::connect(syncButton, &QPushButton::pressed, []() {
            Sink::Query query;
-            query.resources << "org.kde.dummy.instance1";
+            query.resources << "sink.dummy.instance1";
            Sink::Store::synchronize(query).exec();
        });
diff --git a/examples/dummyresource/resourcefactory.cpp b/examples/dummyresource/resourcefactory.cpp
index 2bd52cc..0f7463f 100644
--- a/examples/dummyresource/resourcefactory.cpp
+++ b/examples/dummyresource/resourcefactory.cpp
@@ -23,6 +23,7 @@
 #include "entitybuffer.h"
 #include "pipeline.h"
 #include "dummycalendar_generated.h"
+#include "notification_generated.h"
 #include "mail_generated.h"
 #include "createentity_generated.h"
 #include "domainadaptor.h"
@@ -47,6 +48,8 @@
 #define ENTITY_TYPE_MAIL "mail"
 #define ENTITY_TYPE_FOLDER "folder"
+SINK_DEBUG_AREA("dummyresource")
 class DummySynchronizer : public Sink::Synchronizer {
    public:
@@ -104,12 +107,12 @@ class DummySynchronizer : public Sink::Synchronizer {
            auto entity = createEntity(remoteId, it.value());
            createOrModify(bufferType, remoteId, *entity);
        }
-        Trace() << "Sync of " << count << " entities of type " << bufferType << " done." << Sink::Log::TraceTime(time->elapsed());
+        SinkTrace() << "Sync of " << count << " entities of type " << bufferType << " done." << Sink::Log::TraceTime(time->elapsed());
    }
    KAsync::Job<void> synchronizeWithSource() Q_DECL_OVERRIDE
    {
-        Log() << " Synchronizing with the source";
+        SinkLog() << " Synchronizing with the source";
        return KAsync::start<void>([this]() {
            synchronize(ENTITY_TYPE_EVENT, DummyStore::instance().events(), [this](const QByteArray &ridBuffer, const QMap<QString, QVariant> &data) {
                return createEvent(ridBuffer, data);
@@ -120,7 +123,7 @@ class DummySynchronizer : public Sink::Synchronizer {
            synchronize(ENTITY_TYPE_FOLDER, DummyStore::instance().folders(), [this](const QByteArray &ridBuffer, const QMap<QString, QVariant> &data) {
                return createFolder(ridBuffer, data);
            });
-            Log() << "Done Synchronizing";
+            SinkLog() << "Done Synchronizing";
        });
    }
@@ -144,10 +147,22 @@ DummyResource::~DummyResource()
 }
+KAsync::Job<void> DummyResource::synchronizeWithSource()
+{
+    SinkTrace() << "Synchronize with source and sending a notification about it";
+    Sink::Notification n;
+    n.id = "connected";
+    n.type = Sink::Notification::Status;
+    n.message = "We're connected";
+    n.code = Sink::ApplicationDomain::ConnectedStatus;
+    emit notify(n);
+    return GenericResource::synchronizeWithSource();
+}
 KAsync::Job<void> DummyResource::inspect(int inspectionType, const QByteArray &inspectionId, const QByteArray &domainType, const QByteArray &entityId, const QByteArray &property, const QVariant &expectedValue)
 {
-    Trace() << "Inspecting " << inspectionType << domainType << entityId << property << expectedValue;
+    SinkTrace() << "Inspecting " << inspectionType << domainType << entityId << property << expectedValue;
    if (property == "testInspection") {
        if (expectedValue.toBool()) {
            //Success
diff --git a/examples/dummyresource/resourcefactory.h b/examples/dummyresource/resourcefactory.h
index 1c51b00..9192c68 100644
--- a/examples/dummyresource/resourcefactory.h
+++ b/examples/dummyresource/resourcefactory.h
@@ -27,7 +27,7 @@
 #include <flatbuffers/flatbuffers.h>
 //TODO: a little ugly to have this in two places, once here and once in Q_PLUGIN_METADATA
-#define PLUGIN_NAME "org.kde.dummy"
+#define PLUGIN_NAME "sink.dummy"
 class DummyResource : public Sink::GenericResource
 {
@@ -35,13 +35,14 @@ public:
    DummyResource(const QByteArray &instanceIdentifier, const QSharedPointer<Sink::Pipeline> &pipeline = QSharedPointer<Sink::Pipeline>());
    virtual ~DummyResource();
+    KAsync::Job<void> synchronizeWithSource() Q_DECL_OVERRIDE;
    KAsync::Job<void> inspect(int inspectionType, const QByteArray &inspectionId, const QByteArray &domainType, const QByteArray &entityId, const QByteArray &property, const QVariant &expectedValue) Q_DECL_OVERRIDE;
 };
 class DummyResourceFactory : public Sink::ResourceFactory
 {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.kde.dummy")
+    Q_PLUGIN_METADATA(IID "sink.dummy")
    Q_INTERFACES(Sink::ResourceFactory)
 public:
diff --git a/examples/imapresource/imapresource.cpp b/examples/imapresource/imapresource.cpp
index e23add8..92f64bf 100644
--- a/examples/imapresource/imapresource.cpp
+++ b/examples/imapresource/imapresource.cpp
@@ -54,8 +54,7 @@
 #define ENTITY_TYPE_MAIL "mail"
 #define ENTITY_TYPE_FOLDER "folder"
-#undef DEBUG_AREA
+SINK_DEBUG_AREA("imapresource")
-#define DEBUG_AREA "resource.imap"
 using namespace Imap;
 using namespace Sink;
@@ -95,7 +94,7 @@ public:
    QByteArray createFolder(const QString &folderName, const QString &folderPath, const QString &parentFolderRid, const QByteArray &icon)
    {
-        Trace() << "Creating folder: " << folderName << parentFolderRid;
+        SinkTrace() << "Creating folder: " << folderName << parentFolderRid;
        const auto remoteId = folderPath.toUtf8();
        const auto bufferType = ENTITY_TYPE_FOLDER;
        Sink::ApplicationDomain::Folder folder;
@@ -118,7 +117,7 @@ public:
    void synchronizeFolders(const QVector<Folder> &folderList)
    {
        const QByteArray bufferType = ENTITY_TYPE_FOLDER;
-        Trace() << "Found folders " << folderList.size();
+        SinkTrace() << "Found folders " << folderList.size();
        scanForRemovals(bufferType,
            [this, &bufferType](const std::function<void(const QByteArray &)> &callback) {
@@ -154,7 +153,7 @@ public:
        time->start();
        const QByteArray bufferType = ENTITY_TYPE_MAIL;
-        Trace() << "Importing new mail." << path;
+        SinkTrace() << "Importing new mail." << path;
        const auto folderLocalId = syncStore().resolveRemoteId(ENTITY_TYPE_FOLDER, path.toUtf8());
@@ -163,7 +162,7 @@ public:
            count++;
            const auto remoteId = assembleMailRid(folderLocalId, message.uid);
-            Trace() << "Found a mail " << remoteId << message.msg->subject(true)->asUnicodeString() << message.flags;
+            SinkTrace() << "Found a mail " << remoteId << message.msg->subject(true)->asUnicodeString() << message.flags;
            auto mail = Sink::ApplicationDomain::Mail::create(mResourceInstanceIdentifier);
            mail.setFolder(folderLocalId);
@@ -174,7 +173,7 @@ public:
            createOrModify(bufferType, remoteId, mail);
        }
        const auto elapsed = time->elapsed();
-        Log() << "Synchronized " << count << " mails in " << path << Sink::Log::TraceTime(elapsed) << " " << elapsed/qMax(count, 1) << " [ms/mail]";
+        SinkLog() << "Synchronized " << count << " mails in " << path << Sink::Log::TraceTime(elapsed) << " " << elapsed/qMax(count, 1) << " [ms/mail]";
    }
    void synchronizeRemovals(const QString &path, const QSet<qint64> &messages)
@@ -183,7 +182,7 @@ public:
        time->start();
        const QByteArray bufferType = ENTITY_TYPE_MAIL;
-        Trace() << "Finding removed mail.";
+        SinkTrace() << "Finding removed mail.";
        const auto folderLocalId = syncStore().resolveRemoteId(ENTITY_TYPE_FOLDER, path.toUtf8());
@@ -196,7 +195,7 @@ public:
                    callback(sinkId);
                },
                [&](const Index::Error &error) {
-                    Warning() << "Error in index: " <<  error.message << property;
+                    SinkWarning() << "Error in index: " <<  error.message << property;
                });
            },
            [messages, path, &count](const QByteArray &remoteId) -> bool {
@@ -209,24 +208,24 @@ public:
        );
        const auto elapsed = time->elapsed();
-        Log() << "Removed " << count << " mails in " << path << Sink::Log::TraceTime(elapsed) << " " << elapsed/qMax(count, 1) << " [ms/mail]";
+        SinkLog() << "Removed " << count << " mails in " << path << Sink::Log::TraceTime(elapsed) << " " << elapsed/qMax(count, 1) << " [ms/mail]";
    }
    KAsync::Job<void> synchronizeWithSource() Q_DECL_OVERRIDE
    {
-        Log() << " Synchronizing";
+        SinkLog() << " Synchronizing";
        return KAsync::start<void>([this](KAsync::Future<void> future) {
-            Trace() << "Connecting to:" << mServer << mPort;
+            SinkTrace() << "Connecting to:" << mServer << mPort;
-            Trace() << "as:" << mUser;
+            SinkTrace() << "as:" << mUser;
            ImapServerProxy imap(mServer, mPort);
            auto loginFuture = imap.login(mUser, mPassword).exec();
            loginFuture.waitForFinished();
            if (loginFuture.errorCode()) {
-                Warning() << "Login failed.";
+                SinkWarning() << "Login failed.";
                future.setError(1, "Login failed");
                return;
            } else {
-                Trace() << "Login was successful";
+                SinkTrace() << "Login was successful";
            }
            QVector<Folder> folderList;
@@ -238,11 +237,11 @@ public:
            }).exec();
            folderFuture.waitForFinished();
            if (folderFuture.errorCode()) {
-                Warning() << "Folder sync failed.";
+                SinkWarning() << "Folder sync failed.";
                future.setError(1, "Folder list sync failed");
                return;
            } else {
-                Trace() << "Folder sync was successful";
+                SinkTrace() << "Folder sync was successful";
            }
            for (const auto &folder : folderList) {
@@ -251,7 +250,7 @@ public:
                }
                QSet<qint64> uids;
                auto messagesFuture = imap.fetchMessages(folder, [this, folder, &uids](const QVector<Message> &messages) {
-                    Trace() << "Synchronizing mails" << folder.normalizedPath();
+                    SinkTrace() << "Synchronizing mails" << folder.normalizedPath();
                    for (const auto &msg : messages) {
                        uids << msg.uid;
                    }
@@ -260,16 +259,16 @@ public:
                messagesFuture.waitForFinished();
                commit();
                if (messagesFuture.errorCode()) {
-                    Warning() << "Folder sync failed: " << folder.normalizedPath();
+                    SinkWarning() << "Folder sync failed: " << folder.normalizedPath();
                    continue;
                }
                //Remove what there is to remove
                synchronizeRemovals(folder.normalizedPath(), uids);
                commit();
-                Trace() << "Folder synchronized: " << folder.normalizedPath();
+                SinkTrace() << "Folder synchronized: " << folder.normalizedPath();
            }
-            Log() << "Done Synchronizing";
+            SinkLog() << "Done Synchronizing";
            future.setFinished();
        });
    }
@@ -310,7 +309,7 @@ public:
                .then<void, qint64>([imap, mailbox, rid, mail](qint64 uid) {
                    const auto remoteId = assembleMailRid(mail, uid);
                    //FIXME this get's called after the final error handler? WTF?
-                    Trace() << "Finished creating a new mail: " << remoteId;
+                    SinkTrace() << "Finished creating a new mail: " << remoteId;
                    *rid = remoteId;
                }).then<QByteArray>([rid, imap]() { //FIXME fix KJob so we don't need this extra clause
                   return *rid;
@@ -319,19 +318,19 @@ public:
            const auto folderId = folderIdFromMailRid(oldRemoteId);
            const QString mailbox = syncStore().resolveLocalId(ENTITY_TYPE_FOLDER, folderId);
            const auto uid = uidFromMailRid(oldRemoteId);
-            Trace() << "Removing a mail: " << oldRemoteId << "in the mailbox: " << mailbox;
+            SinkTrace() << "Removing a mail: " << oldRemoteId << "in the mailbox: " << mailbox;
            KIMAP::ImapSet set;
            set.add(uid);
            return login.then(imap->remove(mailbox, set))
                .then<QByteArray>([imap, oldRemoteId]() {
-                    Trace() << "Finished removing a mail: " << oldRemoteId;
+                    SinkTrace() << "Finished removing a mail: " << oldRemoteId;
                    return QByteArray();
                });
        } else if (operation == Sink::Operation_Modification) {
            const QString mailbox = syncStore().resolveLocalId(ENTITY_TYPE_FOLDER, mail.getFolder());
            const auto uid = uidFromMailRid(oldRemoteId);
-            Trace() << "Modifying a mail: " << oldRemoteId << " in the mailbox: " << mailbox << changedProperties;
+            SinkTrace() << "Modifying a mail: " << oldRemoteId << " in the mailbox: " << mailbox << changedProperties;
            QByteArrayList flags;
            if (!mail.getUnread()) {
@@ -344,7 +343,7 @@ public:
            const bool messageMoved = changedProperties.contains(ApplicationDomain::Mail::Folder::name);
            const bool messageChanged = changedProperties.contains(ApplicationDomain::Mail::MimeMessage::name);
            if (messageChanged || messageMoved) {
-                Trace() << "Replacing message.";
+                SinkTrace() << "Replacing message.";
                const auto folderId = folderIdFromMailRid(oldRemoteId);
                const QString oldMailbox = syncStore().resolveLocalId(ENTITY_TYPE_FOLDER, folderId);
                QByteArray content = KMime::LFtoCRLF(mail.getMimeMessage());
@@ -355,7 +354,7 @@ public:
                return login.then(imap->append(mailbox, content, flags, internalDate))
                    .then<void, qint64>([imap, mailbox, rid, mail](qint64 uid) {
                        const auto remoteId = assembleMailRid(mail, uid);
-                        Trace() << "Finished creating a modified mail: " << remoteId;
+                        SinkTrace() << "Finished creating a modified mail: " << remoteId;
                        *rid = remoteId;
                    })
                    .then(imap->remove(oldMailbox, set))
@@ -363,13 +362,13 @@ public:
                        return *rid;
                    });
            } else {
-                Trace() << "Updating flags only.";
+                SinkTrace() << "Updating flags only.";
                KIMAP::ImapSet set;
                set.add(uid);
                return login.then(imap->select(mailbox))
                    .then(imap->storeFlags(set, flags))
                    .then<void>([imap, mailbox]() {
-                        Trace() << "Finished modifying mail";
+                        SinkTrace() << "Finished modifying mail";
                    })
                    .then<QByteArray>([oldRemoteId, imap]() {
                        return oldRemoteId;
@@ -388,11 +387,11 @@ public:
            if (!folder.getParent().isEmpty()) {
                parentFolder = syncStore().resolveLocalId(ENTITY_TYPE_FOLDER, folder.getParent());
            }
-            Trace() << "Creating a new folder: " << parentFolder << folder.getName();
+            SinkTrace() << "Creating a new folder: " << parentFolder << folder.getName();
            auto rid = QSharedPointer<QByteArray>::create();
            auto createFolder = login.then<QString>(imap->createSubfolder(parentFolder, folder.getName()))
                .then<void, QString>([imap, rid](const QString &createdFolder) {
-                    Trace() << "Finished creating a new folder: " << createdFolder;
+                    SinkTrace() << "Finished creating a new folder: " << createdFolder;
                    *rid = createdFolder.toUtf8();
                });
            if (folder.getSpecialPurpose().isEmpty()) {
@@ -414,15 +413,15 @@ public:
                        for (const auto &purpose : folder.getSpecialPurpose()) {
                            if (specialPurposeFolders->contains(purpose)) {
                                auto f = specialPurposeFolders->value(purpose);
-                                Trace() << "Merging specialpurpose folder with: " << f << " with purpose: " << purpose;
+                                SinkTrace() << "Merging specialpurpose folder with: " << f << " with purpose: " << purpose;
                                *rid = f.toUtf8();
                                return KAsync::null<void>();
                            }
                        }
-                        Trace() << "No match found for merging, creating a new folder";
+                        SinkTrace() << "No match found for merging, creating a new folder";
                        return imap->createSubfolder(parentFolder, folder.getName())
                            .then<void, QString>([imap, rid](const QString &createdFolder) {
-                                Trace() << "Finished creating a new folder: " << createdFolder;
+                                SinkTrace() << "Finished creating a new folder: " << createdFolder;
                                *rid = createdFolder.toUtf8();
                            });
@@ -433,18 +432,18 @@ public:
                return mergeJob;
            }
        } else if (operation == Sink::Operation_Removal) {
-            Trace() << "Removing a folder: " << oldRemoteId;
+            SinkTrace() << "Removing a folder: " << oldRemoteId;
            return login.then<void>(imap->remove(oldRemoteId))
                .then<QByteArray>([oldRemoteId, imap]() {
-                    Trace() << "Finished removing a folder: " << oldRemoteId;
+                    SinkTrace() << "Finished removing a folder: " << oldRemoteId;
                    return QByteArray();
                });
        } else if (operation == Sink::Operation_Modification) {
-            Trace() << "Renaming a folder: " << oldRemoteId << folder.getName();
+            SinkTrace() << "Renaming a folder: " << oldRemoteId << folder.getName();
            auto rid = QSharedPointer<QByteArray>::create();
            return login.then<QString>(imap->renameSubfolder(oldRemoteId, folder.getName()))
                .then<void, QString>([imap, rid](const QString &createdFolder) {
-                    Trace() << "Finished renaming a folder: " << createdFolder;
+                    SinkTrace() << "Finished renaming a folder: " << createdFolder;
                    *rid = createdFolder.toUtf8();
                })
                .then<QByteArray>([rid](){
@@ -515,7 +514,7 @@ KAsync::Job<void> ImapResource::inspect(int inspectionType, const QByteArray &in
    auto entityStore = QSharedPointer<Sink::EntityStore>::create(mResourceType, mResourceInstanceIdentifier, transaction);
    auto syncStore = QSharedPointer<Sink::RemoteIdMap>::create(synchronizationTransaction);
-    Trace() << "Inspecting " << inspectionType << domainType << entityId << property << expectedValue;
+    SinkTrace() << "Inspecting " << inspectionType << domainType << entityId << property << expectedValue;
    if (domainType == ENTITY_TYPE_MAIL) {
        const auto mail = entityStore->read<Sink::ApplicationDomain::Mail>(entityId);
@@ -523,11 +522,11 @@ KAsync::Job<void> ImapResource::inspect(int inspectionType, const QByteArray &in
        const auto folderRemoteId = syncStore->resolveLocalId(ENTITY_TYPE_FOLDER, mail.getFolder());
        const auto mailRemoteId = syncStore->resolveLocalId(ENTITY_TYPE_MAIL, mail.identifier());
        if (mailRemoteId.isEmpty() || folderRemoteId.isEmpty()) {
-            Warning() << "Missing remote id for folder or mail. " << mailRemoteId << folderRemoteId;
+            SinkWarning() << "Missing remote id for folder or mail. " << mailRemoteId << folderRemoteId;
            return KAsync::error<void>();
        }
        const auto uid = uidFromMailRid(mailRemoteId);
-        Trace() << "Mail remote id: " << folderRemoteId << mailRemoteId << mail.identifier() << folder.identifier();
+        SinkTrace() << "Mail remote id: " << folderRemoteId << mailRemoteId << mail.identifier() << folder.identifier();
        KIMAP::ImapSet set;
        set.add(uid);
@@ -538,8 +537,8 @@ KAsync::Job<void> ImapResource::inspect(int inspectionType, const QByteArray &in
        scope.mode = KIMAP::FetchJob::FetchScope::Full;
        auto imap = QSharedPointer<ImapServerProxy>::create(mServer, mPort);
        auto messageByUid = QSharedPointer<QHash<qint64, Imap::Message>>::create();
-        Trace() << "Connecting to:" << mServer << mPort;
+        SinkTrace() << "Connecting to:" << mServer << mPort;
-        Trace() << "as:" << mUser;
+        SinkTrace() << "as:" << mUser;
        auto inspectionJob = imap->login(mUser, mPassword)
            .then<void>(imap->select(folderRemoteId))
            .then<void>(imap->fetch(set, scope, [imap, messageByUid](const QVector<Imap::Message> &messages) {
@@ -574,8 +573,8 @@ KAsync::Job<void> ImapResource::inspect(int inspectionType, const QByteArray &in
        if (inspectionType == Sink::ResourceControl::Inspection::ExistenceInspectionType) {
            return inspectionJob.then<void, KAsync::Job<void>>([=]() {
                if (!messageByUid->contains(uid)) {
-                    Warning() << "Existing messages are: " << messageByUid->keys();
+                    SinkWarning() << "Existing messages are: " << messageByUid->keys();
-                    Warning() << "We're looking for: " << uid;
+                    SinkWarning() << "We're looking for: " << uid;
                    return KAsync::error<void>(1, "Couldn't find message: " + mailRemoteId);
                }
                return KAsync::null<void>();
@@ -587,7 +586,7 @@ KAsync::Job<void> ImapResource::inspect(int inspectionType, const QByteArray &in
        const auto folder = entityStore->read<Sink::ApplicationDomain::Folder>(entityId);
        if (inspectionType == Sink::ResourceControl::Inspection::CacheIntegrityInspectionType) {
-            Log() << "Inspecting cache integrity" << remoteId;
+            SinkLog() << "Inspecting cache integrity" << remoteId;
            int expectedCount = 0;
            Index index("mail.index.folder", transaction);
@@ -595,7 +594,7 @@ KAsync::Job<void> ImapResource::inspect(int inspectionType, const QByteArray &in
                expectedCount++;
            },
            [&](const Index::Error &error) {
-                Warning() << "Error in index: " <<  error.message << property;
+                SinkWarning() << "Error in index: " <<  error.message << property;
            });
            auto set = KIMAP::ImapSet::fromImapSequenceSet("1:*");
@@ -630,10 +629,10 @@ KAsync::Job<void> ImapResource::inspect(int inspectionType, const QByteArray &in
                        *folderByName << f.pathParts.last();
                    }
                }))
-                .then<void, KAsync::Job<void>>([folderByName, folderByPath, folder, remoteId, imap]() {
+                .then<void, KAsync::Job<void>>([this, folderByName, folderByPath, folder, remoteId, imap]() {
                    if (!folderByName->contains(folder.getName())) {
-                        Warning() << "Existing folders are: " << *folderByPath;
+                        SinkWarning() << "Existing folders are: " << *folderByPath;
-                        Warning() << "We're looking for: " << folder.getName();
+                        SinkWarning() << "We're looking for: " << folder.getName();
                        return KAsync::error<void>(1, "Wrong folder name: " + remoteId);
                    }
                    return KAsync::null<void>();
diff --git a/examples/imapresource/imapresource.h b/examples/imapresource/imapresource.h
index 0c3b541..534a04e 100644
--- a/examples/imapresource/imapresource.h
+++ b/examples/imapresource/imapresource.h
@@ -26,7 +26,7 @@
 #include <flatbuffers/flatbuffers.h>
 //TODO: a little ugly to have this in two places, once here and once in Q_PLUGIN_METADATA
-#define PLUGIN_NAME "org.kde.imap"
+#define PLUGIN_NAME "sink.imap"
 class ImapMailAdaptorFactory;
 class ImapFolderAdaptorFactory;
@@ -56,7 +56,7 @@ private:
 class ImapResourceFactory : public Sink::ResourceFactory
 {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.kde.imap")
+    Q_PLUGIN_METADATA(IID "sink.imap")
    Q_INTERFACES(Sink::ResourceFactory)
 public:
diff --git a/examples/imapresource/imapserverproxy.cpp b/examples/imapresource/imapserverproxy.cpp
index 1b0a2ec..73ec654 100644
--- a/examples/imapresource/imapserverproxy.cpp
+++ b/examples/imapresource/imapserverproxy.cpp
@@ -37,6 +37,8 @@
 #include "log.h"
+SINK_DEBUG_AREA("imapserverproxy")
 using namespace Imap;
 const char* Imap::Flags::Seen = "\\Seen";
@@ -54,16 +56,16 @@ static KAsync::Job<T> runJob(KJob *job, const std::function<T(KJob*)> &f)
 {
    return KAsync::start<T>([job, f](KAsync::Future<T> &future) {
        QObject::connect(job, &KJob::result, [&future, f](KJob *job) {
-            Trace() << "Job done: " << job->metaObject()->className();
+            SinkTrace() << "Job done: " << job->metaObject()->className();
            if (job->error()) {
-                Warning() << "Job failed: " << job->errorString();
+                SinkWarning() << "Job failed: " << job->errorString();
                future.setError(job->error(), job->errorString());
            } else {
                future.setValue(f(job));
                future.setFinished();
            }
        });
-        Trace() << "Starting job: " << job->metaObject()->className();
+        SinkTrace() << "Starting job: " << job->metaObject()->className();
        job->start();
    });
 }
@@ -72,15 +74,15 @@ static KAsync::Job<void> runJob(KJob *job)
 {
    return KAsync::start<void>([job](KAsync::Future<void> &future) {
        QObject::connect(job, &KJob::result, [&future](KJob *job) {
-            Trace() << "Job done: " << job->metaObject()->className();
+            SinkTrace() << "Job done: " << job->metaObject()->className();
            if (job->error()) {
-                Warning() << "Job failed: " << job->errorString();
+                SinkWarning() << "Job failed: " << job->errorString();
                future.setError(job->error(), job->errorString());
            } else {
                future.setFinished();
            }
        });
-        Trace() << "Starting job: " << job->metaObject()->className();
+        SinkTrace() << "Starting job: " << job->metaObject()->className();
        job->start();
    });
 }
@@ -117,11 +119,11 @@ KAsync::Job<void> ImapServerProxy::login(const QString &username, const QString
    auto namespaceJob = new KIMAP::NamespaceJob(mSession);
    return runJob(loginJob).then(runJob(capabilitiesJob)).then<void>([this](){
-        Trace() << "Supported capabilities: " << mCapabilities;
+        SinkTrace() << "Supported capabilities: " << mCapabilities;
        QStringList requiredExtensions = QStringList() << "UIDPLUS" << "NAMESPACE";
        for (const auto &requiredExtension : requiredExtensions) {
            if (!mCapabilities.contains(requiredExtension)) {
-                Warning() << "Server doesn't support required capability: " << requiredExtension;
+                SinkWarning() << "Server doesn't support required capability: " << requiredExtension;
                //TODO fail the job
            }
        }
@@ -138,9 +140,9 @@ KAsync::Job<void> ImapServerProxy::login(const QString &username, const QString
            mUserNamespaces << ns.name;
            mUserNamespaceSeparator = ns.separator;
        }
-        Trace() << "Found personal namespaces: " << mPersonalNamespaces << mPersonalNamespaceSeparator;
+        SinkTrace() << "Found personal namespaces: " << mPersonalNamespaces << mPersonalNamespaceSeparator;
-        Trace() << "Found shared namespaces: " << mSharedNamespaces << mSharedNamespaceSeparator;
+        SinkTrace() << "Found shared namespaces: " << mSharedNamespaces << mSharedNamespaceSeparator;
-        Trace() << "Found user namespaces: " << mUserNamespaces << mUserNamespaceSeparator;
+        SinkTrace() << "Found user namespaces: " << mUserNamespaces << mUserNamespaceSeparator;
    });
 }
@@ -291,8 +293,8 @@ KAsync::Job<QList<qint64>> ImapServerProxy::fetchHeaders(const QString &mailbox)
                    const QMap<qint64,KIMAP::MessageAttribute> &attrs,
                    const QMap<qint64,KIMAP::MessageFlags> &flags,
                    const QMap<qint64,KIMAP::MessagePtr> &messages) {
-                Trace() << "Received " << uids.size() << " headers from " << mailbox;
+                SinkTrace() << "Received " << uids.size() << " headers from " << mailbox;
-                Trace() << uids.size() << sizes.size() << attrs.size() << flags.size() << messages.size();
+                SinkTrace() << uids.size() << sizes.size() << attrs.size() << flags.size() << messages.size();
                //TODO based on the data available here, figure out which messages to actually fetch
                //(we only fetched headers and structure so far)
@@ -344,7 +346,7 @@ KAsync::Job<QString> ImapServerProxy::createSubfolder(const QString &parentMailb
        } else {
            *folder = parentMailbox + mPersonalNamespaceSeparator + folderName;
        }
-        Trace() << "Creating subfolder: " << *folder;
+        SinkTrace() << "Creating subfolder: " << *folder;
        return create(*folder);
    })
    .then<QString>([=]() {
@@ -360,7 +362,7 @@ KAsync::Job<QString> ImapServerProxy::renameSubfolder(const QString &oldMailbox,
        auto parts = oldMailbox.split(mPersonalNamespaceSeparator);
        parts.removeLast();
        *folder = parts.join(mPersonalNamespaceSeparator) + mPersonalNamespaceSeparator + newName;
-        Trace() << "Renaming subfolder: " << oldMailbox << *folder;
+        SinkTrace() << "Renaming subfolder: " << oldMailbox << *folder;
        return rename(oldMailbox, *folder);
    })
    .then<QString>([=]() {
@@ -370,14 +372,14 @@ KAsync::Job<QString> ImapServerProxy::renameSubfolder(const QString &oldMailbox,
 KAsync::Job<void> ImapServerProxy::fetchFolders(std::function<void(const QVector<Folder> &)> callback)
 {
-    Trace() << "Fetching folders";
+    SinkTrace() << "Fetching folders";
    return list(KIMAP::ListJob::IncludeUnsubscribed, [callback](const QList<KIMAP::MailBoxDescriptor> &mailboxes, const QList<QList<QByteArray> > &flags){
        QVector<Folder> list;
        for (int i = 0; i < mailboxes.size(); i++) {
            const auto mailbox = mailboxes[i];
            const auto mailboxFlags = flags[i];
            bool noselect = mailboxFlags.contains(QByteArray(FolderFlags::Noselect).toLower()) || mailboxFlags.contains(QByteArray(FolderFlags::Noselect));
-            Log() << "Found mailbox: " << mailbox.name << mailboxFlags << FolderFlags::Noselect << noselect;
+            SinkLog() << "Found mailbox: " << mailbox.name << mailboxFlags << FolderFlags::Noselect << noselect;
            list << Folder{mailbox.name.split(mailbox.separator), mailbox.name, mailbox.separator, noselect};
        }
        callback(list);
@@ -395,9 +397,9 @@ KAsync::Job<void> ImapServerProxy::fetchMessages(const Folder &folder, std::func
    Q_ASSERT(!mPersonalNamespaceSeparator.isNull());
    return select(mailboxFromFolder(folder)).then<void, KAsync::Job<void>>([this, callback, folder]() -> KAsync::Job<void> {
        return fetchHeaders(mailboxFromFolder(folder)).then<void, KAsync::Job<void>, QList<qint64>>([this, callback](const QList<qint64> &uidsToFetch){
-            Trace() << "Uids to fetch: " << uidsToFetch;
+            SinkTrace() << "Uids to fetch: " << uidsToFetch;
            if (uidsToFetch.isEmpty()) {
-                Trace() << "Nothing to fetch";
+                SinkTrace() << "Nothing to fetch";
                callback(QVector<Message>());
                return KAsync::null<void>();
            }
diff --git a/examples/imapresource/tests/imapmailsynctest.cpp b/examples/imapresource/tests/imapmailsynctest.cpp
index 968cde5..fcc659d 100644
--- a/examples/imapresource/tests/imapmailsynctest.cpp
+++ b/examples/imapresource/tests/imapmailsynctest.cpp
@@ -17,6 +17,7 @@
 *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
 */
 #include <QtTest>
+#include <QTcpSocket>
 #include <tests/mailsynctest.h>
 #include "../imapresource.h"
@@ -38,6 +39,13 @@ class ImapMailSyncTest : public Sink::MailSyncTest
    Q_OBJECT
 protected:
+    bool isBackendAvailable() Q_DECL_OVERRIDE
+    {
+        QTcpSocket socket;
+        socket.connectToHost("localhost", 993);
+        return socket.waitForConnected(200);
+    }
    void resetTestEnvironment() Q_DECL_OVERRIDE
    {
        system("resetmailbox.sh");
diff --git a/examples/imapresource/tests/imapmailtest.cpp b/examples/imapresource/tests/imapmailtest.cpp
index c94a731..e6f41f4 100644
--- a/examples/imapresource/tests/imapmailtest.cpp
+++ b/examples/imapresource/tests/imapmailtest.cpp
@@ -1,4 +1,5 @@
 #include <QtTest>
+#include <QTcpSocket>
 #include <tests/mailtest.h>
@@ -18,6 +19,13 @@ class ImapMailTest : public Sink::MailTest
    Q_OBJECT
 protected:
+    bool isBackendAvailable() Q_DECL_OVERRIDE
+    {
+        QTcpSocket socket;
+        socket.connectToHost("localhost", 993);
+        return socket.waitForConnected(200);
+    }
    void resetTestEnvironment() Q_DECL_OVERRIDE
    {
        system("resetmailbox.sh");
diff --git a/examples/imapresource/tests/imapserverproxytest.cpp b/examples/imapresource/tests/imapserverproxytest.cpp
index e32298c..ef695b3 100644
--- a/examples/imapresource/tests/imapserverproxytest.cpp
+++ b/examples/imapresource/tests/imapserverproxytest.cpp
@@ -2,6 +2,7 @@
 #include <QString>
 #include <KMime/Message>
+#include <QTcpSocket>
 #include "../imapserverproxy.h"
@@ -11,6 +12,8 @@
 using namespace Imap;
+SINK_DEBUG_AREA("imapserverproxytest")
 /**
 */
 class ImapServerProxyTest : public QObject
@@ -22,7 +25,9 @@ class ImapServerProxyTest : public QObject
 private slots:
    void initTestCase()
    {
-        Sink::Log::setDebugOutputLevel(Sink::Log::Trace);
+        QTcpSocket socket;
+        socket.connectToHost("localhost", 993);
+        QVERIFY(socket.waitForConnected(200));
        system("resetmailbox.sh");
    }
@@ -77,8 +82,8 @@ private slots:
                            const QMap<qint64,KIMAP::MessageAttribute> &attrs,
                            const QMap<qint64,KIMAP::MessageFlags> &flags,
                            const QMap<qint64,KIMAP::MessagePtr> &messages) {
-                        Trace() << "Received " << uids.size() << " messages from " << mailbox;
+                        SinkTrace() << "Received " << uids.size() << " messages from " << mailbox;
-                        Trace() << uids.size() << sizes.size() << attrs.size() << flags.size() << messages.size();
+                        SinkTrace() << uids.size() << sizes.size() << attrs.size() << flags.size() << messages.size();
                        count += uids.size();
                    }));
@@ -102,8 +107,8 @@ private slots:
                            const QMap<qint64,KIMAP::MessageAttribute> &attrs,
                            const QMap<qint64,KIMAP::MessageFlags> &flags,
                            const QMap<qint64,KIMAP::MessagePtr> &messages) {
-                        Trace() << "Received " << uids.size() << " messages from " << mailbox;
+                        SinkTrace() << "Received " << uids.size() << " messages from " << mailbox;
-                        Trace() << uids.size() << sizes.size() << attrs.size() << flags.size() << messages.size();
+                        SinkTrace() << uids.size() << sizes.size() << attrs.size() << flags.size() << messages.size();
                        count += uids.size();
                    }));
diff --git a/examples/imapresource/tests/resetmailbox.sh b/examples/imapresource/tests/resetmailbox.sh
index 8834b51..6ed198e 100644
--- a/examples/imapresource/tests/resetmailbox.sh
+++ b/examples/imapresource/tests/resetmailbox.sh
@@ -4,6 +4,7 @@ sudo echo "sam user.doe.* cyrus c" | cyradm --auth PLAIN -u cyrus -w admin local
 sudo echo "dm user.doe.*" | cyradm --auth PLAIN -u cyrus -w admin localhost
 sudo echo "cm user.doe.test" | cyradm --auth PLAIN -u cyrus -w admin localhost
 sudo echo "cm user.doe.Drafts" | cyradm --auth PLAIN -u cyrus -w admin localhost
+sudo echo "cm user.doe.Trash" | cyradm --auth PLAIN -u cyrus -w admin localhost
 sudo echo "sam user.doe cyrus c" | cyradm --auth PLAIN -u cyrus -w admin localhost
 sudo cp /work/source/Sink/examples/imapresource/tests/data/1365777830.R28.localhost.localdomain\:2\,S /var/spool/imap/d/user/doe/test/1.
 sudo chown cyrus:mail /var/spool/imap/d/user/doe/test/1.
diff --git a/examples/maildirresource/facade.cpp b/examples/maildirresource/facade.cpp
index d8fc02d..256b255 100644
--- a/examples/maildirresource/facade.cpp
+++ b/examples/maildirresource/facade.cpp
@@ -38,11 +38,11 @@ MaildirResourceMailFacade::MaildirResourceMailFacade(const QByteArray &instanceI
            const auto folderPath = parts.join('/');
            const auto path =  folderPath + "/cur/";
-            Trace() << "Looking for mail in: " << path << key;
+            SinkTrace_("", "maildirfacade") << "Looking for mail in: " << path << key;
            QDir dir(path);
            const QFileInfoList list = dir.entryInfoList(QStringList() << (key+"*"), QDir::Files);
            if (list.size() != 1) {
-                Warning() << "Failed to find message " << path << key << list.size();
+                SinkWarning_("", "maildirfacade") << "Failed to find message " << path << key << list.size();
                value.setProperty("mimeMessage", QVariant());
            } else {
                value.setProperty("mimeMessage", list.at(0).filePath());
diff --git a/examples/maildirresource/maildirresource.cpp b/examples/maildirresource/maildirresource.cpp
index e1fcfdf..d7a6fff 100644
--- a/examples/maildirresource/maildirresource.cpp
+++ b/examples/maildirresource/maildirresource.cpp
@@ -51,8 +51,7 @@
 #define ENTITY_TYPE_MAIL "mail"
 #define ENTITY_TYPE_FOLDER "folder"
-#undef DEBUG_AREA
+SINK_DEBUG_AREA("maildirresource")
-#define DEBUG_AREA "resource.maildir"
 using namespace Sink;
@@ -65,8 +64,8 @@ static QString getFilePathFromMimeMessagePath(const QString &mimeMessagePath)
    QDir dir(path);
    const QFileInfoList list = dir.entryInfoList(QStringList() << (key+"*"), QDir::Files);
    if (list.size() != 1) {
-        Warning() << "Failed to find message " << mimeMessagePath;
+        SinkWarning() << "Failed to find message " << mimeMessagePath;
-        Warning() << "Failed to find message " << path;
+        SinkWarning() << "Failed to find message " << path;
        return QString();
    }
    return list.first().filePath();
@@ -115,7 +114,7 @@ public:
            const auto path = getPath(folder, transaction);
            KPIM::Maildir maildir(path, false);
            if (!maildir.isValid(true)) {
-                Warning() << "Maildir is not existing: " << path;
+                SinkWarning() << "Maildir is not existing: " << path;
            }
            auto identifier = maildir.addEntryFromPath(oldPath);
            return path + "/" + identifier;
@@ -124,7 +123,7 @@ public:
            const auto path = getPath(folder, transaction);
            KPIM::Maildir maildir(path, false);
            if (!maildir.isValid(true)) {
-                Warning() << "Maildir is not existing: " << path;
+                SinkWarning() << "Maildir is not existing: " << path;
            }
            auto oldIdentifier = KPIM::Maildir::getKeyFromFile(oldPath);
            auto pathParts = oldPath.split('/');
@@ -135,7 +134,7 @@ public:
            }
            KPIM::Maildir oldMaildir(oldDirectory, false);
            if (!oldMaildir.isValid(false)) {
-                Warning() << "Maildir is not existing: " << path;
+                SinkWarning() << "Maildir is not existing: " << path;
            }
            auto identifier = oldMaildir.moveEntryTo(oldIdentifier, maildir);
            return path + "/" + identifier;
@@ -158,7 +157,7 @@ public:
        const bool mimeMessageChanged = mimeMessage.isValid() && mimeMessage.toString() != oldEntity.getProperty("mimeMessage").toString();
        const bool folderChanged = newFolder.isValid() && newFolder.toString() != oldEntity.getProperty("mimeMessage").toString();
        if (mimeMessageChanged || folderChanged) {
-            Trace() << "Moving mime message: " << mimeMessageChanged << folderChanged;
+            SinkTrace() << "Moving mime message: " << mimeMessageChanged << folderChanged;
            auto newPath = moveMessage(mimeMessage.toString(), newEntity.getProperty("folder").toByteArray(), transaction);
            if (newPath != oldEntity.getProperty("mimeMessage").toString()) {
                const auto oldPath = getFilePathFromMimeMessagePath(oldEntity.getProperty("mimeMessage").toString());
@@ -278,7 +277,7 @@ public:
    {
        const QByteArray bufferType = ENTITY_TYPE_FOLDER;
        QStringList folderList = listAvailableFolders();
-        Trace() << "Found folders " << folderList;
+        SinkTrace() << "Found folders " << folderList;
        scanForRemovals(bufferType,
            [this, &bufferType](const std::function<void(const QByteArray &)> &callback) {
@@ -304,23 +303,23 @@ public:
    void synchronizeMails(const QString &path)
    {
-        Trace() << "Synchronizing mails" << path;
+        SinkTrace() << "Synchronizing mails" << path;
        auto time = QSharedPointer<QTime>::create();
        time->start();
        const QByteArray bufferType = ENTITY_TYPE_MAIL;
        KPIM::Maildir maildir(path, true);
        if (!maildir.isValid()) {
-            Warning() << "Failed to sync folder.";
+            SinkWarning() << "Failed to sync folder.";
            return;
        }
-        Trace() << "Importing new mail.";
+        SinkTrace() << "Importing new mail.";
        maildir.importNewMails();
        auto listingPath = maildir.pathToCurrent();
        auto entryIterator = QSharedPointer<QDirIterator>::create(listingPath, QDir::Files);
-        Trace() << "Looking into " << listingPath;
+        SinkTrace() << "Looking into " << listingPath;
        const auto folderLocalId = syncStore().resolveRemoteId(ENTITY_TYPE_FOLDER, path.toUtf8());
@@ -332,7 +331,7 @@ public:
                    callback(sinkId);
                },
                [&](const Index::Error &error) {
-                    Warning() << "Error in index: " <<  error.message << property;
+                    SinkWarning() << "Error in index: " <<  error.message << property;
                });
            },
            [](const QByteArray &remoteId) -> bool {
@@ -350,7 +349,7 @@ public:
            const auto flags = maildir.readEntryFlags(fileName);
            const auto maildirKey = maildir.getKeyFromFile(fileName);
-            Trace() << "Found a mail " << filePath << " : " << fileName;
+            SinkTrace() << "Found a mail " << filePath << " : " << fileName;
            Sink::ApplicationDomain::Mail mail;
            mail.setProperty("folder", folderLocalId);
@@ -362,12 +361,12 @@ public:
            createOrModify(bufferType, remoteId, mail);
        }
        const auto elapsed = time->elapsed();
-        Log() << "Synchronized " << count << " mails in " << listingPath << Sink::Log::TraceTime(elapsed) << " " << elapsed/qMax(count, 1) << " [ms/mail]";
+        SinkLog() << "Synchronized " << count << " mails in " << listingPath << Sink::Log::TraceTime(elapsed) << " " << elapsed/qMax(count, 1) << " [ms/mail]";
    }
    KAsync::Job<void> synchronizeWithSource() Q_DECL_OVERRIDE
    {
-        Log() << " Synchronizing";
+        SinkLog() << " Synchronizing";
        return KAsync::start<void, KAsync::Job<void> >([this]() {
            KPIM::Maildir maildir(mMaildirPath, true);
            if (!maildir.isValid(false)) {
@@ -381,7 +380,7 @@ public:
                //Don't let the transaction grow too much
                commit();
            }
-            Log() << "Done Synchronizing";
+            SinkLog() << "Done Synchronizing";
            return KAsync::null<void>();
        });
    }
@@ -402,15 +401,15 @@ public:
    {
        if (operation == Sink::Operation_Creation) {
            const auto remoteId = getFilePathFromMimeMessagePath(mail.getMimeMessagePath());
-            Trace() << "Mail created: " << remoteId;
+            SinkTrace() << "Mail created: " << remoteId;
            return KAsync::start<QByteArray>([=]() -> QByteArray {
                return remoteId.toUtf8();
            });
        } else if (operation == Sink::Operation_Removal) {
-            Trace() << "Removing a mail: " << oldRemoteId;
+            SinkTrace() << "Removing a mail: " << oldRemoteId;
            return KAsync::null<QByteArray>();
        } else if (operation == Sink::Operation_Modification) {
-            Trace() << "Modifying a mail: " << oldRemoteId;
+            SinkTrace() << "Modifying a mail: " << oldRemoteId;
            const auto remoteId = getFilePathFromMimeMessagePath(mail.getMimeMessagePath());
            return KAsync::start<QByteArray>([=]() -> QByteArray {
                return remoteId.toUtf8();
@@ -425,7 +424,7 @@ public:
            auto folderName = folder.getName();
            //FIXME handle non toplevel folders
            auto path = mMaildirPath + "/" + folderName;
-            Trace() << "Creating a new folder: " << path;
+            SinkTrace() << "Creating a new folder: " << path;
            KPIM::Maildir maildir(path, false);
            maildir.create();
            return KAsync::start<QByteArray>([=]() -> QByteArray {
@@ -433,12 +432,12 @@ public:
            });
        } else if (operation == Sink::Operation_Removal) {
            const auto path = oldRemoteId;
-            Trace() << "Removing a folder: " << path;
+            SinkTrace() << "Removing a folder: " << path;
            KPIM::Maildir maildir(path, false);
            maildir.remove();
            return KAsync::null<QByteArray>();
        } else if (operation == Sink::Operation_Modification) {
-            Warning() << "Folder modifications are not implemented";
+            SinkWarning() << "Folder modifications are not implemented";
            return KAsync::start<QByteArray>([=]() -> QByteArray {
                return oldRemoteId;
            });
@@ -472,7 +471,7 @@ MaildirResource::MaildirResource(const QByteArray &instanceIdentifier, const QSh
    setupPreprocessors(ENTITY_TYPE_FOLDER, QVector<Sink::Preprocessor*>() << new FolderPreprocessor(mMaildirPath) << new DefaultIndexUpdater<Sink::ApplicationDomain::Folder>);
    KPIM::Maildir dir(mMaildirPath, true);
-    Trace() << "Started maildir resource for maildir: " << mMaildirPath;
+    SinkTrace() << "Started maildir resource for maildir: " << mMaildirPath;
    {
        auto draftsFolder = dir.addSubFolder("Drafts");
        auto remoteId = synchronizer->createFolder(draftsFolder, "folder", QByteArrayList() << "drafts");
@@ -503,7 +502,7 @@ KAsync::Job<void> MaildirResource::inspect(int inspectionType, const QByteArray
    auto entityStore = QSharedPointer<EntityStore>::create(mResourceType, mResourceInstanceIdentifier, transaction);
    auto syncStore = QSharedPointer<RemoteIdMap>::create(synchronizationTransaction);
-    Trace() << "Inspecting " << inspectionType << domainType << entityId << property << expectedValue;
+    SinkTrace() << "Inspecting " << inspectionType << domainType << entityId << property << expectedValue;
    if (domainType == ENTITY_TYPE_MAIL) {
        auto mail = entityStore->read<Sink::ApplicationDomain::Mail>(entityId);
@@ -542,7 +541,7 @@ KAsync::Job<void> MaildirResource::inspect(int inspectionType, const QByteArray
        auto folder = entityStore->read<Sink::ApplicationDomain::Folder>(entityId);
        if (inspectionType == Sink::ResourceControl::Inspection::CacheIntegrityInspectionType) {
-            Trace() << "Inspecting cache integrity" << remoteId;
+            SinkTrace() << "Inspecting cache integrity" << remoteId;
            if (!QDir(remoteId).exists()) {
                return KAsync::error<void>(1, "The directory is not existing: " + remoteId);
            }
@@ -553,14 +552,14 @@ KAsync::Job<void> MaildirResource::inspect(int inspectionType, const QByteArray
                    expectedCount++;
            },
            [&](const Index::Error &error) {
-                Warning() << "Error in index: " <<  error.message << property;
+                SinkWarning() << "Error in index: " <<  error.message << property;
            });
            QDir dir(remoteId + "/cur");
            const QFileInfoList list = dir.entryInfoList(QDir::Files);
            if (list.size() != expectedCount) {
                for (const auto &fileInfo : list) {
-                    Warning() << "Found in cache: " << fileInfo.fileName();
+                    SinkWarning() << "Found in cache: " << fileInfo.fileName();
                }
                return KAsync::error<void>(1, QString("Wrong number of files; found %1 instead of %2.").arg(list.size()).arg(expectedCount));
            }
diff --git a/examples/maildirresource/maildirresource.h b/examples/maildirresource/maildirresource.h
index d481b22..76aef77 100644
--- a/examples/maildirresource/maildirresource.h
+++ b/examples/maildirresource/maildirresource.h
@@ -26,7 +26,7 @@
 #include <flatbuffers/flatbuffers.h>
 //TODO: a little ugly to have this in two places, once here and once in Q_PLUGIN_METADATA
-#define PLUGIN_NAME "org.kde.maildir"
+#define PLUGIN_NAME "sink.maildir"
 class MaildirMailAdaptorFactory;
 class MaildirFolderAdaptorFactory;
@@ -58,7 +58,7 @@ private:
 class MaildirResourceFactory : public Sink::ResourceFactory
 {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.kde.maildir")
+    Q_PLUGIN_METADATA(IID "sink.maildir")
    Q_INTERFACES(Sink::ResourceFactory)
 public:
diff --git a/examples/mailtransportresource/mailtransportresource.cpp b/examples/mailtransportresource/mailtransportresource.cpp
index 1e93bdf..a729d4d 100644
--- a/examples/mailtransportresource/mailtransportresource.cpp
+++ b/examples/mailtransportresource/mailtransportresource.cpp
@@ -44,6 +44,8 @@
 #define ENTITY_TYPE_MAIL "mail"
+SINK_DEBUG_AREA("mailtransportresource")
 using namespace Sink;
 //TODO fold into synchronizer
@@ -58,7 +60,7 @@ public:
    KAsync::Job<QByteArray> replay(const ApplicationDomain::Mail &mail, Sink::Operation operation, const QByteArray &oldRemoteId, const QList<QByteArray> &changedProperties) Q_DECL_OVERRIDE
    {
        if (operation == Sink::Operation_Creation) {
-            Trace() << "Dispatching message.";
+            SinkTrace() << "Dispatching message.";
            // return send(mail, mSettings);
        } else if (operation == Sink::Operation_Removal) {
        } else if (operation == Sink::Operation_Modification) {
@@ -86,9 +88,9 @@ public:
        msg->setHead(KMime::CRLFtoLF(data));
        msg->parse();
        if (settings.testMode) {
-            Log() << "I would totally send that mail, but I'm in test mode." << mail.identifier();
+            SinkLog() << "I would totally send that mail, but I'm in test mode." << mail.identifier();
            auto path = resourceStorageLocation(mResourceInstanceIdentifier) + "/test/";
-            Trace() << path;
+            SinkTrace() << path;
            QDir dir;
            dir.mkpath(path);
            QFile f(path+ mail.identifier());
@@ -97,9 +99,9 @@ public:
            f.close();
        } else {
            if (MailTransport::sendMessage(msg, settings.server.toUtf8(), settings.username.toUtf8(), settings.password.toUtf8(), settings.cacert.toUtf8())) {
-                Log() << "Sent message successfully";
+                SinkLog() << "Sent message successfully";
            } else {
-                Log() << "Failed to send message";
+                SinkLog() << "Failed to send message";
                return KAsync::error<void>(1, "Failed to send the message.");
            }
        }
@@ -108,13 +110,13 @@ public:
    KAsync::Job<void> synchronizeWithSource() Q_DECL_OVERRIDE
    {
-        Log() << " Synchronizing";
+        SinkLog() << " Synchronizing";
        return KAsync::start<void>([this](KAsync::Future<void> future) {
            Sink::Query query;
            QList<ApplicationDomain::Mail> toSend;
-            Log() << " Looking for mail";
+            SinkLog() << " Looking for mail";
            store().reader<ApplicationDomain::Mail>().query(query, [&](const ApplicationDomain::Mail &mail) -> bool {
-                Trace() << "Found mail: " << mail.identifier();
+                SinkTrace() << "Found mail: " << mail.identifier();
                if (!mail.getSent()) {
                    toSend << mail;
                }
diff --git a/examples/mailtransportresource/mailtransportresource.h b/examples/mailtransportresource/mailtransportresource.h
index 6622ea6..cf6abf2 100644
--- a/examples/mailtransportresource/mailtransportresource.h
+++ b/examples/mailtransportresource/mailtransportresource.h
@@ -23,7 +23,7 @@
 #include "common/genericresource.h"
 //TODO: a little ugly to have this in two places, once here and once in Q_PLUGIN_METADATA
-#define PLUGIN_NAME "org.kde.mailtransport"
+#define PLUGIN_NAME "sink.mailtransport"
 class MailtransportResource : public Sink::GenericResource
 {
@@ -46,7 +46,7 @@ private:
 class MailtransportResourceFactory : public Sink::ResourceFactory
 {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.kde.mailtransport")
+    Q_PLUGIN_METADATA(IID "sink.mailtransport")
    Q_INTERFACES(Sink::ResourceFactory)
 public:
diff --git a/examples/mailtransportresource/tests/mailtransporttest.cpp b/examples/mailtransportresource/tests/mailtransporttest.cpp
index 3ce5f82..fdd591b 100644
--- a/examples/mailtransportresource/tests/mailtransporttest.cpp
+++ b/examples/mailtransportresource/tests/mailtransporttest.cpp
@@ -33,7 +33,6 @@ private slots:
    void initTestCase()
    {
        Test::initTest();
-        Log::setDebugOutputLevel(Sink::Log::Trace);
        auto resource = createResource();
        QVERIFY(!resource.identifier().isEmpty());
        VERIFYEXEC(Store::create(resource));
diff --git a/sinksh/CMakeLists.txt b/sinksh/CMakeLists.txt
index e7d3b6e..f0e2f6c 100644
--- a/sinksh/CMakeLists.txt
+++ b/sinksh/CMakeLists.txt
@@ -15,6 +15,7 @@ set(sink_cli_SRCS
    syntax_modules/sink_stat.cpp
    syntax_modules/sink_sync.cpp
    syntax_modules/sink_show.cpp
+    syntax_modules/sink_trace.cpp
    sinksh_utils.cpp
    repl/repl.cpp
    repl/replStates.cpp
diff --git a/sinksh/sinksh_utils.cpp b/sinksh/sinksh_utils.cpp
index 091eb38..0e26c5a 100644
--- a/sinksh/sinksh_utils.cpp
+++ b/sinksh/sinksh_utils.cpp
@@ -21,6 +21,7 @@
 #include "sinksh_utils.h"
 #include "common/store.h"
+#include "common/log.h"
 #include "utils.h"
@@ -88,48 +89,35 @@ QSharedPointer<QAbstractItemModel> loadModel(const QString &type, Sink::Query qu
    return model;
 }
-QStringList resourceIds(State &state)
+QStringList resourceIds()
 {
-    QStringList resources;
    Sink::Query query;
    query.liveQuery = false;
-    auto model = SinkshUtils::loadModel("resource", query);
+    QStringList resources;
+    for (const auto &r : getStore("resource").read(query)) {
-    QObject::connect(model.data(), &QAbstractItemModel::rowsInserted, [model, &resources](const QModelIndex &index, int start, int end) mutable {
+        resources << r.identifier();
-        for (int i = start; i <= end; i++) {
+    }
-            auto object = model->data(model->index(i, 0, index), Sink::Store::DomainObjectBaseRole).value<Sink::ApplicationDomain::ApplicationDomainType::Ptr>();
-            resources << object->identifier();
-        }
-    });
-    QObject::connect(model.data(), &QAbstractItemModel::dataChanged, [model, state](const QModelIndex &, const QModelIndex &, const QVector<int> &roles) {
-        if (roles.contains(Sink::Store::ChildrenFetchedRole)) {
-            state.commandFinished();
-        }
-    });
-    state.commandStarted();
    return resources;
 }
+QStringList debugareaCompleter(const QStringList &, const QString &fragment, State &state)
+{
+    return Utils::filteredCompletions(Sink::Log::debugAreas().toList(), fragment);
+}
 QStringList resourceCompleter(const QStringList &, const QString &fragment, State &state)
 {
-    return Utils::filteredCompletions(resourceIds(state), fragment);
+    return Utils::filteredCompletions(resourceIds(), fragment);
 }
 QStringList resourceOrTypeCompleter(const QStringList &commands, const QString &fragment, State &state)
 {
-    static QStringList types = QStringList() << "resource"
+    static QStringList types = s_types;
-                                             << "folder"
-                                             << "mail"
-                                             << "event"
-                                             << "account";
    if (commands.count() == 1) {
        return Utils::filteredCompletions(s_types, fragment);
    }
-    return Utils::filteredCompletions(resourceIds(state), fragment);
+    return Utils::filteredCompletions(resourceIds(), fragment);
 }
 QStringList typeCompleter(const QStringList &commands, const QString &fragment, State &state)
diff --git a/sinksh/sinksh_utils.h b/sinksh/sinksh_utils.h
index b5b6f3c..0a47661 100644
--- a/sinksh/sinksh_utils.h
+++ b/sinksh/sinksh_utils.h
@@ -40,6 +40,7 @@ QStringList resourceIds();
 QStringList resourceCompleter(const QStringList &, const QString &fragment, State &state);
 QStringList resourceOrTypeCompleter(const QStringList &commands, const QString &fragment, State &state);
 QStringList typeCompleter(const QStringList &commands, const QString &fragment, State &state);
+QStringList debugareaCompleter(const QStringList &, const QString &fragment, State &state);
 QMap<QString, QString> keyValueMapFromArgs(const QStringList &args);
 /**
diff --git a/sinksh/syntax_modules/sink_clear.cpp b/sinksh/syntax_modules/sink_clear.cpp
index 72d9a14..1537ecd 100644
--- a/sinksh/syntax_modules/sink_clear.cpp
+++ b/sinksh/syntax_modules/sink_clear.cpp
@@ -50,7 +50,7 @@ bool clear(const QStringList &args, State &state)
 Syntax::List syntax()
 {
-    Syntax clear("clear", QObject::tr("Clears the local cache of one or more resources (be careful!)"), &SinkClear::clear);
+    Syntax clear("clear", QObject::tr("Clears the local cache of one or more resources (be careful!)"), &SinkClear::clear, Syntax::NotInteractive);
    clear.completer = &SinkshUtils::resourceCompleter;
    return Syntax::List() << clear;
diff --git a/sinksh/syntax_modules/sink_remove.cpp b/sinksh/syntax_modules/sink_remove.cpp
index b374824..d474518 100644
--- a/sinksh/syntax_modules/sink_remove.cpp
+++ b/sinksh/syntax_modules/sink_remove.cpp
@@ -98,7 +98,7 @@ bool resource(const QStringList &args, State &state)
 Syntax::List syntax()
 {
    Syntax remove("remove", QObject::tr("Remove items in a resource"), &SinkRemove::remove);
-    Syntax resource("resource", QObject::tr("Removes a resource"), &SinkRemove::resource);//, Syntax::EventDriven);
+    Syntax resource("resource", QObject::tr("Removes a resource"), &SinkRemove::resource, Syntax::NotInteractive);
    resource.completer = &SinkshUtils::resourceCompleter;
    remove.children << resource;
diff --git a/sinksh/syntax_modules/sink_stat.cpp b/sinksh/syntax_modules/sink_stat.cpp
index 06586d9..9f0fe44 100644
--- a/sinksh/syntax_modules/sink_stat.cpp
+++ b/sinksh/syntax_modules/sink_stat.cpp
@@ -70,30 +70,11 @@ bool statAllResources(State &state)
 {
    Sink::Query query;
    query.liveQuery = false;
-    auto model = SinkshUtils::loadModel("resource", query);
+    QStringList resources;
+    for (const auto &r : SinkshUtils::getStore("resource").read(query)) {
-    //SUUUPER ugly, but can't think of a better way with 2 glasses of wine in me on Christmas day
+        resources << r.identifier();
-    static QStringList resources;
-    resources.clear();
-    QObject::connect(model.data(), &QAbstractItemModel::rowsInserted, [model](const QModelIndex &index, int start, int end) mutable {
-        for (int i = start; i <= end; i++) {
-            auto object = model->data(model->index(i, 0, index), Sink::Store::DomainObjectBaseRole).value<Sink::ApplicationDomain::ApplicationDomainType::Ptr>();
-            resources << object->identifier();
-        }
-    });
-    QObject::connect(model.data(), &QAbstractItemModel::dataChanged, [model, state](const QModelIndex &, const QModelIndex &, const QVector<int> &roles) {
-        if (roles.contains(Sink::Store::ChildrenFetchedRole)) {
-            statResources(resources, state);
-            state.commandFinished();
-        }
-    });
-    if (!model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool()) {
-        return true;
    }
+    statResources(resources, state);
    return false;
 }
@@ -109,7 +90,7 @@ bool stat(const QStringList &args, State &state)
 Syntax::List syntax()
 {
-    Syntax state("stat", QObject::tr("Shows database usage for the resources requested"), &SinkStat::stat, Syntax::EventDriven);
+    Syntax state("stat", QObject::tr("Shows database usage for the resources requested"), &SinkStat::stat, Syntax::NotInteractive);
    state.completer = &SinkshUtils::resourceCompleter;
    return Syntax::List() << state;
diff --git a/sinksh/syntax_modules/sink_sync.cpp b/sinksh/syntax_modules/sink_sync.cpp
index 3006202..208b869 100644
--- a/sinksh/syntax_modules/sink_sync.cpp
+++ b/sinksh/syntax_modules/sink_sync.cpp
@@ -56,7 +56,7 @@ bool sync(const QStringList &args, State &state)
 Syntax::List syntax()
 {
-    Syntax sync("sync", QObject::tr("Syncronizes all resources that are listed; and empty list triggers a syncronizaton on all resources"), &SinkSync::sync, Syntax::EventDriven );
+    Syntax sync("sync", QObject::tr("Syncronizes all resources that are listed; and empty list triggers a syncronizaton on all resources"), &SinkSync::sync, Syntax::EventDriven);
    sync.completer = &SinkshUtils::resourceCompleter;
    return Syntax::List() << sync;
diff --git a/sinksh/syntax_modules/sink_trace.cpp b/sinksh/syntax_modules/sink_trace.cpp
new file mode 100644
index 0000000..8bd52a0
--- /dev/null
+++ b/sinksh/syntax_modules/sink_trace.cpp
@@ -0,0 +1,87 @@
+/*
+ *   Copyright (C) 2016 Christian Mollekopf <chrigi_1@fastmail.fm>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the
+ *   Free Software Foundation, Inc.,
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
+ */
+#include <QDebug>
+#include <QObject> // tr()
+#include <QTimer>
+#include "common/resource.h"
+#include "common/storage.h"
+#include "common/resourceconfig.h"
+#include "common/log.h"
+#include "common/storage.h"
+#include "common/definitions.h"
+#include "sinksh_utils.h"
+#include "state.h"
+#include "syntaxtree.h"
+#include "iostream"
+namespace SinkTrace
+{
+bool traceOff(const QStringList &args, State &state)
+{
+    Sink::Log::setDebugOutputLevel(Sink::Log::Log);
+    std::cout << "Turned trace off." << std::endl;
+    return true;
+}
+bool traceOn(const QStringList &args, State &state)
+{
+    Sink::Log::setDebugOutputLevel(Sink::Log::Trace);
+    if (args.isEmpty() || (args.size() == 1 && args.first() == "*")) {
+        Sink::Log::setDebugOutputFilter(Sink::Log::Area, QByteArrayList());
+        std::cout << "Set trace filter to: *" << std::endl;
+    } else {
+        QByteArrayList filter;
+        for (const auto &arg : args) {
+            filter << arg.toLatin1();
+        }
+        Sink::Log::setDebugOutputFilter(Sink::Log::Area, filter);
+        std::cout << "Set trace filter to: " << filter.join(", ").toStdString() << std::endl;
+    }
+    return true;
+}
+bool trace(const QStringList &args, State &state)
+{
+    return traceOn(args, state);
+}
+Syntax::List syntax()
+{
+    Syntax trace("trace", QObject::tr("Control trace debug output."), &SinkTrace::trace, Syntax::NotInteractive);
+    trace.completer = &SinkshUtils::debugareaCompleter; 
+    Syntax traceOff("off", QObject::tr("Turns off trace output."), &SinkTrace::traceOff, Syntax::NotInteractive);
+    traceOff.completer = &SinkshUtils::debugareaCompleter; 
+    trace.children << traceOff;
+    Syntax traceOn("on", QObject::tr("Turns on trace output."), &SinkTrace::traceOn, Syntax::NotInteractive);
+    traceOn.completer = &SinkshUtils::debugareaCompleter; 
+    trace.children << traceOn;
+    return Syntax::List() << trace;
+}
+REGISTER_SYNTAX(SinkTrace)
+}
diff --git a/synchronizer/main.cpp b/synchronizer/main.cpp
index 3168bfc..e9dd6cb 100644
--- a/synchronizer/main.cpp
+++ b/synchronizer/main.cpp
@@ -34,8 +34,7 @@
 #include "log.h"
 #include "test.h"
-#undef DEBUG_AREA
+SINK_DEBUG_AREA("main")
-#define DEBUG_AREA "resource"
 static Listener *listener = nullptr;
@@ -149,25 +148,26 @@ int main(int argc, char *argv[])
        arguments << argv[i];
    }
    if (arguments.contains("--test")) {
-        Log() << "Running in test-mode";
+        SinkLog() << "Running in test-mode";
        arguments.removeAll("--test");
        Sink::Test::setTestModeEnabled(true);
    }
    if (arguments.count() < 3) {
-        Warning() << "Not enough args passed, no resource loaded.";
+        SinkWarning() << "Not enough args passed, no resource loaded.";
        return app.exec();
    }
    const QByteArray instanceIdentifier = arguments.at(1);
    const QByteArray resourceType = arguments.at(2);
    app.setApplicationName(instanceIdentifier);
-    Log() << "Starting: " << instanceIdentifier;
+    Sink::Log::setPrimaryComponent(instanceIdentifier);
+    SinkLog() << "Starting: " << instanceIdentifier;
    QLockFile lockfile(instanceIdentifier + ".lock");
    lockfile.setStaleLockTime(500);
    if (!lockfile.tryLock(0)) {
-        Warning() << "Failed to acquire exclusive lock on socket.";
+        SinkWarning() << "Failed to acquire exclusive lock on socket.";
        return -1;
    }
@@ -177,6 +177,6 @@ int main(int argc, char *argv[])
    QObject::connect(listener, &Listener::noClients, &app, &QCoreApplication::quit);
    auto ret = app.exec();
-    Log() << "Exiting: " << instanceIdentifier;
+    SinkLog() << "Exiting: " << instanceIdentifier;
    return ret;
 }
diff --git a/tests/accountstest.cpp b/tests/accountstest.cpp
index be5e1a0..4be8bd6 100644
--- a/tests/accountstest.cpp
+++ b/tests/accountstest.cpp
@@ -8,6 +8,7 @@
 #include <store.h>
 #include <log.h>
 #include <configstore.h>
+#include "testutils.h"
 class AccountsTest : public QObject
 {
@@ -17,7 +18,6 @@ private slots:
    void initTestCase()
    {
        Sink::Test::initTest();
-        Sink::Log::setDebugOutputLevel(Sink::Log::Trace);
    }
    void init()
@@ -52,7 +52,7 @@ private slots:
        QString smtpUsername("smtpUsername");
        QString smtpPassword("smtpPassword");
        auto resource = ApplicationDomainType::createEntity<SinkResource>();
-        resource.setProperty("type", "org.kde.mailtransport");
+        resource.setProperty("type", "sink.mailtransport");
        resource.setProperty("account", account.identifier());
        resource.setProperty("server", smtpServer);
        resource.setProperty("username", smtpUsername);
@@ -63,7 +63,7 @@ private slots:
        Store::fetchAll<SinkResource>(Query()).then<void, QList<SinkResource::Ptr>>([&](const QList<SinkResource::Ptr> &resources) {
            QCOMPARE(resources.size(), 1);
            auto resource = resources.first();
-            QCOMPARE(resource->getProperty("type").toString(), QString("org.kde.mailtransport"));
+            QCOMPARE(resource->getProperty("type").toString(), QString("sink.mailtransport"));
            QCOMPARE(resource->getProperty("server").toString(), smtpServer);
        })
        .exec().waitForFinished();
@@ -94,8 +94,8 @@ private slots:
        using namespace Sink::ApplicationDomain;
        auto account = ApplicationDomainType::createEntity<SinkAccount>();
-        account.setProperty("type", "maildir");
+        account.setAccountType("maildir");
-        account.setProperty("name", "name");
+        account.setName("name");
        Store::create(account).exec().waitForFinished();
        Query query;
@@ -104,18 +104,47 @@ private slots:
        QTRY_COMPARE(model->rowCount(QModelIndex()), 1);
        auto account2 = ApplicationDomainType::createEntity<SinkAccount>();
-        account2.setProperty("type", "maildir");
+        account2.setAccountType("maildir");
-        account2.setProperty("name", "name");
+        account2.setName("name");
        Store::create(account2).exec().waitForFinished();
        QTRY_COMPARE(model->rowCount(QModelIndex()), 2);
        //Ensure the notifier only affects one type
        auto resource = ApplicationDomainType::createEntity<SinkResource>();
-        resource.setProperty("type", "org.kde.mailtransport");
+        resource.setResourceType("sink.mailtransport");
        Store::create(resource).exec().waitForFinished();
        QTRY_COMPARE(model->rowCount(QModelIndex()), 2);
    }
+    void testLoadAccountStatus()
+    {
+        using namespace Sink;
+        using namespace Sink::ApplicationDomain;
+        auto account = ApplicationDomainType::createEntity<SinkAccount>();
+        account.setAccountType("dummy");
+        account.setName("name");
+        VERIFYEXEC(Store::create(account));
+        auto res = Sink::ApplicationDomain::DummyResource::create(account.identifier());
+        VERIFYEXEC(Sink::Store::create(res));
+        {
+            Sink::Query query;
+            query.liveQuery = true;
+            query.request<Sink::ApplicationDomain::SinkAccount::Status>();
+            auto model = Sink::Store::loadModel<Sink::ApplicationDomain::SinkAccount>(query);
+            QTRY_COMPARE(model->rowCount(QModelIndex()), 1);
+            auto account = model->data(model->index(0, 0, QModelIndex()), Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::SinkAccount::Ptr>();
+            QCOMPARE(account->getStatus(), static_cast<int>(Sink::ApplicationDomain::OfflineStatus));
+            //Synchronize to connect
+            VERIFYEXEC(Sink::Store::synchronize(Query::ResourceFilter(res)));
+            QTRY_COMPARE_WITH_TIMEOUT(model->data(model->index(0, 0, QModelIndex()), Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::SinkAccount::Ptr>()->getStatus(), static_cast<int>(Sink::ApplicationDomain::ConnectedStatus), 1000);
+        }
+    }
 };
 QTEST_GUILESS_MAIN(AccountsTest)
diff --git a/tests/clientapitest.cpp b/tests/clientapitest.cpp
index 8c5866d..ed5a9b5 100644
--- a/tests/clientapitest.cpp
+++ b/tests/clientapitest.cpp
@@ -9,6 +9,8 @@
 #include "resultprovider.h"
 #include "facadefactory.h"
+SINK_DEBUG_AREA("clientapitest")
 template <typename T>
 class TestDummyResourceFacade : public Sink::StoreFacade<T>
 {
@@ -44,7 +46,7 @@ public:
    {
        auto resultProvider = new Sink::ResultProvider<typename T::Ptr>();
        resultProvider->onDone([resultProvider]() {
-            Trace() << "Result provider is done";
+            SinkTrace() << "Result provider is done";
            delete resultProvider;
        });
        // We have to do it this way, otherwise we're not setting the fetcher right
@@ -52,11 +54,11 @@ public:
        resultProvider->setFetcher([query, resultProvider, this](const typename T::Ptr &parent) {
            if (parent) {
-                Trace() << "Running the fetcher " << parent->identifier();
+                SinkTrace() << "Running the fetcher " << parent->identifier();
            } else {
-                Trace() << "Running the fetcher.";
+                SinkTrace() << "Running the fetcher.";
            }
-            Trace() << "-------------------------.";
+            SinkTrace() << "-------------------------.";
            for (const auto &res : results) {
                qDebug() << "Parent filter " << query.propertyFilter.value("parent").value.toByteArray() << res->identifier() << res->getProperty("parent").toByteArray();
                auto parentProperty = res->getProperty("parent").toByteArray();
@@ -91,7 +93,6 @@ private slots:
    {
        Sink::FacadeFactory::instance().resetFactory();
        ResourceConfig::clear();
-        Sink::Log::setDebugOutputLevel(Sink::Log::Trace);
    }
    void testLoad()
diff --git a/tests/dummyresourcebenchmark.cpp b/tests/dummyresourcebenchmark.cpp
index d5f98c3..72562c3 100644
--- a/tests/dummyresourcebenchmark.cpp
+++ b/tests/dummyresourcebenchmark.cpp
@@ -34,9 +34,9 @@ private slots:
    void initTestCase()
    {
        Sink::Log::setDebugOutputLevel(Sink::Log::Warning);
-        auto factory = Sink::ResourceFactory::load("org.kde.dummy");
+        auto factory = Sink::ResourceFactory::load("sink.dummy");
        QVERIFY(factory);
-        ResourceConfig::addResource("org.kde.dummy.instance1", "org.kde.dummy");
+        ResourceConfig::addResource("sink.dummy.instance1", "sink.dummy");
        num = 5000;
    }
@@ -76,21 +76,21 @@ private slots:
    void testCommandResponsiveness()
    {
        // Test responsiveness including starting the process.
-        Sink::Store::removeDataFromDisk("org.kde.dummy.instance1").exec().waitForFinished();
+        Sink::Store::removeDataFromDisk("sink.dummy.instance1").exec().waitForFinished();
        QTime time;
        time.start();
-        Sink::ApplicationDomain::Event event("org.kde.dummy.instance1");
+        Sink::ApplicationDomain::Event event("sink.dummy.instance1");
        event.setProperty("uid", "testuid");
        QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid"));
        event.setProperty("summary", "summaryValue");
-        auto notifier = QSharedPointer<Sink::Notifier>::create("org.kde.dummy.instance1", "org.kde.dummy");
+        auto notifier = QSharedPointer<Sink::Notifier>::create("sink.dummy.instance1", "sink.dummy");
        bool gotNotification = false;
        int duration = 0;
        notifier->registerHandler([&gotNotification, &duration, &time](const Sink::Notification &notification) {
-            if (notification.type == Sink::Commands::NotificationType::NotificationType_RevisionUpdate) {
+            if (notification.type == Sink::Notification::RevisionUpdate) {
                gotNotification = true;
                duration = time.elapsed();
            }
@@ -102,19 +102,19 @@ private slots:
        QTRY_VERIFY(gotNotification);
        QVERIFY2(duration < 100, QString::fromLatin1("Processing a create command took more than 100ms: %1").arg(duration).toLatin1());
-        Sink::ResourceControl::shutdown("org.kde.dummy.instance1").exec().waitForFinished();
+        Sink::ResourceControl::shutdown("sink.dummy.instance1").exec().waitForFinished();
        qDebug() << "Single command took [ms]: " << duration;
    }
    void testWriteToFacade()
    {
-        Sink::Store::removeDataFromDisk("org.kde.dummy.instance1").exec().waitForFinished();
+        Sink::Store::removeDataFromDisk("sink.dummy.instance1").exec().waitForFinished();
        QTime time;
        time.start();
        QList<KAsync::Future<void>> waitCondition;
        for (int i = 0; i < num; i++) {
-            Sink::ApplicationDomain::Event event("org.kde.dummy.instance1");
+            Sink::ApplicationDomain::Event event("sink.dummy.instance1");
            event.setProperty("uid", "testuid");
            QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid"));
            event.setProperty("summary", "summaryValue");
@@ -126,7 +126,7 @@ private slots:
        // Ensure everything is processed
        {
            Sink::Query query;
-            query.resources << "org.kde.dummy.instance1";
+            query.resources << "sink.dummy.instance1";
            Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
        }
        auto allProcessedTime = time.elapsed();
@@ -140,7 +140,7 @@ private slots:
        dataset.insertRow(row);
        HAWD::Formatter::print(dataset);
-        auto diskUsage = DummyResource::diskUsage("org.kde.dummy.instance1");
+        auto diskUsage = DummyResource::diskUsage("sink.dummy.instance1");
        qDebug() << "Database size [kb]: " << diskUsage / 1024;
        // Print memory layout, RSS is what is in memory
@@ -155,7 +155,7 @@ private slots:
        {
            time.start();
            Sink::Query query;
-            query.resources << "org.kde.dummy.instance1";
+            query.resources << "sink.dummy.instance1";
            query.propertyFilter.insert("uid", Sink::Query::Comparator("testuid"));
            auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Event>(query);
@@ -173,12 +173,12 @@ private slots:
    void testWriteInProcess()
    {
-        Sink::Store::removeDataFromDisk("org.kde.dummy.instance1").exec().waitForFinished();
+        Sink::Store::removeDataFromDisk("sink.dummy.instance1").exec().waitForFinished();
        QTime time;
        time.start();
-        auto pipeline = QSharedPointer<Sink::Pipeline>::create("org.kde.dummy.instance1");
+        auto pipeline = QSharedPointer<Sink::Pipeline>::create("sink.dummy.instance1");
-        DummyResource resource("org.kde.dummy.instance1", pipeline);
+        DummyResource resource("sink.dummy.instance1", pipeline);
        flatbuffers::FlatBufferBuilder eventFbb;
        eventFbb.Clear();
@@ -261,7 +261,7 @@ private slots:
    // This allows to run individual parts without doing a cleanup, but still cleaning up normally
    void testCleanupForCompleteTest()
    {
-        Sink::Store::removeDataFromDisk("org.kde.dummy.instance1").exec().waitForFinished();
+        Sink::Store::removeDataFromDisk("sink.dummy.instance1").exec().waitForFinished();
    }
 private:
diff --git a/tests/dummyresourcetest.cpp b/tests/dummyresourcetest.cpp
index d41f235..687a33b 100644
--- a/tests/dummyresourcetest.cpp
+++ b/tests/dummyresourcetest.cpp
@@ -30,11 +30,10 @@ private slots:
    void initTestCase()
    {
        Sink::Test::initTest();
-        Sink::Log::setDebugOutputLevel(Sink::Log::Trace);
+        auto factory = Sink::ResourceFactory::load("sink.dummy");
-        auto factory = Sink::ResourceFactory::load("org.kde.dummy");
        QVERIFY(factory);
-        DummyResource::removeFromDisk("org.kde.dummy.instance1");
+        DummyResource::removeFromDisk("sink.dummy.instance1");
-        ResourceConfig::addResource("org.kde.dummy.instance1", "org.kde.dummy");
+        ResourceConfig::addResource("sink.dummy.instance1", "sink.dummy");
    }
    void init()
@@ -48,7 +47,7 @@ private slots:
    void cleanup()
    {
        qDebug() << "Test took " << time.elapsed();
-        Sink::Store::removeDataFromDisk(QByteArray("org.kde.dummy.instance1")).exec().waitForFinished();
+        Sink::Store::removeDataFromDisk(QByteArray("sink.dummy.instance1")).exec().waitForFinished();
    }
    void testProperty()
@@ -60,13 +59,13 @@ private slots:
    void testWriteToFacadeAndQueryByUid()
    {
-        Sink::ApplicationDomain::Event event("org.kde.dummy.instance1");
+        Sink::ApplicationDomain::Event event("sink.dummy.instance1");
        event.setProperty("uid", "testuid");
        QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid"));
        event.setProperty("summary", "summaryValue");
        Sink::Store::create<Sink::ApplicationDomain::Event>(event).exec().waitForFinished();
-        const auto query = Query::ResourceFilter("org.kde.dummy.instance1") ;
+        const auto query = Query::ResourceFilter("sink.dummy.instance1") ;
        // Ensure all local data is processed
        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
@@ -79,7 +78,7 @@ private slots:
    void testWriteToFacadeAndQueryByUid2()
    {
-        Sink::ApplicationDomain::Event event("org.kde.dummy.instance1");
+        Sink::ApplicationDomain::Event event("sink.dummy.instance1");
        event.setProperty("summary", "summaryValue");
        event.setProperty("uid", "testuid");
@@ -88,7 +87,7 @@ private slots:
        event.setProperty("uid", "testuid2");
        Sink::Store::create<Sink::ApplicationDomain::Event>(event).exec().waitForFinished();
-        const auto query = Query::ResourceFilter("org.kde.dummy.instance1") ;
+        const auto query = Query::ResourceFilter("sink.dummy.instance1") ;
        // Ensure all local data is processed
        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
@@ -103,7 +102,7 @@ private slots:
    void testWriteToFacadeAndQueryBySummary()
    {
-        Sink::ApplicationDomain::Event event("org.kde.dummy.instance1");
+        Sink::ApplicationDomain::Event event("sink.dummy.instance1");
        event.setProperty("uid", "testuid");
        event.setProperty("summary", "summaryValue1");
@@ -113,7 +112,7 @@ private slots:
        event.setProperty("summary", "summaryValue2");
        Sink::Store::create<Sink::ApplicationDomain::Event>(event).exec().waitForFinished();
-        const auto query = Query::ResourceFilter("org.kde.dummy.instance1") ;
+        const auto query = Query::ResourceFilter("sink.dummy.instance1") ;
        // Ensure all local data is processed
        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
@@ -128,8 +127,8 @@ private slots:
    void testResourceSync()
    {
-        auto pipeline = QSharedPointer<Sink::Pipeline>::create("org.kde.dummy.instance1");
+        auto pipeline = QSharedPointer<Sink::Pipeline>::create("sink.dummy.instance1");
-        DummyResource resource("org.kde.dummy.instance1", pipeline);
+        DummyResource resource("sink.dummy.instance1", pipeline);
        auto job = resource.synchronizeWithSource();
        // TODO pass in optional timeout?
        auto future = job.exec();
@@ -143,7 +142,7 @@ private slots:
    void testSyncAndFacade()
    {
-        const auto query = Query::ResourceFilter("org.kde.dummy.instance1");
+        const auto query = Query::ResourceFilter("sink.dummy.instance1");
        // Ensure all local data is processed
        Sink::Store::synchronize(query).exec().waitForFinished();
@@ -159,7 +158,7 @@ private slots:
    void testSyncAndFacadeMail()
    {
-        const auto query = Query::ResourceFilter("org.kde.dummy.instance1");
+        const auto query = Query::ResourceFilter("sink.dummy.instance1");
        // Ensure all local data is processed
        Sink::Store::synchronize(query).exec().waitForFinished();
@@ -175,13 +174,13 @@ private slots:
    void testWriteModifyDelete()
    {
-        Sink::ApplicationDomain::Event event("org.kde.dummy.instance1");
+        Sink::ApplicationDomain::Event event("sink.dummy.instance1");
        event.setProperty("uid", "testuid");
        QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid"));
        event.setProperty("summary", "summaryValue");
        Sink::Store::create<Sink::ApplicationDomain::Event>(event).exec().waitForFinished();
-        const auto query = Query::ResourceFilter("org.kde.dummy.instance1") + Query::PropertyFilter("uid", "testuid");
+        const auto query = Query::ResourceFilter("sink.dummy.instance1") + Query::PropertyFilter("uid", "testuid");
        // Ensure all local data is processed
        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
@@ -230,14 +229,14 @@ private slots:
    void testWriteModifyDeleteLive()
    {
-        auto query = Query::ResourceFilter("org.kde.dummy.instance1");
+        auto query = Query::ResourceFilter("sink.dummy.instance1");
        query.liveQuery = true;
        query += Query::PropertyFilter("uid", "testuid");
        auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Event>(query);
        QTRY_VERIFY(model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
-        Sink::ApplicationDomain::Event event("org.kde.dummy.instance1");
+        Sink::ApplicationDomain::Event event("sink.dummy.instance1");
        event.setProperty("uid", "testuid");
        QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid"));
        event.setProperty("summary", "summaryValue");
diff --git a/tests/dummyresourcewritebenchmark.cpp b/tests/dummyresourcewritebenchmark.cpp
index b4ab438..5cd7007 100644
--- a/tests/dummyresourcewritebenchmark.cpp
+++ b/tests/dummyresourcewritebenchmark.cpp
@@ -103,14 +103,14 @@ class DummyResourceWriteBenchmark : public QObject
    void writeInProcess(int num)
    {
-        DummyResource::removeFromDisk("org.kde.dummy.instance1");
+        DummyResource::removeFromDisk("sink.dummy.instance1");
        QTime time;
        time.start();
-        auto pipeline = QSharedPointer<Sink::Pipeline>::create("org.kde.dummy.instance1");
+        auto pipeline = QSharedPointer<Sink::Pipeline>::create("sink.dummy.instance1");
-        DummyResource resource("org.kde.dummy.instance1", pipeline);
+        DummyResource resource("sink.dummy.instance1", pipeline);
        int bufferSize = 0;
        auto command = createEntityBuffer(bufferSize);
@@ -131,7 +131,7 @@ class DummyResourceWriteBenchmark : public QObject
        const auto finalRss = getCurrentRSS();
        const auto rssGrowth = finalRss - startingRss;
        // Since the database is memory mapped it is attributted to the resident set size.
-        const auto rssWithoutDb = finalRss - DummyResource::diskUsage("org.kde.dummy.instance1");
+        const auto rssWithoutDb = finalRss - DummyResource::diskUsage("sink.dummy.instance1");
        const auto peakRss = getPeakRSS();
        // How much peak deviates from final rss in percent
        const auto percentageRssError = static_cast<double>(peakRss - finalRss) * 100.0 / static_cast<double>(finalRss);
@@ -143,7 +143,7 @@ class DummyResourceWriteBenchmark : public QObject
        std::cout << "Rss without db [kb]: " << rssWithoutDb / 1024 << std::endl;
        std::cout << "Percentage peak rss error: " << percentageRssError << std::endl;
-        auto onDisk = DummyResource::diskUsage("org.kde.dummy.instance1");
+        auto onDisk = DummyResource::diskUsage("sink.dummy.instance1");
        auto writeAmplification = static_cast<double>(onDisk) / static_cast<double>(bufferSizeTotal);
        std::cout << "On disk [kb]: " << onDisk / 1024 << std::endl;
        std::cout << "Buffer size total [kb]: " << bufferSizeTotal / 1024 << std::endl;
@@ -216,13 +216,13 @@ private slots:
    void getFreePages()
    {
-        std::system(QString("mdb_stat %1/%2 -ff").arg(Sink::storageLocation()).arg("org.kde.dummy.instance1").toLatin1().constData());
+        std::system(QString("mdb_stat %1/%2 -ff").arg(Sink::storageLocation()).arg("sink.dummy.instance1").toLatin1().constData());
    }
    // This allows to run individual parts without doing a cleanup, but still cleaning up normally
    void testCleanupForCompleteTest()
    {
-        DummyResource::removeFromDisk("org.kde.dummy.instance1");
+        DummyResource::removeFromDisk("sink.dummy.instance1");
    }
 private:
diff --git a/tests/genericfacadetest.cpp b/tests/genericfacadetest.cpp
index 8336875..0267dac 100644
--- a/tests/genericfacadetest.cpp
+++ b/tests/genericfacadetest.cpp
@@ -8,6 +8,7 @@
 #include <common/domainadaptor.h>
 #include <common/resultprovider.h>
 #include <common/synclistresult.h>
+#include <common/test.h>
 // Replace with something different
 #include "event_generated.h"
@@ -23,10 +24,9 @@ class GenericFacadeTest : public QObject
 {
    Q_OBJECT
 private slots:
+    void initTestCase()
-    void init()
    {
-        Sink::Log::setDebugOutputLevel(Sink::Log::Trace);
+        Sink::Test::initTest();
    }
    void testLoad()
diff --git a/tests/genericresourcebenchmark.cpp b/tests/genericresourcebenchmark.cpp
index a0a368c..2315d0b 100644
--- a/tests/genericresourcebenchmark.cpp
+++ b/tests/genericresourcebenchmark.cpp
@@ -96,9 +96,9 @@ private slots:
    void initTestCase()
    {
-        removeFromDisk("org.kde.test.instance1");
+        removeFromDisk("sink.test.instance1");
-        removeFromDisk("org.kde.test.instance1.userqueue");
+        removeFromDisk("sink.test.instance1.userqueue");
-        removeFromDisk("org.kde.test.instance1.synchronizerqueue");
+        removeFromDisk("sink.test.instance1.synchronizerqueue");
    }
@@ -106,8 +106,8 @@ private slots:
    {
        int num = 10000;
-        auto pipeline = QSharedPointer<Sink::Pipeline>::create("org.kde.test.instance1");
+        auto pipeline = QSharedPointer<Sink::Pipeline>::create("sink.test.instance1");
-        TestResource resource("org.kde.test.instance1", pipeline);
+        TestResource resource("sink.test.instance1", pipeline);
        auto command = createEntityBuffer();
@@ -141,16 +141,16 @@ private slots:
    {
        int num = 50000;
-        auto pipeline = QSharedPointer<Sink::Pipeline>::create("org.kde.test.instance1");
+        auto pipeline = QSharedPointer<Sink::Pipeline>::create("sink.test.instance1");
        auto eventFactory = QSharedPointer<TestEventAdaptorFactory>::create();
-        const QByteArray resourceIdentifier = "org.kde.test.instance1";
+        const QByteArray resourceIdentifier = "sink.test.instance1";
        auto indexer = QSharedPointer<IndexUpdater>::create();
        pipeline->setPreprocessors("event", QVector<Sink::Preprocessor *>() << indexer.data());
        pipeline->setAdaptorFactory("event", eventFactory);
-        TestResource resource("org.kde.test.instance1", pipeline);
+        TestResource resource("sink.test.instance1", pipeline);
        auto command = createEntityBuffer();
diff --git a/tests/genericresourcetest.cpp b/tests/genericresourcetest.cpp
index 7474cbf..77a901d 100644
--- a/tests/genericresourcetest.cpp
+++ b/tests/genericresourcetest.cpp
@@ -26,8 +26,7 @@ private slots:
    void init()
    {
-        Sink::GenericResource::removeFromDisk("org.kde.test.instance1");
+        Sink::GenericResource::removeFromDisk("sink.test.instance1");
-        Sink::Log::setDebugOutputLevel(Sink::Log::Trace);
    }
    /// Ensure the resource can process messages
@@ -71,10 +70,10 @@ private slots:
        }
        // Actual test
-        auto pipeline = QSharedPointer<Sink::Pipeline>::create("org.kde.test.instance1");
+        auto pipeline = QSharedPointer<Sink::Pipeline>::create("sink.test.instance1");
        QSignalSpy revisionSpy(pipeline.data(), SIGNAL(revisionUpdated(qint64)));
        QVERIFY(revisionSpy.isValid());
-        TestResource resource("org.kde.test.instance1", pipeline);
+        TestResource resource("sink.test.instance1", pipeline);
        resource.processCommand(Sink::Commands::CreateEntityCommand, command);
        resource.processCommand(Sink::Commands::CreateEntityCommand, command);
        resource.processAllMessages().exec().waitForFinished();
diff --git a/tests/indextest.cpp b/tests/indextest.cpp
index fa3ace4..8566803 100644
--- a/tests/indextest.cpp
+++ b/tests/indextest.cpp
@@ -16,19 +16,19 @@ class IndexTest : public QObject
 private slots:
    void initTestCase()
    {
-        Sink::Storage store("./testindex", "org.kde.dummy.testindex", Sink::Storage::ReadWrite);
+        Sink::Storage store("./testindex", "sink.dummy.testindex", Sink::Storage::ReadWrite);
        store.removeFromDisk();
    }
    void cleanup()
    {
-        Sink::Storage store("./testindex", "org.kde.dummy.testindex", Sink::Storage::ReadWrite);
+        Sink::Storage store("./testindex", "sink.dummy.testindex", Sink::Storage::ReadWrite);
        store.removeFromDisk();
    }
    void testIndex()
    {
-        Index index("./testindex", "org.kde.dummy.testindex", Sink::Storage::ReadWrite);
+        Index index("./testindex", "sink.dummy.testindex", Sink::Storage::ReadWrite);
        // The first key is specifically a substring of the second key
        index.add("key", "value1");
        index.add("keyFoo", "value2");
diff --git a/tests/inspectiontest.cpp b/tests/inspectiontest.cpp
index 38bf23d..3e8a103 100644
--- a/tests/inspectiontest.cpp
+++ b/tests/inspectiontest.cpp
@@ -19,11 +19,10 @@ class InspectionTest : public QObject
 private slots:
    void initTestCase()
    {
-        Sink::Log::setDebugOutputLevel(Sink::Log::Trace);
+        auto factory = Sink::ResourceFactory::load("sink.dummy");
-        auto factory = Sink::ResourceFactory::load("org.kde.dummy");
        QVERIFY(factory);
-        ResourceConfig::addResource("org.kde.dummy.instance1", "org.kde.dummy");
+        ResourceConfig::addResource("sink.dummy.instance1", "sink.dummy");
-        Sink::Store::removeDataFromDisk(QByteArray("org.kde.dummy.instance1")).exec().waitForFinished();
+        Sink::Store::removeDataFromDisk(QByteArray("sink.dummy.instance1")).exec().waitForFinished();
    }
    void testInspection_data()
@@ -39,7 +38,7 @@ private slots:
        using namespace Sink;
        using namespace Sink::ApplicationDomain;
-        Mail mail(QByteArray("org.kde.dummy.instance1"), QByteArray("identifier"), 0, QSharedPointer<MemoryBufferAdaptor::MemoryBufferAdaptor>::create());
+        Mail mail(QByteArray("sink.dummy.instance1"), QByteArray("identifier"), 0, QSharedPointer<MemoryBufferAdaptor::MemoryBufferAdaptor>::create());
        // testInspection is a magic property that the dummyresource supports
        auto inspectionCommand = ResourceControl::Inspection::PropertyInspection(mail, "testInspection", success);
diff --git a/tests/maildirsyncbenchmark.cpp b/tests/maildirsyncbenchmark.cpp
index 06c5ab1..d84c758 100644
--- a/tests/maildirsyncbenchmark.cpp
+++ b/tests/maildirsyncbenchmark.cpp
@@ -61,18 +61,17 @@ private slots:
    {
        targetPath = tempDir.path() + "/maildir1";
-        Sink::Log::setDebugOutputLevel(Sink::Log::Log);
+        MaildirResource::removeFromDisk("sink.maildir.test1");
-        MaildirResource::removeFromDisk("org.kde.maildir.test1");
        Sink::ApplicationDomain::SinkResource resource;
-        resource.setProperty("identifier", "org.kde.maildir.test1");
+        resource.setProperty("identifier", "sink.maildir.test1");
-        resource.setProperty("type", "org.kde.maildir");
+        resource.setProperty("type", "sink.maildir");
        resource.setProperty("path", targetPath);
        Sink::Store::create(resource).exec().waitForFinished();
    }
    void cleanup()
    {
-        MaildirResource::removeFromDisk("org.kde.maildir.test1");
+        MaildirResource::removeFromDisk("sink.maildir.test1");
        QDir dir(targetPath);
        dir.removeRecursively();
    }
@@ -84,8 +83,8 @@ private slots:
    void testbench()
    {
-        auto pipeline = QSharedPointer<Sink::Pipeline>::create("org.kde.maildir.test1");
+        auto pipeline = QSharedPointer<Sink::Pipeline>::create("sink.maildir.test1");
-        MaildirResource resource("org.kde.maildir.test1", pipeline);
+        MaildirResource resource("sink.maildir.test1", pipeline);
        QTime time;
        time.start();
        resource.Sink::GenericResource::synchronizeWithSource().exec().waitForFinished();
diff --git a/tests/mailquerybenchmark.cpp b/tests/mailquerybenchmark.cpp
index 4e58899..450955f 100644
--- a/tests/mailquerybenchmark.cpp
+++ b/tests/mailquerybenchmark.cpp
@@ -148,7 +148,7 @@ private slots:
    void init()
    {
-        resourceIdentifier = "org.kde.test.instance1";
+        resourceIdentifier = "sink.test.instance1";
        Sink::AdaptorFactoryRegistry::instance().registerFactory<Sink::ApplicationDomain::Mail, TestMailAdaptorFactory>("test");
    }
diff --git a/tests/mailsynctest.cpp b/tests/mailsynctest.cpp
index e70e34e..4b797c8 100644
--- a/tests/mailsynctest.cpp
+++ b/tests/mailsynctest.cpp
@@ -31,10 +31,12 @@
 using namespace Sink;
 using namespace Sink::ApplicationDomain;
+SINK_DEBUG_AREA("mailsynctest")
 void MailSyncTest::initTestCase()
 {
    Test::initTest();
-    Log::setDebugOutputLevel(Sink::Log::Trace);
+    QVERIFY(isBackendAvailable());
    resetTestEnvironment();
    auto resource = createResource();
    QVERIFY(!resource.identifier().isEmpty());
@@ -72,7 +74,7 @@ void MailSyncTest::testListFolders()
                for (const auto &folder : folders) {
                    names << folder->getName();
                }
-                Trace() << "base folder: " << names;
+                SinkTrace() << "base folder: " << names;
                baseCount = folders.size();
            });
        VERIFYEXEC(job);
@@ -196,6 +198,10 @@ void MailSyncTest::testListFolderHierarchy()
            QVERIFY(names.contains("Drafts"));
            names.removeAll("Drafts");
        }
+        if (mCapabilities.contains(ResourceCapabilities::Mail::trash)) {
+            QVERIFY(names.contains("Trash"));
+            names.removeAll("Trash");
+        }
        QCOMPARE(names.size(), 3);
        QCOMPARE(map.value("sub")->getParent(), map.value("test")->identifier());
    });
diff --git a/tests/mailsynctest.h b/tests/mailsynctest.h
index a21335b..31d3f03 100644
--- a/tests/mailsynctest.h
+++ b/tests/mailsynctest.h
@@ -41,6 +41,7 @@ protected:
    QByteArray mResourceInstanceIdentifier;
    QByteArrayList mCapabilities;
+    virtual bool isBackendAvailable() { return true; }
    virtual void resetTestEnvironment() = 0;
    virtual Sink::ApplicationDomain::SinkResource createResource() = 0;
    virtual Sink::ApplicationDomain::SinkResource createFaultyResource() = 0;
diff --git a/tests/mailtest.cpp b/tests/mailtest.cpp
index b9d496d..2547536 100644
--- a/tests/mailtest.cpp
+++ b/tests/mailtest.cpp
@@ -31,10 +31,12 @@
 using namespace Sink;
 using namespace Sink::ApplicationDomain;
+SINK_DEBUG_AREA("mailtest")
 void MailTest::initTestCase()
 {
    Test::initTest();
-    Log::setDebugOutputLevel(Sink::Log::Trace);
+    QVERIFY(isBackendAvailable());
    resetTestEnvironment();
    auto resource = createResource();
    QVERIFY(!resource.identifier().isEmpty());
@@ -250,7 +252,7 @@ void MailTest::testMoveMail()
                auto mail = *mails.first();
                modifiedMail = mail;
                QCOMPARE(mail.getFolder(), folder.identifier());
-                Warning() << "path: " << mail.getMimeMessagePath();
+                SinkWarning() << "path: " << mail.getMimeMessagePath();
                QVERIFY(QFile(mail.getMimeMessagePath()).exists());
            });
        VERIFYEXEC(job);
@@ -269,7 +271,7 @@ void MailTest::testMoveMail()
                auto mail = *mails.first();
                QCOMPARE(mail.getFolder(), folder1.identifier());
                QVERIFY(QFile(mail.getMimeMessagePath()).exists());
-                Trace() << "Mime message path: " << mail.getMimeMessagePath();
+                SinkTrace() << "Mime message path: " << mail.getMimeMessagePath();
            });
        VERIFYEXEC(job);
    }
diff --git a/tests/mailtest.h b/tests/mailtest.h
index 2144bf1..cba623d 100644
--- a/tests/mailtest.h
+++ b/tests/mailtest.h
@@ -34,6 +34,7 @@ protected:
    QByteArray mResourceInstanceIdentifier;
    QByteArrayList mCapabilities;
+    virtual bool isBackendAvailable() { return true; }
    virtual void resetTestEnvironment() = 0;
    virtual Sink::ApplicationDomain::SinkResource createResource() = 0;
diff --git a/tests/messagequeuetest.cpp b/tests/messagequeuetest.cpp
index 484ff86..e79bba2 100644
--- a/tests/messagequeuetest.cpp
+++ b/tests/messagequeuetest.cpp
@@ -7,6 +7,9 @@
 #include "storage.h"
 #include "messagequeue.h"
 #include "log.h"
+#include "test.h"
+SINK_DEBUG_AREA("messagequeuetest")
 /**
 * Test of the messagequeue implementation.
@@ -17,8 +20,8 @@ class MessageQueueTest : public QObject
 private slots:
    void initTestCase()
    {
-        Sink::Log::setDebugOutputLevel(Sink::Log::Trace);
+        Sink::Test::initTest();
-        Sink::Storage store(Sink::Store::storageLocation(), "org.kde.dummy.testqueue", Sink::Storage::ReadWrite);
+        Sink::Storage store(Sink::Store::storageLocation(), "sink.dummy.testqueue", Sink::Storage::ReadWrite);
        store.removeFromDisk();
    }
@@ -28,13 +31,13 @@ private slots:
    void cleanup()
    {
-        Sink::Storage store(Sink::Store::storageLocation(), "org.kde.dummy.testqueue", Sink::Storage::ReadWrite);
+        Sink::Storage store(Sink::Store::storageLocation(), "sink.dummy.testqueue", Sink::Storage::ReadWrite);
        store.removeFromDisk();
    }
    void testEmpty()
    {
-        MessageQueue queue(Sink::Store::storageLocation(), "org.kde.dummy.testqueue");
+        MessageQueue queue(Sink::Store::storageLocation(), "sink.dummy.testqueue");
        QVERIFY(queue.isEmpty());
        queue.enqueue("value");
        QVERIFY(!queue.isEmpty());
@@ -42,7 +45,7 @@ private slots:
    void testDequeueEmpty()
    {
-        MessageQueue queue(Sink::Store::storageLocation(), "org.kde.dummy.testqueue");
+        MessageQueue queue(Sink::Store::storageLocation(), "sink.dummy.testqueue");
        bool gotValue = false;
        bool gotError = false;
        queue.dequeue([&](void *ptr, int size, std::function<void(bool success)> callback) { gotValue = true; }, [&](const MessageQueue::Error &error) { gotError = true; });
@@ -52,7 +55,7 @@ private slots:
    void testEnqueue()
    {
-        MessageQueue queue(Sink::Store::storageLocation(), "org.kde.dummy.testqueue");
+        MessageQueue queue(Sink::Store::storageLocation(), "sink.dummy.testqueue");
        QSignalSpy spy(&queue, SIGNAL(messageReady()));
        queue.enqueue("value1");
        QCOMPARE(spy.size(), 1);
@@ -60,7 +63,7 @@ private slots:
    void testDrained()
    {
-        MessageQueue queue(Sink::Store::storageLocation(), "org.kde.dummy.testqueue");
+        MessageQueue queue(Sink::Store::storageLocation(), "sink.dummy.testqueue");
        QSignalSpy spy(&queue, SIGNAL(drained()));
        queue.enqueue("value1");
@@ -74,13 +77,13 @@ private slots:
        values << "value1";
        values << "value2";
-        MessageQueue queue(Sink::Store::storageLocation(), "org.kde.dummy.testqueue");
+        MessageQueue queue(Sink::Store::storageLocation(), "sink.dummy.testqueue");
        for (const QByteArray &value : values) {
            queue.enqueue(value);
        }
        while (!queue.isEmpty()) {
-            Log() << "start";
+            SinkLog() << "start";
            const auto expected = values.dequeue();
            bool gotValue = false;
            bool gotError = false;
@@ -104,7 +107,7 @@ private slots:
        values << "value1";
        values << "value2";
-        MessageQueue queue(Sink::Store::storageLocation(), "org.kde.dummy.testqueue");
+        MessageQueue queue(Sink::Store::storageLocation(), "sink.dummy.testqueue");
        for (const QByteArray &value : values) {
            queue.enqueue(value);
        }
@@ -142,7 +145,7 @@ private slots:
     */
    void testNestedEnqueue()
    {
-        MessageQueue queue(Sink::Store::storageLocation(), "org.kde.dummy.testqueue");
+        MessageQueue queue(Sink::Store::storageLocation(), "sink.dummy.testqueue");
        queue.enqueue("value1");
        bool gotError = false;
@@ -157,7 +160,7 @@ private slots:
    void testBatchDequeue()
    {
-        MessageQueue queue(Sink::Store::storageLocation(), "org.kde.dummy.testqueue");
+        MessageQueue queue(Sink::Store::storageLocation(), "sink.dummy.testqueue");
        queue.enqueue("value1");
        queue.enqueue("value2");
        queue.enqueue("value3");
@@ -178,7 +181,7 @@ private slots:
    void testBatchEnqueue()
    {
-        MessageQueue queue(Sink::Store::storageLocation(), "org.kde.dummy.testqueue");
+        MessageQueue queue(Sink::Store::storageLocation(), "sink.dummy.testqueue");
        QSignalSpy spy(&queue, SIGNAL(messageReady()));
        queue.startTransaction();
        queue.enqueue("value1");
diff --git a/tests/modelinteractivitytest.cpp b/tests/modelinteractivitytest.cpp
index d0a0920..1ac0e2d 100644
--- a/tests/modelinteractivitytest.cpp
+++ b/tests/modelinteractivitytest.cpp
@@ -10,6 +10,7 @@
 #include "resourceconfig.h"
 #include "log.h"
 #include "modelresult.h"
+#include "test.h"
 static int blockingTime;
@@ -29,10 +30,11 @@ public:
    {
        t.start();
        const bool ret = QCoreApplication::notify(receiver, event);
-        if (t.elapsed() > 1)
+        if (t.elapsed() > 1) {
            std::cout
-                << QString("processing event type %1 for object %2 took %3ms").arg((int)event->type()).arg("" /* receiver->objectName().toLocal8Bit().data()*/).arg((int)t.elapsed()).toStdString()
+                << QString("processing event type %1 for object %2 took %3ms").arg((int)event->type()).arg(receiver->metaObject()->className()).arg((int)t.elapsed()).toStdString()
                << std::endl;
+        }
        blockingTime += t.elapsed();
        return ret;
    }
@@ -49,14 +51,14 @@ class ModelinteractivityTest : public QObject
 private slots:
    void initTestCase()
    {
-        Sink::Log::setDebugOutputLevel(Sink::Log::Warning);
+        Sink::Test::initTest();
-        ResourceConfig::addResource("org.kde.dummy.instance1", "org.kde.dummy");
+        ResourceConfig::addResource("sink.dummy.instance1", "sink.dummy");
-        Sink::Store::removeDataFromDisk(QByteArray("org.kde.dummy.instance1")).exec().waitForFinished();
+        Sink::Store::removeDataFromDisk(QByteArray("sink.dummy.instance1")).exec().waitForFinished();
    }
    void cleanup()
    {
-        Sink::Store::removeDataFromDisk(QByteArray("org.kde.dummy.instance1")).exec().waitForFinished();
+        Sink::Store::removeDataFromDisk(QByteArray("sink.dummy.instance1")).exec().waitForFinished();
    }
    void init()
@@ -67,14 +69,14 @@ private slots:
    {
        // Setup
        {
-            Sink::ApplicationDomain::Mail mail("org.kde.dummy.instance1");
+            Sink::ApplicationDomain::Mail mail("sink.dummy.instance1");
            for (int i = 0; i < 1000; i++) {
                Sink::Store::create<Sink::ApplicationDomain::Mail>(mail).exec().waitForFinished();
            }
        }
        Sink::Query query;
-        query.resources << "org.kde.dummy.instance1";
+        query.resources << "sink.dummy.instance1";
        query.liveQuery = true;
        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
diff --git a/tests/pipelinebenchmark.cpp b/tests/pipelinebenchmark.cpp
index 51481fd..0c0b9e6 100644
--- a/tests/pipelinebenchmark.cpp
+++ b/tests/pipelinebenchmark.cpp
@@ -131,7 +131,7 @@ private slots:
    {
        Sink::Log::setDebugOutputLevel(Sink::Log::Warning);
        Sink::AdaptorFactoryRegistry::instance().registerFactory<Sink::ApplicationDomain::Mail, TestMailAdaptorFactory>("test");
-        resourceIdentifier = "org.kde.test.instance1";
+        resourceIdentifier = "sink.test.instance1";
    }
    void testWithoutIndex()
diff --git a/tests/pipelinetest.cpp b/tests/pipelinetest.cpp
index c6ee9ab..7216f62 100644
--- a/tests/pipelinetest.cpp
+++ b/tests/pipelinetest.cpp
@@ -190,13 +190,12 @@ class PipelineTest : public QObject
 private slots:
    void initTestCase()
    {
-        Sink::Log::setDebugOutputLevel(Sink::Log::Trace);
        Sink::AdaptorFactoryRegistry::instance().registerFactory<Sink::ApplicationDomain::Event, TestEventAdaptorFactory>("test");
    }
    void init()
    {
-        removeFromDisk("org.kde.pipelinetest.instance1");
+        removeFromDisk("sink.pipelinetest.instance1");
    }
    void testCreate()
@@ -204,14 +203,14 @@ private slots:
        flatbuffers::FlatBufferBuilder entityFbb;
        auto command = createEntityCommand(createEvent(entityFbb));
-        Sink::Pipeline pipeline("org.kde.pipelinetest.instance1");
+        Sink::Pipeline pipeline("sink.pipelinetest.instance1");
        pipeline.setResourceType("test");
        pipeline.startTransaction();
        pipeline.newEntity(command.constData(), command.size());
        pipeline.commit();
-        auto result = getKeys("org.kde.pipelinetest.instance1", "event.main");
+        auto result = getKeys("sink.pipelinetest.instance1", "event.main");
        qDebug() << result;
        QCOMPARE(result.size(), 1);
    }
@@ -221,7 +220,7 @@ private slots:
        flatbuffers::FlatBufferBuilder entityFbb;
        auto command = createEntityCommand(createEvent(entityFbb, "summary", "description"));
-        Sink::Pipeline pipeline("org.kde.pipelinetest.instance1");
+        Sink::Pipeline pipeline("sink.pipelinetest.instance1");
        pipeline.setResourceType("test");
        auto adaptorFactory = QSharedPointer<TestEventAdaptorFactory>::create();
@@ -232,7 +231,7 @@ private slots:
        pipeline.commit();
        // Get uid of written entity
-        auto keys = getKeys("org.kde.pipelinetest.instance1", "event.main");
+        auto keys = getKeys("sink.pipelinetest.instance1", "event.main");
        QCOMPARE(keys.size(), 1);
        const auto key = keys.first();
        const auto uid = Sink::Storage::uidFromKey(key);
@@ -245,7 +244,7 @@ private slots:
        pipeline.commit();
        // Ensure we've got the new revision with the modification
-        auto buffer = getEntity("org.kde.pipelinetest.instance1", "event.main", Sink::Storage::assembleKey(uid, 2));
+        auto buffer = getEntity("sink.pipelinetest.instance1", "event.main", Sink::Storage::assembleKey(uid, 2));
        QVERIFY(!buffer.isEmpty());
        Sink::EntityBuffer entityBuffer(buffer.data(), buffer.size());
        auto adaptor = adaptorFactory->createAdaptor(entityBuffer.entity());
@@ -254,7 +253,7 @@ private slots:
        QVERIFY2(adaptor->getProperty("description").toString() == QString("description"), "The modification has sideeffects.");
        // Both revisions are in the store at this point
-        QCOMPARE(getKeys("org.kde.pipelinetest.instance1", "event.main").size(), 2);
+        QCOMPARE(getKeys("sink.pipelinetest.instance1", "event.main").size(), 2);
        // Cleanup old revisions
        pipeline.startTransaction();
@@ -262,7 +261,7 @@ private slots:
        pipeline.commit();
        // And now only the latest revision is left
-        QCOMPARE(getKeys("org.kde.pipelinetest.instance1", "event.main").size(), 1);
+        QCOMPARE(getKeys("sink.pipelinetest.instance1", "event.main").size(), 1);
    }
    void testModifyWithUnrelatedOperationInbetween()
@@ -270,7 +269,7 @@ private slots:
        flatbuffers::FlatBufferBuilder entityFbb;
        auto command = createEntityCommand(createEvent(entityFbb));
-        Sink::Pipeline pipeline("org.kde.pipelinetest.instance1");
+        Sink::Pipeline pipeline("sink.pipelinetest.instance1");
        pipeline.setResourceType("test");
        auto adaptorFactory = QSharedPointer<TestEventAdaptorFactory>::create();
@@ -281,7 +280,7 @@ private slots:
        pipeline.commit();
        // Get uid of written entity
-        auto keys = getKeys("org.kde.pipelinetest.instance1", "event.main");
+        auto keys = getKeys("sink.pipelinetest.instance1", "event.main");
        QCOMPARE(keys.size(), 1);
        const auto uid = Sink::Storage::uidFromKey(keys.first());
@@ -303,7 +302,7 @@ private slots:
        pipeline.commit();
        // Ensure we've got the new revision with the modification
-        auto buffer = getEntity("org.kde.pipelinetest.instance1", "event.main", Sink::Storage::assembleKey(uid, 3));
+        auto buffer = getEntity("sink.pipelinetest.instance1", "event.main", Sink::Storage::assembleKey(uid, 3));
        QVERIFY(!buffer.isEmpty());
        Sink::EntityBuffer entityBuffer(buffer.data(), buffer.size());
        auto adaptor = adaptorFactory->createAdaptor(entityBuffer.entity());
@@ -314,7 +313,7 @@ private slots:
    {
        flatbuffers::FlatBufferBuilder entityFbb;
        auto command = createEntityCommand(createEvent(entityFbb));
-        Sink::Pipeline pipeline("org.kde.pipelinetest.instance1");
+        Sink::Pipeline pipeline("sink.pipelinetest.instance1");
        pipeline.setResourceType("test");
        // Create the initial revision
@@ -322,7 +321,7 @@ private slots:
        pipeline.newEntity(command.constData(), command.size());
        pipeline.commit();
-        auto result = getKeys("org.kde.pipelinetest.instance1", "event.main");
+        auto result = getKeys("sink.pipelinetest.instance1", "event.main");
        QCOMPARE(result.size(), 1);
        const auto uid = Sink::Storage::uidFromKey(result.first());
@@ -334,7 +333,7 @@ private slots:
        pipeline.commit();
        // We have a new revision that indicates the deletion
-        QCOMPARE(getKeys("org.kde.pipelinetest.instance1", "event.main").size(), 2);
+        QCOMPARE(getKeys("sink.pipelinetest.instance1", "event.main").size(), 2);
        // Cleanup old revisions
        pipeline.startTransaction();
@@ -342,18 +341,18 @@ private slots:
        pipeline.commit();
        // And all revisions are gone
-        QCOMPARE(getKeys("org.kde.pipelinetest.instance1", "event.main").size(), 0);
+        QCOMPARE(getKeys("sink.pipelinetest.instance1", "event.main").size(), 0);
    }
    void testPreprocessor()
    {
        flatbuffers::FlatBufferBuilder entityFbb;
-        TestProcessor testProcessor;
+        auto testProcessor = new TestProcessor;
-        Sink::Pipeline pipeline("org.kde.pipelinetest.instance1");
+        Sink::Pipeline pipeline("sink.pipelinetest.instance1");
        pipeline.setResourceType("test");
-        pipeline.setPreprocessors("event", QVector<Sink::Preprocessor *>() << &testProcessor);
+        pipeline.setPreprocessors("event", QVector<Sink::Preprocessor *>() << testProcessor);
        pipeline.startTransaction();
        // pipeline.setAdaptorFactory("event", QSharedPointer<TestEventAdaptorFactory>::create());
@@ -361,24 +360,24 @@ private slots:
        {
            auto command = createEntityCommand(createEvent(entityFbb));
            pipeline.newEntity(command.constData(), command.size());
-            QCOMPARE(testProcessor.newUids.size(), 1);
+            QCOMPARE(testProcessor->newUids.size(), 1);
-            QCOMPARE(testProcessor.newRevisions.size(), 1);
+            QCOMPARE(testProcessor->newRevisions.size(), 1);
            // Key doesn't contain revision and is just the uid
-            QCOMPARE(testProcessor.newUids.at(0), Sink::Storage::uidFromKey(testProcessor.newUids.at(0)));
+            QCOMPARE(testProcessor->newUids.at(0), Sink::Storage::uidFromKey(testProcessor->newUids.at(0)));
        }
        pipeline.commit();
        entityFbb.Clear();
        pipeline.startTransaction();
-        auto keys = getKeys("org.kde.pipelinetest.instance1", "event.main");
+        auto keys = getKeys("sink.pipelinetest.instance1", "event.main");
        QCOMPARE(keys.size(), 1);
        const auto uid = Sink::Storage::uidFromKey(keys.first());
        {
            auto modifyCommand = modifyEntityCommand(createEvent(entityFbb, "summary2"), uid, 1);
            pipeline.modifiedEntity(modifyCommand.constData(), modifyCommand.size());
-            QCOMPARE(testProcessor.modifiedUids.size(), 1);
+            QCOMPARE(testProcessor->modifiedUids.size(), 1);
-            QCOMPARE(testProcessor.modifiedRevisions.size(), 1);
+            QCOMPARE(testProcessor->modifiedRevisions.size(), 1);
            // Key doesn't contain revision and is just the uid
-            QCOMPARE(testProcessor.modifiedUids.at(0), Sink::Storage::uidFromKey(testProcessor.modifiedUids.at(0)));
+            QCOMPARE(testProcessor->modifiedUids.at(0), Sink::Storage::uidFromKey(testProcessor->modifiedUids.at(0)));
        }
        pipeline.commit();
        entityFbb.Clear();
@@ -386,12 +385,12 @@ private slots:
        {
            auto deleteCommand = deleteEntityCommand(uid, 1);
            pipeline.deletedEntity(deleteCommand.constData(), deleteCommand.size());
-            QCOMPARE(testProcessor.deletedUids.size(), 1);
+            QCOMPARE(testProcessor->deletedUids.size(), 1);
-            QCOMPARE(testProcessor.deletedUids.size(), 1);
+            QCOMPARE(testProcessor->deletedUids.size(), 1);
-            QCOMPARE(testProcessor.deletedSummaries.size(), 1);
+            QCOMPARE(testProcessor->deletedSummaries.size(), 1);
            // Key doesn't contain revision and is just the uid
-            QCOMPARE(testProcessor.deletedUids.at(0), Sink::Storage::uidFromKey(testProcessor.deletedUids.at(0)));
+            QCOMPARE(testProcessor->deletedUids.at(0), Sink::Storage::uidFromKey(testProcessor->deletedUids.at(0)));
-            QCOMPARE(testProcessor.deletedSummaries.at(0), QByteArray("summary2"));
+            QCOMPARE(testProcessor->deletedSummaries.at(0), QByteArray("summary2"));
        }
    }
 };
diff --git a/tests/querytest.cpp b/tests/querytest.cpp
index 6d7746e..d3a97f6 100644
--- a/tests/querytest.cpp
+++ b/tests/querytest.cpp
@@ -23,16 +23,15 @@ private slots:
    void initTestCase()
    {
        Sink::Test::initTest();
-        Sink::Log::setDebugOutputLevel(Sink::Log::Trace);
+        auto factory = Sink::ResourceFactory::load("sink.dummy");
-        auto factory = Sink::ResourceFactory::load("org.kde.dummy");
        QVERIFY(factory);
-        ResourceConfig::addResource("org.kde.dummy.instance1", "org.kde.dummy");
+        ResourceConfig::addResource("sink.dummy.instance1", "sink.dummy");
-        Sink::Store::removeDataFromDisk(QByteArray("org.kde.dummy.instance1")).exec().waitForFinished();
+        Sink::Store::removeDataFromDisk(QByteArray("sink.dummy.instance1")).exec().waitForFinished();
    }
    void cleanup()
    {
-        Sink::Store::removeDataFromDisk(QByteArray("org.kde.dummy.instance1")).exec().waitForFinished();
+        Sink::Store::removeDataFromDisk(QByteArray("sink.dummy.instance1")).exec().waitForFinished();
    }
    void init()
@@ -60,13 +59,13 @@ private slots:
    {
        // Setup
        {
-            Sink::ApplicationDomain::Mail mail("org.kde.dummy.instance1");
+            Sink::ApplicationDomain::Mail mail("sink.dummy.instance1");
            Sink::Store::create<Sink::ApplicationDomain::Mail>(mail).exec().waitForFinished();
        }
        // Test
        Sink::Query query;
-        query.resources << "org.kde.dummy.instance1";
+        query.resources << "sink.dummy.instance1";
        query.liveQuery = true;
        // We fetch before the data is available and rely on the live query mechanism to deliver the actual data
@@ -78,13 +77,13 @@ private slots:
    {
        // Setup
        {
-            Sink::ApplicationDomain::Mail mail("org.kde.dummy.instance1");
+            Sink::ApplicationDomain::Mail mail("sink.dummy.instance1");
            Sink::Store::create<Sink::ApplicationDomain::Mail>(mail).exec().waitForFinished();
        }
        // Test
        Sink::Query query;
-        query.resources << "org.kde.dummy.instance1";
+        query.resources << "sink.dummy.instance1";
        query.liveQuery = false;
        // Ensure all local data is processed
@@ -102,12 +101,12 @@ private slots:
        QByteArray id;
        // Setup
        {
-            Sink::ApplicationDomain::Mail mail("org.kde.dummy.instance1");
+            Sink::ApplicationDomain::Mail mail("sink.dummy.instance1");
            Sink::Store::create<Sink::ApplicationDomain::Mail>(mail).exec().waitForFinished();
            Sink::Store::create<Sink::ApplicationDomain::Mail>(mail).exec().waitForFinished();
            Sink::Query query;
-            query.resources << "org.kde.dummy.instance1";
+            query.resources << "sink.dummy.instance1";
            // Ensure all local data is processed
            Sink::Store::synchronize(query).exec().waitForFinished();
@@ -121,7 +120,7 @@ private slots:
        // Test
        Sink::Query query;
-        query.resources << "org.kde.dummy.instance1";
+        query.resources << "sink.dummy.instance1";
        query.ids << id;
        auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Mail>(query);
        QTRY_VERIFY(model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
@@ -132,13 +131,13 @@ private slots:
    {
        // Setup
        {
-            Sink::ApplicationDomain::Folder folder("org.kde.dummy.instance1");
+            Sink::ApplicationDomain::Folder folder("sink.dummy.instance1");
            Sink::Store::create<Sink::ApplicationDomain::Folder>(folder).exec().waitForFinished();
        }
        // Test
        Sink::Query query;
-        query.resources << "org.kde.dummy.instance1";
+        query.resources << "sink.dummy.instance1";
        query.liveQuery = true;
        // We fetch before the data is available and rely on the live query mechanism to deliver the actual data
@@ -152,11 +151,11 @@ private slots:
    {
        // Setup
        {
-            Sink::ApplicationDomain::Folder folder("org.kde.dummy.instance1");
+            Sink::ApplicationDomain::Folder folder("sink.dummy.instance1");
            Sink::Store::create<Sink::ApplicationDomain::Folder>(folder).exec().waitForFinished();
            Sink::Query query;
-            query.resources << "org.kde.dummy.instance1";
+            query.resources << "sink.dummy.instance1";
            // Ensure all local data is processed
            Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
@@ -168,14 +167,14 @@ private slots:
            auto folderEntity = model->index(0, 0).data(Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::Folder::Ptr>();
            QVERIFY(!folderEntity->identifier().isEmpty());
-            Sink::ApplicationDomain::Folder subfolder("org.kde.dummy.instance1");
+            Sink::ApplicationDomain::Folder subfolder("sink.dummy.instance1");
            subfolder.setProperty("parent", folderEntity->identifier());
            Sink::Store::create<Sink::ApplicationDomain::Folder>(subfolder).exec().waitForFinished();
        }
        // Test
        Sink::Query query;
-        query.resources << "org.kde.dummy.instance1";
+        query.resources << "sink.dummy.instance1";
        query.parentProperty = "parent";
        // Ensure all local data is processed
@@ -194,7 +193,7 @@ private slots:
    {
        // Setup
        {
-            Sink::ApplicationDomain::Mail mail("org.kde.dummy.instance1");
+            Sink::ApplicationDomain::Mail mail("sink.dummy.instance1");
            mail.setProperty("uid", "test1");
            mail.setProperty("sender", "doe@example.org");
            Sink::Store::create<Sink::ApplicationDomain::Mail>(mail).exec().waitForFinished();
@@ -202,7 +201,7 @@ private slots:
        // Test
        Sink::Query query;
-        query.resources << "org.kde.dummy.instance1";
+        query.resources << "sink.dummy.instance1";
        query.liveQuery = false;
        query += Sink::Query::PropertyFilter("uid", "test1");
@@ -220,11 +219,11 @@ private slots:
        // Setup
        Sink::ApplicationDomain::Folder::Ptr folderEntity;
        {
-            Sink::ApplicationDomain::Folder folder("org.kde.dummy.instance1");
+            Sink::ApplicationDomain::Folder folder("sink.dummy.instance1");
            Sink::Store::create<Sink::ApplicationDomain::Folder>(folder).exec().waitForFinished();
            Sink::Query query;
-            query.resources << "org.kde.dummy.instance1";
+            query.resources << "sink.dummy.instance1";
            // Ensure all local data is processed
            Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
@@ -236,7 +235,7 @@ private slots:
            folderEntity = model->index(0, 0).data(Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::Folder::Ptr>();
            QVERIFY(!folderEntity->identifier().isEmpty());
-            Sink::ApplicationDomain::Mail mail("org.kde.dummy.instance1");
+            Sink::ApplicationDomain::Mail mail("sink.dummy.instance1");
            mail.setProperty("uid", "test1");
            mail.setProperty("folder", folderEntity->identifier());
            Sink::Store::create<Sink::ApplicationDomain::Mail>(mail).exec().waitForFinished();
@@ -244,7 +243,7 @@ private slots:
        // Test
        Sink::Query query;
-        query.resources << "org.kde.dummy.instance1";
+        query.resources << "sink.dummy.instance1";
        query += Sink::Query::PropertyFilter("folder", *folderEntity);
        // Ensure all local data is processed
@@ -261,11 +260,11 @@ private slots:
        // Setup
        Sink::ApplicationDomain::Folder::Ptr folderEntity;
        {
-            Sink::ApplicationDomain::Folder folder("org.kde.dummy.instance1");
+            Sink::ApplicationDomain::Folder folder("sink.dummy.instance1");
            Sink::Store::create<Sink::ApplicationDomain::Folder>(folder).exec().waitForFinished();
            Sink::Query query;
-            query.resources << "org.kde.dummy.instance1";
+            query.resources << "sink.dummy.instance1";
            // Ensure all local data is processed
            Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
@@ -279,21 +278,21 @@ private slots:
            const auto date = QDateTime(QDate(2015, 7, 7), QTime(12, 0));
            {
-                Sink::ApplicationDomain::Mail mail("org.kde.dummy.instance1");
+                Sink::ApplicationDomain::Mail mail("sink.dummy.instance1");
                mail.setProperty("uid", "testSecond");
                mail.setProperty("folder", folderEntity->identifier());
                mail.setProperty("date", date.addDays(-1));
                Sink::Store::create<Sink::ApplicationDomain::Mail>(mail).exec().waitForFinished();
            }
            {
-                Sink::ApplicationDomain::Mail mail("org.kde.dummy.instance1");
+                Sink::ApplicationDomain::Mail mail("sink.dummy.instance1");
                mail.setProperty("uid", "testLatest");
                mail.setProperty("folder", folderEntity->identifier());
                mail.setProperty("date", date);
                Sink::Store::create<Sink::ApplicationDomain::Mail>(mail).exec().waitForFinished();
            }
            {
-                Sink::ApplicationDomain::Mail mail("org.kde.dummy.instance1");
+                Sink::ApplicationDomain::Mail mail("sink.dummy.instance1");
                mail.setProperty("uid", "testLast");
                mail.setProperty("folder", folderEntity->identifier());
                mail.setProperty("date", date.addDays(-2));
@@ -303,7 +302,7 @@ private slots:
        // Test
        Sink::Query query;
-        query.resources << "org.kde.dummy.instance1";
+        query.resources << "sink.dummy.instance1";
        query += Sink::Query::PropertyFilter("folder", *folderEntity);
        query.sortProperty = "date";
        query.limit = 1;
diff --git a/tests/resourcecommunicationtest.cpp b/tests/resourcecommunicationtest.cpp
index 2874457..1530f63 100644
--- a/tests/resourcecommunicationtest.cpp
+++ b/tests/resourcecommunicationtest.cpp
@@ -92,6 +92,26 @@ private slots:
        QTRY_COMPARE(complete, count);
        QVERIFY(!errors);
    }
+    void testAccessFactory()
+    {
+        const QByteArray resourceIdentifier("test");
+        Listener listener(resourceIdentifier, "");
+        QWeakPointer<Sink::ResourceAccess> weakRef;
+        QTime time;
+        time.start();
+        {
+            auto resourceAccess = Sink::ResourceAccessFactory::instance().getAccess(resourceIdentifier, "");
+            weakRef = resourceAccess.toWeakRef();
+            resourceAccess->open();
+            resourceAccess->sendCommand(Sink::Commands::PingCommand).then<void>([resourceAccess]() { qDebug() << "Pind complete";  }).exec();
+        }
+        QVERIFY(weakRef.toStrongRef());
+        QTRY_VERIFY(!weakRef.toStrongRef());
+        qDebug() << "time.elapsed " << time.elapsed();
+        QVERIFY(time.elapsed() < 3500);
+        QVERIFY(time.elapsed() > 2500);
+    }
 };
 QTEST_MAIN(ResourceCommunicationTest)
diff --git a/tests/resourceconfigtest.cpp b/tests/resourceconfigtest.cpp
index bebff50..021d042 100644
--- a/tests/resourceconfigtest.cpp
+++ b/tests/resourceconfigtest.cpp
@@ -8,6 +8,8 @@
 #include "modelresult.h"
 #include "resultprovider.h"
 #include "facadefactory.h"
+#include "test.h"
+#include "testutils.h"
 /**
 * Test of the resource configuration.
@@ -19,9 +21,9 @@ private slots:
    void initTestCase()
    {
+        Sink::Test::initTest();
        Sink::FacadeFactory::instance().resetFactory();
        ResourceConfig::clear();
-        Sink::Log::setDebugOutputLevel(Sink::Log::Trace);
    }
    void resourceManagement()
@@ -72,6 +74,30 @@ private slots:
        Sink::Store::remove(res).exec().waitForFinished();
    }
+    void testLoadResourceStatus()
+    {
+        ResourceConfig::clear();
+        Sink::FacadeFactory::instance().registerStaticFacades();
+        auto res = Sink::ApplicationDomain::DummyResource::create("");
+        VERIFYEXEC(Sink::Store::create(res));
+        {
+            Sink::Query query;
+            query.liveQuery = true;
+            query.request<Sink::ApplicationDomain::SinkResource::Status>();
+            auto model = Sink::Store::loadModel<Sink::ApplicationDomain::SinkResource>(query);
+            QTRY_COMPARE(model->rowCount(QModelIndex()), 1);
+            auto resource = model->data(model->index(0, 0, QModelIndex()), Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::SinkResource::Ptr>();
+            QCOMPARE(resource->getStatus(), static_cast<int>(Sink::ApplicationDomain::OfflineStatus));
+            //Synchronize to connect
+            VERIFYEXEC(Sink::Store::synchronize(query));
+            QTRY_COMPARE(model->data(model->index(0, 0, QModelIndex()), Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::SinkResource::Ptr>()->getStatus(), static_cast<int>(Sink::ApplicationDomain::ConnectedStatus));
+        }
+        VERIFYEXEC(Sink::Store::remove(res));
+    }
 };
 QTEST_MAIN(ResourceConfigTest)
diff --git a/tests/testaccounttest.cpp b/tests/testaccounttest.cpp
index c630846..078e7a0 100644
--- a/tests/testaccounttest.cpp
+++ b/tests/testaccounttest.cpp
@@ -20,7 +20,6 @@ private slots:
    {
        // Sink::FacadeFactory::instance().resetFactory();
        // ResourceConfig::clear();
-        Log::setDebugOutputLevel(Sink::Log::Trace);
        Test::initTest();
    }