125 files changed, 2134 insertions, 2410 deletions
diff --git a/.gitignore b/.gitignore
index 1df13e3..8c58b8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.swp
 *.kdev4
+build/
 site
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 532ad41..e3cb26d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0)
 cmake_policy(SET CMP0048 NEW)
 cmake_policy(SET CMP0028 NEW)
-project(sink VERSION 0.1.0)
+project(sink VERSION 0.2)
 option(BUILD_MAILDIR "BUILD_MAILDIR" ON)
 option(BUILD_DAV "BUILD_DAV" OFF)
@@ -27,9 +27,9 @@ include(KDEInstallDirs)
 find_package(Qt5 COMPONENTS REQUIRED Core Network Gui)
 find_package(KF5 COMPONENTS REQUIRED Mime Contacts)
-find_package(FlatBuffers REQUIRED)
+find_package(FlatBuffers REQUIRED 1.4.0)
 find_package(KAsync REQUIRED 0.1.0)
-find_package(LMDB REQUIRED)
+find_package(LMDB REQUIRED 0.9)
 find_program(MEMORYCHECK_COMMAND valgrind)
 set(MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --leak-check=full")
diff --git a/cmake/modules/FindLibgit2.cmake b/cmake/modules/FindLibgit2.cmake
index f33db4a..fbfb32f 100644
--- a/cmake/modules/FindLibgit2.cmake
+++ b/cmake/modules/FindLibgit2.cmake
@@ -9,8 +9,8 @@
 # use pkg-config to get the directories and then use these values
 # in the FIND_PATH() and FIND_LIBRARY() calls
-#FIND_PACKAGE(PkgConfig)
+FIND_PACKAGE(PkgConfig)
-#PKG_SEARCH_MODULE(PC_LIBGIT2 libgit2)
+PKG_SEARCH_MODULE(PC_LIBGIT2 libgit2)
 SET(LIBGIT2_DEFINITIONS ${PC_LIBGIT2_CFLAGS_OTHER})
@@ -26,11 +26,28 @@ FIND_LIBRARY(LIBGIT2_LIBRARIES NAMES git2
   ${PC_LIBGIT2_LIBRARY_DIRS}
   )
-#Should be replaced by a version check
+message("foo: ${LIBGIT2_INCLUDE_DIR} : ${PC_LIBGIT2_INCLUDEDIR} : ${PC_LIBGIT2_INCLUDE_DIRS}")
-include(CheckFunctionExists)
-CHECK_FUNCTION_EXISTS(git_buf_free HAVE_BUF_FREE)
+# get version from header, should work on windows, too
+if(LIBGIT2_INCLUDE_DIR)
+    file(STRINGS "${LIBGIT2_INCLUDE_DIR}/git2/version.h" LIBGIT2_H REGEX "^#define LIBGIT2_VERSION \"[^\"]*\"$")
+    string(REGEX REPLACE "^.*LIBGIT2_VERSION \"([0-9]+).*$" "\\1" LIBGIT2_VERSION_MAJOR "${LIBGIT2_H}")
+    string(REGEX REPLACE "^.*LIBGIT2_VERSION \"[0-9]+\\.([0-9]+).*$" "\\1" LIBGIT2_VERSION_MINOR  "${LIBGIT2_H}")
+    string(REGEX REPLACE "^.*LIBGIT2_VERSION \"[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1" LIBGIT2_VERSION_PATCH "${LIBGIT2_H}")
+    set(LIBGIT2_VERSION "${LIBGIT2_VERSION_MAJOR}.${LIBGIT2_VERSION_MINOR}.${LIBGIT2_VERSION_PATCH}")
+    set(LIBGIT2_MAJOR_VERSION "${LIBGIT2_VERSION_MAJOR}")
+    set(LIBGIT2_MINOR_VERSION "${LIBGIT2_VERSION_MINOR}")
+    set(LIBGIT2_PATCH_VERSION "${LIBGIT2_VERSION_PATCH}")
+    unset(LIBGIT2_H)
+endif()
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(libgit2 DEFAULT_MSG LIBGIT2_LIBRARIES LIBGIT2_INCLUDE_DIR HAVE_BUF_FREE)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(libgit2
+    REQUIRED_VARS LIBGIT2_LIBRARIES LIBGIT2_INCLUDE_DIR
+    FOUND_VAR LIBGIT2_FOUND
+    VERSION_VAR LIBGIT2_VERSION)
 MARK_AS_ADVANCED(LIBGIT2_INCLUDE_DIR LIBGIT2_LIBRARIES)
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index b5275e0..001a412 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -61,10 +61,7 @@ set(command_SRCS
    resultset.cpp
    domain/propertyregistry.cpp
    domain/applicationdomaintype.cpp
-    domain/contact.cpp
+    domain/typeimplementations.cpp
-    domain/event.cpp
-    domain/mail.cpp
-    domain/folder.cpp
    test.cpp
    query.cpp
    changereplay.cpp
@@ -101,6 +98,7 @@ generate_flatbuffers(
    commands/inspection
    commands/flush
    domain/contact
+    domain/addressbook
    domain/event
    domain/mail
    domain/folder
diff --git a/common/bufferadaptor.h b/common/bufferadaptor.h
index 0ae7bf5..fd4809b 100644
--- a/common/bufferadaptor.h
+++ b/common/bufferadaptor.h
@@ -39,12 +39,12 @@ public:
    }
    virtual QVariant getProperty(const QByteArray &key) const
    {
-        qFatal("Tried to get property: " + key);
+        qFatal("Tried to get property: %s", key.data());
        return QVariant();
    }
    virtual void setProperty(const QByteArray &key, const QVariant &value)
    {
-        qFatal("Tried to get property: " + key);
+        qFatal("Tried to get property: %s", key.data());
    }
    virtual QList<QByteArray> availableProperties() const
    {
diff --git a/common/changereplay.cpp b/common/changereplay.cpp
index 532cca8..7895b66 100644
--- a/common/changereplay.cpp
+++ b/common/changereplay.cpp
@@ -29,10 +29,10 @@
 using namespace Sink;
 using namespace Sink::Storage;
-ChangeReplay::ChangeReplay(const ResourceContext &resourceContext)
+ChangeReplay::ChangeReplay(const ResourceContext &resourceContext, const Sink::Log::Context &ctx)
-    : mStorage(storageLocation(), resourceContext.instanceId(), DataStore::ReadOnly), mChangeReplayStore(storageLocation(), resourceContext.instanceId() + ".changereplay", DataStore::ReadWrite), mReplayInProgress(false), mLogCtx{"changereplay"}
+    : mStorage(storageLocation(), resourceContext.instanceId(), DataStore::ReadOnly), mChangeReplayStore(storageLocation(), resourceContext.instanceId() + ".changereplay", DataStore::ReadWrite), mReplayInProgress(false), mLogCtx{ctx.subContext("changereplay")},
+    mGuard{new QObject}
 {
-    SinkTraceCtx(mLogCtx) << "Created change replay: " << resourceContext.instanceId();
 }
 qint64 ChangeReplay::getLastReplayedRevision()
@@ -54,7 +54,6 @@ bool ChangeReplay::allChangesReplayed()
        SinkWarningCtx(mLogCtx) << error.message;
    }));
    const qint64 lastReplayedRevision = getLastReplayedRevision();
-    SinkTraceCtx(mLogCtx) << "Checking if all replayed. Top revision:" << topRevision << "Last replayed:" << lastReplayedRevision;
    return (lastReplayedRevision >= topRevision);
 }
@@ -99,8 +98,12 @@ KAsync::Job<void> ChangeReplay::replayNextRevision()
            SinkTraceCtx(mLogCtx) << "Changereplay from " << *lastReplayedRevision << " to " << *topRevision;
            return KAsync::doWhile(
                [this, lastReplayedRevision, topRevision]() -> KAsync::Job<KAsync::ControlFlowFlag> {
+                    if (!mGuard) {
+                        SinkTraceCtx(mLogCtx) << "Exit due to guard";
+                        return KAsync::value(KAsync::Break);
+                    }
                    if (*lastReplayedRevision >= *topRevision) {
-                        SinkTraceCtx(mLogCtx) << "Done replaying";
+                        SinkTraceCtx(mLogCtx) << "Done replaying" << *lastReplayedRevision << *topRevision;
                        return KAsync::value(KAsync::Break);
                    }
diff --git a/common/changereplay.h b/common/changereplay.h
index 3ca896e..edc4462 100644
--- a/common/changereplay.h
+++ b/common/changereplay.h
@@ -39,7 +39,7 @@ class SINK_EXPORT ChangeReplay : public QObject
 {
    Q_OBJECT
 public:
-    ChangeReplay(const ResourceContext &resourceContext);
+    ChangeReplay(const ResourceContext &resourceContext, const Sink::Log::Context &ctx= {});
    qint64 getLastReplayedRevision();
    virtual bool allChangesReplayed();
@@ -63,6 +63,7 @@ private:
    bool mReplayInProgress;
    Sink::Storage::DataStore::Transaction mMainStoreTransaction;
    Sink::Log::Context mLogCtx;
+    QSharedPointer<QObject> mGuard;
 };
 class NullChangeReplay : public ChangeReplay
diff --git a/common/commandprocessor.cpp b/common/commandprocessor.cpp
index 33e2f81..3507ef1 100644
--- a/common/commandprocessor.cpp
+++ b/common/commandprocessor.cpp
@@ -245,9 +245,9 @@ KAsync::Job<void> CommandProcessor::processQueue(MessageQueue *queue)
                                }
                            }
                            if (queue->isEmpty()) {
-                                return KAsync::value<KAsync::ControlFlowFlag>(KAsync::Break);
+                                return KAsync::Break;
                            } else {
-                                return KAsync::value<KAsync::ControlFlowFlag>(KAsync::Continue);
+                                return KAsync::Continue;
                            }
                        });
            }))
@@ -295,24 +295,6 @@ void CommandProcessor::setSynchronizer(const QSharedPointer<Synchronizer> &synch
    mSynchronizer->setup([this](int commandId, const QByteArray &data) {
        enqueueCommand(mSynchronizerQueue, commandId, data);
    }, mSynchronizerQueue);
-    QObject::connect(mSynchronizer.data(), &Synchronizer::replayingChanges, [this]() {
-        Sink::Notification n;
-        n.id = "changereplay";
-        n.type = Notification::Status;
-        n.message = "Replaying changes.";
-        n.code = ApplicationDomain::BusyStatus;
-        emit notify(n);
-    });
-    QObject::connect(mSynchronizer.data(), &Synchronizer::changesReplayed, [this]() {
-        Sink::Notification n;
-        n.id = "changereplay";
-        n.type = Notification::Status;
-        n.message = "All changes have been replayed.";
-        n.code = ApplicationDomain::ConnectedStatus;
-        emit notify(n);
-    });
    QObject::connect(mSynchronizer.data(), &Synchronizer::notify, this, &CommandProcessor::notify);
    setOldestUsedRevision(mSynchronizer->getLastReplayedRevision());
 }
diff --git a/common/commands.cpp b/common/commands.cpp
index ce83d03..eeb7f08 100644
--- a/common/commands.cpp
+++ b/common/commands.cpp
@@ -21,6 +21,7 @@
 #include "commands.h"
 #include <QIODevice>
+#include <log.h>
 namespace Sink {
@@ -77,27 +78,34 @@ void write(QIODevice *device, int messageId, int commandId)
    write(device, messageId, commandId, 0, 0);
 }
+static void write(QIODevice *device, const char *buffer, uint size)
+{
+    if (device->write(buffer, size) < 0) {
+        SinkWarningCtx(Sink::Log::Context{"commands"}) << "Error while writing " << device->errorString();
+    }
+}
 void write(QIODevice *device, int messageId, int commandId, const char *buffer, uint size)
 {
    if (size > 0 && !buffer) {
        size = 0;
    }
-    device->write((const char *)&messageId, sizeof(int));
+    write(device, (const char *)&messageId, sizeof(int));
-    device->write((const char *)&commandId, sizeof(int));
+    write(device, (const char *)&commandId, sizeof(int));
-    device->write((const char *)&size, sizeof(uint));
+    write(device, (const char *)&size, sizeof(uint));
    if (buffer) {
-        device->write(buffer, size);
+        write(device, buffer, size);
    }
 }
 void write(QIODevice *device, int messageId, int commandId, flatbuffers::FlatBufferBuilder &fbb)
 {
    const int dataSize = fbb.GetSize();
-    device->write((const char *)&messageId, sizeof(int));
+    write(device, (const char *)&messageId, sizeof(int));
-    device->write((const char *)&commandId, sizeof(int));
+    write(device, (const char *)&commandId, sizeof(int));
-    device->write((const char *)&dataSize, sizeof(int));
+    write(device, (const char *)&dataSize, sizeof(int));
-    device->write((const char *)fbb.GetBufferPointer(), dataSize);
+    write(device, (const char *)fbb.GetBufferPointer(), dataSize);
 }
 } // namespace Commands
diff --git a/common/commands/notification.fbs b/common/commands/notification.fbs
index c82fad3..517111c 100644
--- a/common/commands/notification.fbs
+++ b/common/commands/notification.fbs
@@ -2,9 +2,10 @@ namespace Sink.Commands;
 table Notification {
    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)
+    identifier: string; //An identifier that links back to the something related to the notification (e.g. a command id)
    message: string;
    code: int = 0; //See notification.h
+    entities: [string]; //A list of entities this applies to
 }
 root_type Notification;
diff --git a/common/contactpreprocessor.cpp b/common/contactpreprocessor.cpp
index 0f2ca17..ac2c3bc 100644
--- a/common/contactpreprocessor.cpp
+++ b/common/contactpreprocessor.cpp
@@ -28,9 +28,11 @@ void updatedProperties(Sink::ApplicationDomain::Contact &contact, const KContact
 {
    contact.setUid(addressee.uid());
    contact.setFn(addressee.formattedName());
-    QByteArrayList emails;
+    contact.setFirstname(addressee.givenName());
+    contact.setLastname(addressee.familyName());
+    QList<Sink::ApplicationDomain::Contact::Email> emails;
    for (const auto &email : addressee.emails()) {
-        emails << email.toUtf8();
+        emails << Sink::ApplicationDomain::Contact::Email{Sink::ApplicationDomain::Contact::Email::Undefined, email};
    }
    contact.setEmails(emails);
 }
diff --git a/common/datastorequery.cpp b/common/datastorequery.cpp
index 34d2bae..2e0c348 100644
--- a/common/datastorequery.cpp
+++ b/common/datastorequery.cpp
@@ -144,7 +144,7 @@ public:
            const auto property = entity.getProperty(filterProperty);
            const auto comparator = propertyFilter.value(filterProperty);
            if (!comparator.matches(property)) {
-                SinkTraceCtx(mDatastore->mLogCtx) << "Filtering entity due to property mismatch on filter: " << filterProperty << property << ":" << comparator.value;
+                SinkTraceCtx(mDatastore->mLogCtx) << "Filtering entity due to property mismatch on filter: " << entity.identifier() << "Property: " << filterProperty << property << " Filter:" << comparator.value;
                return false;
            }
        }
@@ -152,7 +152,7 @@ public:
    }
 };
-class Reduce : public FilterBase {
+class Reduce : public Filter {
 public:
    typedef QSharedPointer<Reduce> Ptr;
@@ -198,7 +198,7 @@ public:
    QList<Aggregator> mAggregators;
    Reduce(const QByteArray &reductionProperty, const QByteArray &selectionProperty, QueryBase::Reduce::Selector::Comparator comparator, FilterBase::Ptr source, DataStoreQuery *store)
-        : FilterBase(source, store),
+        : Filter(source, store),
        mReductionProperty(reductionProperty),
        mSelectionProperty(selectionProperty),
        mSelectionComparator(comparator)
@@ -236,6 +236,11 @@ public:
        for (const auto &r : results) {
            readEntity(r, [&, this](const Sink::ApplicationDomain::ApplicationDomainType &entity, Sink::Operation operation) {
+                //We need to apply all property filters that we have until the reduction, because the index lookup was unfiltered.
+                if (!matchesFilter(entity)) {
+                    return;
+                }
                Q_ASSERT(operation != Sink::Operation_Removal);
                for (auto &aggregator : mAggregators) {
                    if (!aggregator.property.isEmpty()) {
@@ -362,19 +367,22 @@ public:
 DataStoreQuery::DataStoreQuery(const Sink::QueryBase &query, const QByteArray &type, EntityStore &store)
    : mType(type), mStore(store), mLogCtx(store.logContext().subContext("datastorequery"))
 {
+    //This is what we use during a new query
    setupQuery(query);
 }
-DataStoreQuery::DataStoreQuery(const DataStoreQuery::State &state, const QByteArray &type, Sink::Storage::EntityStore &store)
+DataStoreQuery::DataStoreQuery(const DataStoreQuery::State &state, const QByteArray &type, Sink::Storage::EntityStore &store, bool incremental)
    : mType(type), mStore(store), mLogCtx(store.logContext().subContext("datastorequery"))
 {
+    //This is what we use when fetching more data, without having a new revision with incremental=false
+    //And this is what we use when the data changed and we want to update with incremental = true
    mCollector = state.mCollector;
    mSource = state.mSource;
    auto source = mCollector;
    while (source) {
        source->mDatastore = this;
-        source->mIncremental = true;
+        source->mIncremental = incremental;
        source = source->mSource;
    }
 }
@@ -553,6 +561,7 @@ void DataStoreQuery::setupQuery(const Sink::QueryBase &query_)
            for (const auto &aggregator : filter->aggregators) {
                reduction->mAggregators << Reduce::Aggregator(aggregator.operation, aggregator.propertyToCollect, aggregator.resultProperty);
            }
+            reduction->propertyFilter = query.getBaseFilters();
            baseSet = reduction;
        } else if (auto filter = stage.dynamicCast<Query::Bloom>()) {
            baseSet = Bloom::Ptr::create(filter->property, baseSet, this);
diff --git a/common/datastorequery.h b/common/datastorequery.h
index a797782..ee5f99e 100644
--- a/common/datastorequery.h
+++ b/common/datastorequery.h
@@ -46,7 +46,7 @@ public:
    };
    DataStoreQuery(const Sink::QueryBase &query, const QByteArray &type, Sink::Storage::EntityStore &store);
-    DataStoreQuery(const DataStoreQuery::State &state, const QByteArray &type, Sink::Storage::EntityStore &store);
+    DataStoreQuery(const DataStoreQuery::State &state, const QByteArray &type, Sink::Storage::EntityStore &store, bool incremental);
    ~DataStoreQuery();
    ResultSet execute();
    ResultSet update(qint64 baseRevision);
diff --git a/common/domain/addressbook.fbs b/common/domain/addressbook.fbs
new file mode 100644
index 0000000..c2bda2b
--- /dev/null
+++ b/common/domain/addressbook.fbs
@@ -0,0 +1,9 @@
+namespace Sink.ApplicationDomain.Buffer;
+table Addressbook {
+  name:string;
+  parent:string;
+}
+root_type Addressbook;
+file_identifier "AKFB";
diff --git a/common/domain/applicationdomaintype.cpp b/common/domain/applicationdomaintype.cpp
index fd88570..44f5a75 100644
--- a/common/domain/applicationdomaintype.cpp
+++ b/common/domain/applicationdomaintype.cpp
@@ -65,6 +65,9 @@ int registerProperty() {
    return 0;
 }
+#define SINK_REGISTER_ENTITY(ENTITY) \
+    constexpr const char *ENTITY::name;
 #define SINK_REGISTER_PROPERTY(ENTITYTYPE, PROPERTY) \
    constexpr const char *ENTITYTYPE::PROPERTY::name; \
    static int foo##ENTITYTYPE##PROPERTY = registerProperty<ENTITYTYPE, ENTITYTYPE::PROPERTY>();
@@ -72,6 +75,10 @@ int registerProperty() {
 namespace Sink {
 namespace ApplicationDomain {
+constexpr const char *SinkResource::name;
+constexpr const char *SinkAccount::name;
+SINK_REGISTER_ENTITY(Mail);
 SINK_REGISTER_PROPERTY(Mail, Sender);
 SINK_REGISTER_PROPERTY(Mail, To);
 SINK_REGISTER_PROPERTY(Mail, Cc);
@@ -90,11 +97,28 @@ SINK_REGISTER_PROPERTY(Mail, MessageId);
 SINK_REGISTER_PROPERTY(Mail, ParentMessageId);
 SINK_REGISTER_PROPERTY(Mail, ThreadId);
+SINK_REGISTER_ENTITY(Folder);
 SINK_REGISTER_PROPERTY(Folder, Name);
 SINK_REGISTER_PROPERTY(Folder, Icon);
 SINK_REGISTER_PROPERTY(Folder, SpecialPurpose);
 SINK_REGISTER_PROPERTY(Folder, Enabled);
 SINK_REGISTER_PROPERTY(Folder, Parent);
+SINK_REGISTER_PROPERTY(Folder, Count);
+SINK_REGISTER_PROPERTY(Folder, FullContentAvailable);
+SINK_REGISTER_ENTITY(Contact);
+SINK_REGISTER_PROPERTY(Contact, Uid);
+SINK_REGISTER_PROPERTY(Contact, Fn);
+SINK_REGISTER_PROPERTY(Contact, Firstname);
+SINK_REGISTER_PROPERTY(Contact, Lastname);
+SINK_REGISTER_PROPERTY(Contact, Emails);
+SINK_REGISTER_PROPERTY(Contact, Vcard);
+SINK_REGISTER_PROPERTY(Contact, Addressbook);
+SINK_REGISTER_ENTITY(Addressbook);
+SINK_REGISTER_PROPERTY(Addressbook, Name);
+SINK_REGISTER_PROPERTY(Addressbook, Parent);
+SINK_REGISTER_PROPERTY(Addressbook, LastUpdated);
 static const int foo = [] {
    QMetaType::registerEqualsComparator<Reference>();
@@ -115,10 +139,8 @@ void copyBuffer(Sink::ApplicationDomain::BufferAdaptor &buffer, Sink::Applicatio
    for (const auto &property : propertiesToCopy) {
        const auto value = buffer.getProperty(property);
        if (copyBlobs && value.canConvert<BLOB>()) {
-            auto oldPath = value.value<BLOB>().value;
+            const auto oldPath = value.value<BLOB>().value;
-            //FIXME: This is neither pretty nor save if we have multiple modifications of the same property (the first modification will remove the file).
+            const auto newPath = Sink::temporaryFileLocation() + "/" + QUuid::createUuid().toString();
-            //At least if the modification fails the file will be removed once the entity is removed.
-            auto newPath = oldPath + "copy";
            QFile::copy(oldPath, newPath);
            memoryAdaptor.setProperty(property, QVariant::fromValue(BLOB{newPath}));
        } else if (pruneReferences && value.canConvert<Reference>()) {
@@ -364,52 +386,12 @@ SinkResource ImapResource::create(const QByteArray &account)
    return resource;
 }
-template<>
+SinkResource CardDavResource::create(const QByteArray &account)
-QByteArray getTypeName<Contact>()
-{
-    return "contact";
-}
-template<>
-QByteArray getTypeName<Event>()
-{
-    return "event";
-}
-template<>
-QByteArray getTypeName<Todo>()
-{
-    return "todo";
-}
-template<>
-QByteArray getTypeName<SinkResource>()
-{
-    return "resource";
-}
-template<>
-QByteArray getTypeName<SinkAccount>()
-{
-    return "account";
-}
-template<>
-QByteArray getTypeName<Identity>()
-{
-    return "identity";
-}
-template<>
-QByteArray getTypeName<Mail>()
 {
-    return "mail";
+    auto &&resource = ApplicationDomainType::createEntity<SinkResource>();
-}
+    resource.setResourceType("sink.dav");
+    resource.setAccount(account);
-template<>
+    return resource;
-QByteArray getTypeName<Folder>()
-{
-    return "folder";
 }
 QByteArrayList getTypeNames()
diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index be04db9..e5aa46e 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -28,7 +28,8 @@
 #include <QUuid>
 #include "bufferadaptor.h"
-#define SINK_ENTITY(TYPE) \
+#define SINK_ENTITY(TYPE, LOWERCASENAME) \
+    static constexpr const char *name = #LOWERCASENAME; \
    typedef QSharedPointer<TYPE> Ptr; \
    using Entity::Entity; \
    TYPE() = default; \
@@ -92,6 +93,43 @@
 namespace Sink {
 namespace ApplicationDomain {
+enum SINK_EXPORT ErrorCode {
+    NoError = 0,
+    UnknownError,
+    NoServerError,
+    ConnectionError,
+    LoginError,
+    ConfigurationError,
+    TransmissionError,
+};
+enum SINK_EXPORT SuccessCode {
+    TransmissionSuccess
+};
+enum SINK_EXPORT SyncStatus {
+    NoSyncStatus,
+    SyncInProgress,
+    SyncError,
+    SyncSuccess
+};
+/**
+ * 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 Error {
 };
@@ -100,6 +138,11 @@ struct SINK_EXPORT Progress {
 };
+/**
+ * Internal type.
+ *
+ * Represents a BLOB property.
+ */
 struct BLOB {
    BLOB() = default;
    BLOB(const BLOB &) = default;
@@ -268,6 +311,7 @@ SINK_EXPORT QDebug operator<< (QDebug d, const BLOB &blob);
 struct SINK_EXPORT SinkAccount : public ApplicationDomainType {
+    static constexpr const char *name = "account";
    typedef QSharedPointer<SinkAccount> Ptr;
    explicit SinkAccount(const QByteArray &resourceInstanceIdentifier, const QByteArray &identifier, qint64 revision, const QSharedPointer<BufferAdaptor> &adaptor);
    explicit SinkAccount(const QByteArray &identifier);
@@ -278,8 +322,6 @@ struct SINK_EXPORT SinkAccount : public ApplicationDomainType {
    SINK_PROPERTY(QString, Icon, icon);
    SINK_PROPERTY(QString, AccountType, type);
    SINK_STATUS_PROPERTY(int, Status, status);
-    SINK_STATUS_PROPERTY(ApplicationDomain::Error, Error, error);
-    SINK_STATUS_PROPERTY(ApplicationDomain::Progress, Progress, progress);
 };
@@ -290,6 +332,7 @@ struct SINK_EXPORT SinkAccount : public ApplicationDomainType {
 * and for creating and removing resource instances.
 */
 struct SINK_EXPORT SinkResource : public ApplicationDomainType {
+    static constexpr const char *name = "resource";
    typedef QSharedPointer<SinkResource> Ptr;
    explicit SinkResource(const QByteArray &resourceInstanceIdentifier, const QByteArray &identifier, qint64 revision, const QSharedPointer<BufferAdaptor> &adaptor);
    explicit SinkResource(const QByteArray &identifier);
@@ -300,8 +343,6 @@ struct SINK_EXPORT SinkResource : public ApplicationDomainType {
    SINK_PROPERTY(QByteArray, ResourceType, type);
    SINK_PROPERTY(QByteArrayList, Capabilities, capabilities);
    SINK_STATUS_PROPERTY(int, Status, status);
-    SINK_STATUS_PROPERTY(ApplicationDomain::Error, Error, error);
-    SINK_STATUS_PROPERTY(ApplicationDomain::Progress, Progress, progress);
 };
 struct SINK_EXPORT Entity : public ApplicationDomainType {
@@ -312,16 +353,35 @@ struct SINK_EXPORT Entity : public ApplicationDomainType {
    virtual ~Entity() = default;
 };
+struct SINK_EXPORT Addressbook : public Entity {
+    SINK_ENTITY(Addressbook, addressbook);
+    SINK_REFERENCE_PROPERTY(Addressbook, Parent, parent);
+    SINK_PROPERTY(QString, Name, name);
+    SINK_EXTRACTED_PROPERTY(QDateTime, LastUpdated, lastUpdated);
+};
 struct SINK_EXPORT Contact : public Entity {
-    SINK_ENTITY(Contact);
+    struct SINK_EXPORT Email {
+        enum Type {
+            Undefined,
+            Work,
+            Home
+        };
+        Type type;
+        QString email;
+    };
+    SINK_ENTITY(Contact, contact);
    SINK_PROPERTY(QString, Uid, uid);
    SINK_PROPERTY(QString, Fn, fn);
-    SINK_PROPERTY(QByteArrayList, Emails, emails);
+    SINK_PROPERTY(QString, Firstname, firstname);
+    SINK_PROPERTY(QString, Lastname, lastname);
+    SINK_PROPERTY(QList<Email>, Emails, emails);
    SINK_PROPERTY(QByteArray, Vcard, vcard);
+    SINK_REFERENCE_PROPERTY(Addressbook, Addressbook, addressbook);
 };
 struct SINK_EXPORT Event : public Entity {
-    SINK_ENTITY(Event);
+    SINK_ENTITY(Event, event);
    SINK_PROPERTY(QString, Uid, uid);
    SINK_PROPERTY(QString, Summary, summary);
    SINK_PROPERTY(QString, Description, description);
@@ -329,20 +389,23 @@ struct SINK_EXPORT Event : public Entity {
 };
 struct SINK_EXPORT Todo : public Entity {
-    SINK_ENTITY(Todo);
+    SINK_ENTITY(Todo, todo);
 };
 struct SINK_EXPORT Calendar : public Entity {
-    SINK_ENTITY(Calendar);
+    SINK_ENTITY(Calendar, calendar);
 };
 struct SINK_EXPORT Folder : public Entity {
-    SINK_ENTITY(Folder);
+    SINK_ENTITY(Folder, folder);
    SINK_REFERENCE_PROPERTY(Folder, Parent, parent);
    SINK_PROPERTY(QString, Name, name);
    SINK_PROPERTY(QByteArray, Icon, icon);
    SINK_PROPERTY(QByteArrayList, SpecialPurpose, specialpurpose);
    SINK_PROPERTY(bool, Enabled, enabled);
+    SINK_EXTRACTED_PROPERTY(QDateTime, LastUpdated, lastUpdated);
+    SINK_EXTRACTED_PROPERTY(int, Count, count);
+    SINK_EXTRACTED_PROPERTY(bool, FullContentAvailable, fullContentAvailable);
 };
 struct SINK_EXPORT Mail : public Entity {
@@ -351,7 +414,7 @@ struct SINK_EXPORT Mail : public Entity {
        QString emailAddress;
    };
-    SINK_ENTITY(Mail);
+    SINK_ENTITY(Mail, mail);
    SINK_EXTRACTED_PROPERTY(Contact, Sender, sender);
    SINK_EXTRACTED_PROPERTY(QList<Contact>, To, to);
    SINK_EXTRACTED_PROPERTY(QList<Contact>, Cc, cc);
@@ -373,23 +436,8 @@ struct SINK_EXPORT Mail : public Entity {
 SINK_EXPORT QDebug operator<< (QDebug d, const Mail::Contact &c);
-/**
- * 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 Identity : public ApplicationDomainType {
+    static constexpr const char *name = "identity";
    typedef QSharedPointer<Identity> Ptr;
    explicit Identity(const QByteArray &resourceInstanceIdentifier, const QByteArray &identifier, qint64 revision, const QSharedPointer<BufferAdaptor> &adaptor);
    explicit Identity(const QByteArray &identifier);
@@ -416,6 +464,10 @@ struct SINK_EXPORT ImapResource {
    static SinkResource create(const QByteArray &account);
 };
+struct SINK_EXPORT CardDavResource {
+    static SinkResource create(const QByteArray &account);
+};
 namespace ResourceCapabilities {
 namespace Mail {
    static constexpr const char *mail = "mail";
@@ -427,6 +479,11 @@ namespace Mail {
    static constexpr const char *transport = "mail.transport";
    static constexpr const char *folderhierarchy = "mail.folderhierarchy";
 };
+namespace Contact {
+    static constexpr const char *contact = "contact";
+    static constexpr const char *addressbook = "addressbook";
+    static constexpr const char *storage = "contact.storage";
+};
 };
 namespace SpecialPurpose {
@@ -444,31 +501,10 @@ namespace Mail {
 * Do not store these types to disk, they may change over time.
 */
 template<class DomainType>
-QByteArray SINK_EXPORT getTypeName();
+QByteArray SINK_EXPORT getTypeName()
+{
-template<>
+    return DomainType::name;
-QByteArray SINK_EXPORT getTypeName<Contact>();
+}
-template<>
-QByteArray SINK_EXPORT getTypeName<Event>();
-template<>
-QByteArray SINK_EXPORT getTypeName<Todo>();
-template<>
-QByteArray SINK_EXPORT getTypeName<SinkResource>();
-template<>
-QByteArray SINK_EXPORT getTypeName<SinkAccount>();
-template<>
-QByteArray SINK_EXPORT getTypeName<Identity>();
-template<>
-QByteArray SINK_EXPORT getTypeName<Mail>();
-template<>
-QByteArray SINK_EXPORT getTypeName<Folder>();
 QByteArrayList SINK_EXPORT getTypeNames();
@@ -499,6 +535,7 @@ class SINK_EXPORT TypeImplementation;
 */
 #define SINK_REGISTER_TYPES() \
    REGISTER_TYPE(Sink::ApplicationDomain::Contact) \
+    REGISTER_TYPE(Sink::ApplicationDomain::Addressbook) \
    REGISTER_TYPE(Sink::ApplicationDomain::Event) \
    REGISTER_TYPE(Sink::ApplicationDomain::Mail) \
    REGISTER_TYPE(Sink::ApplicationDomain::Folder) \
@@ -520,6 +557,7 @@ Q_DECLARE_METATYPE(Sink::ApplicationDomain::ApplicationDomainType::Ptr)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::Entity)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::Entity::Ptr)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::Mail::Contact)
+Q_DECLARE_METATYPE(Sink::ApplicationDomain::Contact::Email)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::Error)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::Progress)
 Q_DECLARE_METATYPE(Sink::ApplicationDomain::BLOB)
diff --git a/common/domain/applicationdomaintype_p.h b/common/domain/applicationdomaintype_p.h
index 4b06864..a5a6b1d 100644
--- a/common/domain/applicationdomaintype_p.h
+++ b/common/domain/applicationdomaintype_p.h
@@ -33,13 +33,15 @@ struct TypeHelper {
    template <typename R, typename ...Args>
    R operator()(Args && ... args) const {
        if (type == Sink::ApplicationDomain::getTypeName<Sink::ApplicationDomain::Folder>()) {
-            return Func<Sink::ApplicationDomain::Folder>{}(std::forward<Args...>(args...)); 
+            return Func<Sink::ApplicationDomain::Folder>{}(std::forward<Args...>(args...));
        } else if (type == Sink::ApplicationDomain::getTypeName<Sink::ApplicationDomain::Mail>()) {
-            return Func<Sink::ApplicationDomain::Mail>{}(std::forward<Args...>(args...)); 
+            return Func<Sink::ApplicationDomain::Mail>{}(std::forward<Args...>(args...));
        } else if (type == Sink::ApplicationDomain::getTypeName<Sink::ApplicationDomain::Event>()) {
-            return Func<Sink::ApplicationDomain::Event>{}(std::forward<Args...>(args...)); 
+            return Func<Sink::ApplicationDomain::Event>{}(std::forward<Args...>(args...));
        } else if (type == Sink::ApplicationDomain::getTypeName<Sink::ApplicationDomain::Contact>()) {
            return Func<Sink::ApplicationDomain::Contact>{}(std::forward<Args...>(args...));
+        } else if (type == Sink::ApplicationDomain::getTypeName<Sink::ApplicationDomain::Addressbook>()) {
+            return Func<Sink::ApplicationDomain::Addressbook>{}(std::forward<Args...>(args...));
        } else {
            Q_ASSERT(false);
        }
diff --git a/common/domain/contact.cpp b/common/domain/contact.cpp
deleted file mode 100644
index ea7cac2..0000000
--- a/common/domain/contact.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2017 Sandro Knauß <knauss@kolabsys.com>
- *
- *   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 "contact.h"
-#include <QVector>
-#include <QByteArray>
-#include <QString>
-#include "../propertymapper.h"
-#include "../typeindex.h"
-#include "entity_generated.h"
-#include "contact_generated.h"
-using namespace Sink::ApplicationDomain;
-void TypeImplementation<Contact>::configure(TypeIndex &index)
-{
-    index.addProperty<QByteArray>(Contact::Uid::name);
-}
-void TypeImplementation<Contact>::configure(ReadPropertyMapper<Buffer> &propertyMapper)
-{
-    propertyMapper.addMapping<Contact::Uid, Buffer>(&Buffer::uid);
-    propertyMapper.addMapping<Contact::Fn, Buffer>(&Buffer::fn);
-    propertyMapper.addMapping<Contact::Emails, Buffer>(&Buffer::emails);
-    propertyMapper.addMapping<Contact::Vcard, Buffer>(&Buffer::vcard);
-}
-void TypeImplementation<Contact>::configure(WritePropertyMapper<BufferBuilder> &propertyMapper)
-{
-    propertyMapper.addMapping<Contact::Uid>(&BufferBuilder::add_uid);
-    propertyMapper.addMapping<Contact::Fn>(&BufferBuilder::add_fn);
-    propertyMapper.addMapping<Contact::Emails>(&BufferBuilder::add_emails);
-    propertyMapper.addMapping<Contact::Vcard>(&BufferBuilder::add_vcard);
-}
-void TypeImplementation<Contact>::configure(IndexPropertyMapper &)
-{
-}
diff --git a/common/domain/contact.fbs b/common/domain/contact.fbs
index 34fb1d6..d941d5a 100644
--- a/common/domain/contact.fbs
+++ b/common/domain/contact.fbs
@@ -1,9 +1,17 @@
 namespace Sink.ApplicationDomain.Buffer;
+table ContactEmail {
+    type: int;
+    email: string;
+}
 table Contact {
  uid:string;
  fn:string;
-  emails: [string];
+  firstname:string;
+  lastname:string;
+  addressbook:string;
+  emails: [ContactEmail];
  vcard: string;
 }
diff --git a/common/domain/contact.h b/common/domain/contact.h
deleted file mode 100644
index c803a9f..0000000
--- a/common/domain/contact.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2017 Sandro Knauß <knauss@kolabsys.com>
- *
- *   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.
- */
-#pragma once
-#include "applicationdomaintype.h"
-class QByteArray;
-template<typename T>
-class ReadPropertyMapper;
-template<typename T>
-class WritePropertyMapper;
-class IndexPropertyMapper;
-class TypeIndex;
-namespace Sink {
-namespace ApplicationDomain {
-    namespace Buffer {
-        struct Contact;
-        struct ContactBuilder;
-    }
-/**
- * Implements all type-specific code such as updating and querying indexes.
- * 
- * These are type specifiy default implementations. Theoretically a resource could implement it's own implementation.
- */
-template<>
-class TypeImplementation<Sink::ApplicationDomain::Contact> {
-public:
-    typedef Sink::ApplicationDomain::Buffer::Contact Buffer;
-    typedef Sink::ApplicationDomain::Buffer::ContactBuilder BufferBuilder;
-    static void configure(TypeIndex &);
-    static void configure(ReadPropertyMapper<Buffer> &);
-    static void configure(WritePropertyMapper<BufferBuilder> &);
-    static void configure(IndexPropertyMapper &indexPropertyMapper);
-};
-}
-}
diff --git a/common/domain/domaintypes.h b/common/domain/domaintypes.h
deleted file mode 100644
index 0abdee7..0000000
--- a/common/domain/domaintypes.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "contact.h"
-#include "mail.h"
-#include "folder.h"
-#include "event.h"
diff --git a/common/domain/event.cpp b/common/domain/event.cpp
deleted file mode 100644
index 10c92bb..0000000
--- a/common/domain/event.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2014 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 "event.h"
-#include <QVector>
-#include <QByteArray>
-#include <QString>
-#include "../propertymapper.h"
-#include "../typeindex.h"
-#include "entity_generated.h"
-#include "event_generated.h"
-using namespace Sink::ApplicationDomain;
-void TypeImplementation<Event>::configure(TypeIndex &index)
-{
-    index.addProperty<QByteArray>(Event::Uid::name);
-}
-void TypeImplementation<Event>::configure(ReadPropertyMapper<Buffer> &propertyMapper)
-{
-    propertyMapper.addMapping<Event::Summary, Buffer>(&Buffer::summary);
-    propertyMapper.addMapping<Event::Description, Buffer>(&Buffer::description);
-    propertyMapper.addMapping<Event::Uid, Buffer>(&Buffer::uid);
-    propertyMapper.addMapping<Event::Attachment, Buffer>(&Buffer::attachment);
-}
-void TypeImplementation<Event>::configure(WritePropertyMapper<BufferBuilder> &propertyMapper)
-{
-    propertyMapper.addMapping<Event::Summary>(&BufferBuilder::add_summary);
-    propertyMapper.addMapping<Event::Description>(&BufferBuilder::add_description);
-    propertyMapper.addMapping<Event::Uid>(&BufferBuilder::add_uid);
-    propertyMapper.addMapping<Event::Attachment>(&BufferBuilder::add_attachment);
-}
-void TypeImplementation<Event>::configure(IndexPropertyMapper &)
-{
-}
diff --git a/common/domain/event.h b/common/domain/event.h
deleted file mode 100644
index b683f5f..0000000
--- a/common/domain/event.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2014 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.
- */
-#pragma once
-#include "applicationdomaintype.h"
-class QByteArray;
-template<typename T>
-class ReadPropertyMapper;
-template<typename T>
-class WritePropertyMapper;
-class IndexPropertyMapper;
-class TypeIndex;
-namespace Sink {
-namespace ApplicationDomain {
-    namespace Buffer {
-        struct Event;
-        struct EventBuilder;
-    }
-/**
- * Implements all type-specific code such as updating and querying indexes.
- * 
- * These are type specifiy default implementations. Theoretically a resource could implement it's own implementation.
- */
-template<>
-class TypeImplementation<Sink::ApplicationDomain::Event> {
-public:
-    typedef Sink::ApplicationDomain::Buffer::Event Buffer;
-    typedef Sink::ApplicationDomain::Buffer::EventBuilder BufferBuilder;
-    static void configure(TypeIndex &);
-    static void configure(ReadPropertyMapper<Buffer> &);
-    static void configure(WritePropertyMapper<BufferBuilder> &);
-    static void configure(IndexPropertyMapper &indexPropertyMapper);
-};
-}
-}
diff --git a/common/domain/folder.cpp b/common/domain/folder.cpp
deleted file mode 100644
index 6717661..0000000
--- a/common/domain/folder.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *   Copyright (C) 2015 Christian Mollekopf <chrigi_1@fastfolder.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 "folder.h"
-#include <QByteArray>
-#include <QString>
-#include "../propertymapper.h"
-#include "../typeindex.h"
-#include "entitybuffer.h"
-#include "entity_generated.h"
-#include "folder_generated.h"
-using namespace Sink::ApplicationDomain;
-void TypeImplementation<Folder>::configure(TypeIndex &index)
-{
-    index.addProperty<QByteArray>(Folder::Parent::name);
-    index.addProperty<QString>(Folder::Name::name);
-}
-void TypeImplementation<Folder>::configure(ReadPropertyMapper<Buffer> &propertyMapper)
-{
-    propertyMapper.addMapping<Folder::Parent, Buffer>(&Buffer::parent);
-    propertyMapper.addMapping<Folder::Name, Buffer>(&Buffer::name);
-    propertyMapper.addMapping<Folder::Icon, Buffer>(&Buffer::icon);
-    propertyMapper.addMapping<Folder::SpecialPurpose, Buffer>(&Buffer::specialpurpose);
-    propertyMapper.addMapping<Folder::Enabled, Buffer>(&Buffer::enabled);
-}
-void TypeImplementation<Folder>::configure(WritePropertyMapper<BufferBuilder> &propertyMapper)
-{
-    propertyMapper.addMapping<Folder::Parent>(&BufferBuilder::add_parent);
-    propertyMapper.addMapping<Folder::Name>(&BufferBuilder::add_name);
-    propertyMapper.addMapping<Folder::Icon>(&BufferBuilder::add_icon);
-    propertyMapper.addMapping<Folder::SpecialPurpose>(&BufferBuilder::add_specialpurpose);
-    propertyMapper.addMapping<Folder::Enabled>(&BufferBuilder::add_enabled);
-}
-void TypeImplementation<Folder>::configure(IndexPropertyMapper &)
-{
-}
diff --git a/common/domain/folder.h b/common/domain/folder.h
deleted file mode 100644
index f232ab5..0000000
--- a/common/domain/folder.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2015 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.
- */
-#pragma once
-#include "applicationdomaintype.h"
-template<typename T>
-class ReadPropertyMapper;
-template<typename T>
-class WritePropertyMapper;
-class IndexPropertyMapper;
-class TypeIndex;
-namespace Sink {
-namespace ApplicationDomain {
-    namespace Buffer {
-        struct Folder;
-        struct FolderBuilder;
-    }
-template<>
-class TypeImplementation<Sink::ApplicationDomain::Folder> {
-public:
-    typedef Sink::ApplicationDomain::Buffer::Folder Buffer;
-    typedef Sink::ApplicationDomain::Buffer::FolderBuilder BufferBuilder;
-    static void configure(TypeIndex &);
-    static void configure(ReadPropertyMapper<Buffer> &);
-    static void configure(WritePropertyMapper<BufferBuilder> &);
-    static void configure(IndexPropertyMapper &indexPropertyMapper);
-};
-}
-}
diff --git a/common/domain/mail.h b/common/domain/mail.h
deleted file mode 100644
index e052448..0000000
--- a/common/domain/mail.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2015 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.
- */
-#pragma once
-#include "applicationdomaintype.h"
-class QByteArray;
-template<typename T>
-class ReadPropertyMapper;
-template<typename T>
-class WritePropertyMapper;
-class IndexPropertyMapper;
-class TypeIndex;
-namespace Sink {
-namespace ApplicationDomain {
-    namespace Buffer {
-        struct Mail;
-        struct MailBuilder;
-    }
-template<>
-class TypeImplementation<Sink::ApplicationDomain::Mail> {
-public:
-    typedef Sink::ApplicationDomain::Buffer::Mail Buffer;
-    typedef Sink::ApplicationDomain::Buffer::MailBuilder BufferBuilder;
-    static void configure(TypeIndex &index);
-    static void configure(ReadPropertyMapper<Buffer> &propertyMapper);
-    static void configure(WritePropertyMapper<BufferBuilder> &propertyMapper);
-    static void configure(IndexPropertyMapper &indexPropertyMapper);
-};
-}
-}
diff --git a/common/domain/propertyregistry.cpp b/common/domain/propertyregistry.cpp
index 2208193..7b9b61a 100644
--- a/common/domain/propertyregistry.cpp
+++ b/common/domain/propertyregistry.cpp
@@ -64,6 +64,17 @@ QVariant parseString<bool>(const QString &s)
 }
 template <>
+QVariant parseString<int>(const QString &s)
+{
+    bool ok = false;
+    auto n = s.toInt(&ok);
+    if (ok) {
+        return QVariant::fromValue(n);
+    }
+    return {};
+}
+template <>
 QVariant parseString<QList<QByteArray>>(const QString &s)
 {
    auto list = s.split(',');
@@ -92,6 +103,13 @@ QVariant parseString<QList<Sink::ApplicationDomain::Mail::Contact>>(const QStrin
    return QVariant{};
 }
+template <>
+QVariant parseString<QList<Sink::ApplicationDomain::Contact::Email>>(const QString &s)
+{
+    Q_ASSERT(false);
+    return QVariant{};
+}
 PropertyRegistry &PropertyRegistry::instance()
 {
    static PropertyRegistry instance;
diff --git a/common/domain/propertyregistry.h b/common/domain/propertyregistry.h
index 16df23b..758c10d 100644
--- a/common/domain/propertyregistry.h
+++ b/common/domain/propertyregistry.h
@@ -49,6 +49,9 @@ template <>
 QVariant parseString<bool>(const QString &s);
 template <>
+QVariant parseString<int>(const QString &s);
+template <>
 QVariant parseString<QList<QByteArray>>(const QString &s);
 template <>
diff --git a/common/domain/mail.cpp b/common/domain/typeimplementations.cpp
index 8cbe61b..eb3851e 100644
--- a/common/domain/mail.cpp
+++ b/common/domain/typeimplementations.cpp
@@ -16,7 +16,7 @@
 *   Free Software Foundation, Inc.,
 *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
 */
-#include "mail.h"
+#include "typeimplementations.h"
 #include <QVector>
 #include <QByteArray>
@@ -29,8 +29,6 @@
 #include "mail/threadindexer.h"
 #include "domainadaptor.h"
-#include "mail_generated.h"
 using namespace Sink;
 using namespace Sink::ApplicationDomain;
@@ -102,3 +100,117 @@ void TypeImplementation<Mail>::configure(WritePropertyMapper<BufferBuilder> &pro
    propertyMapper.addMapping<Mail::MessageId>(&BufferBuilder::add_messageId);
    propertyMapper.addMapping<Mail::ParentMessageId>(&BufferBuilder::add_parentMessageId);
 }
+void TypeImplementation<Folder>::configure(TypeIndex &index)
+{
+    index.addProperty<QByteArray>(Folder::Parent::name);
+    index.addProperty<QString>(Folder::Name::name);
+}
+void TypeImplementation<Folder>::configure(ReadPropertyMapper<Buffer> &propertyMapper)
+{
+    propertyMapper.addMapping<Folder::Parent, Buffer>(&Buffer::parent);
+    propertyMapper.addMapping<Folder::Name, Buffer>(&Buffer::name);
+    propertyMapper.addMapping<Folder::Icon, Buffer>(&Buffer::icon);
+    propertyMapper.addMapping<Folder::SpecialPurpose, Buffer>(&Buffer::specialpurpose);
+    propertyMapper.addMapping<Folder::Enabled, Buffer>(&Buffer::enabled);
+}
+void TypeImplementation<Folder>::configure(WritePropertyMapper<BufferBuilder> &propertyMapper)
+{
+    propertyMapper.addMapping<Folder::Parent>(&BufferBuilder::add_parent);
+    propertyMapper.addMapping<Folder::Name>(&BufferBuilder::add_name);
+    propertyMapper.addMapping<Folder::Icon>(&BufferBuilder::add_icon);
+    propertyMapper.addMapping<Folder::SpecialPurpose>(&BufferBuilder::add_specialpurpose);
+    propertyMapper.addMapping<Folder::Enabled>(&BufferBuilder::add_enabled);
+}
+void TypeImplementation<Folder>::configure(IndexPropertyMapper &)
+{
+}
+void TypeImplementation<Contact>::configure(TypeIndex &index)
+{
+    index.addProperty<QByteArray>(Contact::Uid::name);
+}
+void TypeImplementation<Contact>::configure(ReadPropertyMapper<Buffer> &propertyMapper)
+{
+    propertyMapper.addMapping<Contact::Uid, Buffer>(&Buffer::uid);
+    propertyMapper.addMapping<Contact::Fn, Buffer>(&Buffer::fn);
+    propertyMapper.addMapping<Contact::Emails, Buffer>(&Buffer::emails);
+    propertyMapper.addMapping<Contact::Vcard, Buffer>(&Buffer::vcard);
+    propertyMapper.addMapping<Contact::Addressbook, Buffer>(&Buffer::addressbook);
+    propertyMapper.addMapping<Contact::Firstname, Buffer>(&Buffer::firstname);
+    propertyMapper.addMapping<Contact::Lastname, Buffer>(&Buffer::lastname);
+}
+void TypeImplementation<Contact>::configure(WritePropertyMapper<BufferBuilder> &propertyMapper)
+{
+    propertyMapper.addMapping<Contact::Uid>(&BufferBuilder::add_uid);
+    propertyMapper.addMapping<Contact::Fn>(&BufferBuilder::add_fn);
+    propertyMapper.addMapping<Contact::Emails>(&BufferBuilder::add_emails);
+    propertyMapper.addMapping<Contact::Vcard>(&BufferBuilder::add_vcard);
+    propertyMapper.addMapping<Contact::Addressbook>(&BufferBuilder::add_addressbook);
+    propertyMapper.addMapping<Contact::Firstname>(&BufferBuilder::add_firstname);
+    propertyMapper.addMapping<Contact::Lastname>(&BufferBuilder::add_lastname);
+}
+void TypeImplementation<Contact>::configure(IndexPropertyMapper &)
+{
+}
+void TypeImplementation<Addressbook>::configure(TypeIndex &index)
+{
+    index.addProperty<QByteArray>(Addressbook::Parent::name);
+    index.addProperty<QString>(Addressbook::Name::name);
+}
+void TypeImplementation<Addressbook>::configure(ReadPropertyMapper<Buffer> &propertyMapper)
+{
+    propertyMapper.addMapping<Addressbook::Parent, Buffer>(&Buffer::parent);
+    propertyMapper.addMapping<Addressbook::Name, Buffer>(&Buffer::name);
+}
+void TypeImplementation<Addressbook>::configure(WritePropertyMapper<BufferBuilder> &propertyMapper)
+{
+    propertyMapper.addMapping<Addressbook::Parent>(&BufferBuilder::add_parent);
+    propertyMapper.addMapping<Addressbook::Name>(&BufferBuilder::add_name);
+}
+void TypeImplementation<Addressbook>::configure(IndexPropertyMapper &)
+{
+}
+void TypeImplementation<Event>::configure(TypeIndex &index)
+{
+    index.addProperty<QByteArray>(Event::Uid::name);
+}
+void TypeImplementation<Event>::configure(ReadPropertyMapper<Buffer> &propertyMapper)
+{
+    propertyMapper.addMapping<Event::Summary, Buffer>(&Buffer::summary);
+    propertyMapper.addMapping<Event::Description, Buffer>(&Buffer::description);
+    propertyMapper.addMapping<Event::Uid, Buffer>(&Buffer::uid);
+    propertyMapper.addMapping<Event::Attachment, Buffer>(&Buffer::attachment);
+}
+void TypeImplementation<Event>::configure(WritePropertyMapper<BufferBuilder> &propertyMapper)
+{
+    propertyMapper.addMapping<Event::Summary>(&BufferBuilder::add_summary);
+    propertyMapper.addMapping<Event::Description>(&BufferBuilder::add_description);
+    propertyMapper.addMapping<Event::Uid>(&BufferBuilder::add_uid);
+    propertyMapper.addMapping<Event::Attachment>(&BufferBuilder::add_attachment);
+}
+void TypeImplementation<Event>::configure(IndexPropertyMapper &)
+{
+}
diff --git a/common/domain/typeimplementations.h b/common/domain/typeimplementations.h
new file mode 100644
index 0000000..37d6ca9
--- /dev/null
+++ b/common/domain/typeimplementations.h
@@ -0,0 +1,101 @@
+/*
+ *   Copyright (C) 2015 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.
+ */
+#pragma once
+#include "applicationdomaintype.h"
+#include "mail_generated.h"
+#include "folder_generated.h"
+#include "event_generated.h"
+#include "contact_generated.h"
+#include "addressbook_generated.h"
+template<typename T>
+class ReadPropertyMapper;
+template<typename T>
+class WritePropertyMapper;
+class IndexPropertyMapper;
+class TypeIndex;
+/**
+ * Implements all type-specific code such as updating and querying indexes.
+ *
+ * These are type specifiy default implementations. Theoretically a resource could implement it's own implementation.
+ */
+namespace Sink {
+namespace ApplicationDomain {
+template<>
+class TypeImplementation<Sink::ApplicationDomain::Mail> {
+public:
+    typedef Sink::ApplicationDomain::Buffer::Mail Buffer;
+    typedef Sink::ApplicationDomain::Buffer::MailBuilder BufferBuilder;
+    static void configure(TypeIndex &index);
+    static void configure(ReadPropertyMapper<Buffer> &propertyMapper);
+    static void configure(WritePropertyMapper<BufferBuilder> &propertyMapper);
+    static void configure(IndexPropertyMapper &indexPropertyMapper);
+};
+template<>
+class TypeImplementation<Sink::ApplicationDomain::Folder> {
+public:
+    typedef Sink::ApplicationDomain::Buffer::Folder Buffer;
+    typedef Sink::ApplicationDomain::Buffer::FolderBuilder BufferBuilder;
+    static void configure(TypeIndex &);
+    static void configure(ReadPropertyMapper<Buffer> &);
+    static void configure(WritePropertyMapper<BufferBuilder> &);
+    static void configure(IndexPropertyMapper &indexPropertyMapper);
+};
+template<>
+class TypeImplementation<Sink::ApplicationDomain::Contact> {
+public:
+    typedef Sink::ApplicationDomain::Buffer::Contact Buffer;
+    typedef Sink::ApplicationDomain::Buffer::ContactBuilder BufferBuilder;
+    static void configure(TypeIndex &);
+    static void configure(ReadPropertyMapper<Buffer> &);
+    static void configure(WritePropertyMapper<BufferBuilder> &);
+    static void configure(IndexPropertyMapper &indexPropertyMapper);
+};
+template<>
+class TypeImplementation<Sink::ApplicationDomain::Addressbook> {
+public:
+    typedef Sink::ApplicationDomain::Buffer::Addressbook Buffer;
+    typedef Sink::ApplicationDomain::Buffer::AddressbookBuilder BufferBuilder;
+    static void configure(TypeIndex &);
+    static void configure(ReadPropertyMapper<Buffer> &);
+    static void configure(WritePropertyMapper<BufferBuilder> &);
+    static void configure(IndexPropertyMapper &indexPropertyMapper);
+};
+template<>
+class TypeImplementation<Sink::ApplicationDomain::Event> {
+public:
+    typedef Sink::ApplicationDomain::Buffer::Event Buffer;
+    typedef Sink::ApplicationDomain::Buffer::EventBuilder BufferBuilder;
+    static void configure(TypeIndex &);
+    static void configure(ReadPropertyMapper<Buffer> &);
+    static void configure(WritePropertyMapper<BufferBuilder> &);
+    static void configure(IndexPropertyMapper &indexPropertyMapper);
+};
+}
+}
diff --git a/common/domainadaptor.h b/common/domainadaptor.h
index 0377ef4..af5d5fc 100644
--- a/common/domainadaptor.h
+++ b/common/domainadaptor.h
@@ -26,10 +26,7 @@
 #include "domaintypeadaptorfactoryinterface.h"
 #include "domain/applicationdomaintype.h"
-#include "domain/contact.h"
+#include "domain/typeimplementations.h"
-#include "domain/event.h"
-#include "domain/mail.h"
-#include "domain/folder.h"
 #include "bufferadaptor.h"
 #include "entity_generated.h"
 #include "metadata_generated.h"
@@ -245,3 +242,15 @@ protected:
    QSharedPointer<WritePropertyMapper<ResourceBuilder>> mResourceWriteMapper;
    QSharedPointer<IndexPropertyMapper> mIndexMapper;
 };
+/**
+ * A default adaptorfactory implemenation that simply instantiates a generic resource
+ */
+template<typename DomainType>
+class DefaultAdaptorFactory : public DomainTypeAdaptorFactory<DomainType>
+{
+public:
+    DefaultAdaptorFactory() : DomainTypeAdaptorFactory<DomainType>()  {}
+    virtual ~DefaultAdaptorFactory(){}
+};
diff --git a/common/genericresource.cpp b/common/genericresource.cpp
index 5ba9e5d..7178b3d 100644
--- a/common/genericresource.cpp
+++ b/common/genericresource.cpp
@@ -31,8 +31,8 @@ using namespace Sink::Storage;
 GenericResource::GenericResource(const ResourceContext &resourceContext, const QSharedPointer<Pipeline> &pipeline )
    : Sink::Resource(),
      mResourceContext(resourceContext),
-      mPipeline(pipeline ? pipeline : QSharedPointer<Sink::Pipeline>::create(resourceContext, "resource." + resourceContext.instanceId())),
+      mPipeline(pipeline ? pipeline : QSharedPointer<Sink::Pipeline>::create(resourceContext, Log::Context{})),
-      mProcessor(QSharedPointer<CommandProcessor>::create(mPipeline.data(), resourceContext.instanceId(), "resource." + resourceContext.instanceId())),
+      mProcessor(QSharedPointer<CommandProcessor>::create(mPipeline.data(), resourceContext.instanceId(), Log::Context{})),
      mError(0),
      mClientLowerBoundRevision(std::numeric_limits<qint64>::max())
 {
diff --git a/common/index.cpp b/common/index.cpp
index f09e265..725c28b 100644
--- a/common/index.cpp
+++ b/common/index.cpp
@@ -2,31 +2,31 @@
 #include "log.h"
-SINK_DEBUG_AREA("index")
 Index::Index(const QString &storageRoot, const QString &name, Sink::Storage::DataStore::AccessMode mode)
    : mTransaction(Sink::Storage::DataStore(storageRoot, name, mode).createTransaction(mode)),
      mDb(mTransaction.openDatabase(name.toLatin1(), std::function<void(const Sink::Storage::DataStore::Error &)>(), true)),
-      mName(name)
+      mName(name),
+      mLogCtx("index." + name.toLatin1())
 {
 }
 Index::Index(const QByteArray &name, Sink::Storage::DataStore::Transaction &transaction)
-    : mDb(transaction.openDatabase(name, std::function<void(const Sink::Storage::DataStore::Error &)>(), true)), mName(name)
+    : mDb(transaction.openDatabase(name, std::function<void(const Sink::Storage::DataStore::Error &)>(), true)), mName(name),
+      mLogCtx("index." + name)
 {
 }
 void Index::add(const QByteArray &key, const QByteArray &value)
 {
    mDb.write(key, value, [&] (const Sink::Storage::DataStore::Error &error) {
-        SinkWarning() << "Error while writing value" << error;
+        SinkWarningCtx(mLogCtx) << "Error while writing value" << error;
    });
 }
 void Index::remove(const QByteArray &key, const QByteArray &value)
 {
    mDb.remove(key, value, [&] (const Sink::Storage::DataStore::Error &error) {
-        SinkWarning() << "Error while removing value: " << key << value << error << error.store;
+        SinkWarningCtx(mLogCtx) << "Error while removing value: " << key << value << error;
    });
 }
@@ -38,7 +38,7 @@ void Index::lookup(const QByteArray &key, const std::function<void(const QByteAr
            return true;
        },
        [&](const Sink::Storage::DataStore::Error &error) {
-            SinkWarning() << "Error while retrieving value" << error.message;
+            SinkWarningCtx(mLogCtx) << "Error while retrieving value:" << error << mName;
            errorHandler(Error(error.store, error.code, error.message));
        },
        matchSubStringKeys);
@@ -48,6 +48,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, [&](const QByteArray &value) { result = QByteArray(value.constData(), value.size()); }, [this](const Index::Error &error) { SinkWarning() << "Error while retrieving value" << error.message; });
+    lookup(key, [&](const QByteArray &value) { result = QByteArray(value.constData(), value.size()); }, [this](const Index::Error &) { });
    return result;
 }
diff --git a/common/index.h b/common/index.h
index cfcc7a0..81dc5bf 100644
--- a/common/index.h
+++ b/common/index.h
@@ -44,5 +44,5 @@ private:
    Sink::Storage::DataStore::Transaction mTransaction;
    Sink::Storage::DataStore::NamedDatabase mDb;
    QString mName;
-    SINK_DEBUG_COMPONENT(mName.toLatin1())
+    Sink::Log::Context mLogCtx;
 };
diff --git a/common/listener.cpp b/common/listener.cpp
index f18fe1d..983e438 100644
--- a/common/listener.cpp
+++ b/common/listener.cpp
@@ -25,6 +25,7 @@
 #include "common/definitions.h"
 #include "common/resourcecontext.h"
 #include "common/adaptorfactoryregistry.h"
+#include "common/bufferutils.h"
 // commands
 #include "common/commandcompletion_generated.h"
@@ -66,7 +67,7 @@ Listener::Listener(const QByteArray &resourceInstanceIdentifier, const QByteArra
    m_checkConnectionsTimer->setInterval(1000);
    connect(m_checkConnectionsTimer.get(), &QTimer::timeout, [this]() {
        if (m_connections.isEmpty()) {
-            SinkLog() << QString("No connections, shutting down.");
+            SinkTrace() << QString("No connections, shutting down.");
            quit();
        }
    });
@@ -87,6 +88,12 @@ Listener::~Listener()
 void Listener::emergencyAbortAllConnections()
 {
+    Sink::Notification n;
+    n.type = Sink::Notification::Status;
+    n.message = "The resource crashed.";
+    n.code = Sink::ApplicationDomain::ErrorStatus;
+    notify(n);
    for (Client &client : m_connections) {
        if (client.socket) {
            SinkWarning() << "Sending panic";
@@ -406,11 +413,13 @@ 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());
+    auto entities = Sink::BufferUtils::toVector(m_fbb, notification.entities);
    Sink::Commands::NotificationBuilder builder(m_fbb);
    builder.add_type(notification.type);
    builder.add_code(notification.code);
    builder.add_identifier(idString);
    builder.add_message(messageString);
+    builder.add_entities(entities);
    auto command = builder.Finish();
    Sink::Commands::FinishNotificationBuffer(m_fbb, command);
    for (Client &client : m_connections) {
diff --git a/common/mail/threadindexer.cpp b/common/mail/threadindexer.cpp
index 6f2933c..d91ab5f 100644
--- a/common/mail/threadindexer.cpp
+++ b/common/mail/threadindexer.cpp
@@ -101,9 +101,12 @@ void ThreadIndexer::updateThreadingIndex(const QByteArray &identifier, const App
        thread = index().secondaryLookup<Mail::MessageId, Mail::ThreadId>(parentMessageId);
        SinkTrace() << "Found parent: " << thread;
    }
    if (thread.isEmpty()) {
-        //Try to lookup the thread by subject:
+        //Try to lookup the thread by subject if not empty
-        thread = index().secondaryLookup<Mail::Subject, Mail::ThreadId>(normalizedSubject);
+        if ( !normalizedSubject.isEmpty()) {
+            thread = index().secondaryLookup<Mail::Subject, Mail::ThreadId>(normalizedSubject);
+        }
        if (thread.isEmpty()) {
            thread << QUuid::createUuid().toByteArray();
            SinkTrace() << "Created a new thread: " << thread;
@@ -121,7 +124,9 @@ void ThreadIndexer::updateThreadingIndex(const QByteArray &identifier, const App
    }
    index().index<Mail::MessageId, Mail::ThreadId>(messageId, thread.first(), transaction);
    index().index<Mail::ThreadId, Mail::MessageId>(thread.first(), messageId, transaction);
-    index().index<Mail::Subject, Mail::ThreadId>(normalizedSubject, thread.first(), transaction);
+    if (!normalizedSubject.isEmpty()) {
+        index().index<Mail::Subject, Mail::ThreadId>(normalizedSubject, thread.first(), transaction);
+    }
 }
diff --git a/common/modelresult.cpp b/common/modelresult.cpp
index f935419..b12216b 100644
--- a/common/modelresult.cpp
+++ b/common/modelresult.cpp
@@ -24,12 +24,20 @@
 #include <QPointer>
 #include "log.h"
+#include "notifier.h"
+#include "notification.h"
+using namespace Sink;
+static uint getInternalIdentifer(const QByteArray &resourceId, const QByteArray &entityId)
+{
+    return qHash(resourceId + entityId);
+}
 static uint qHash(const Sink::ApplicationDomain::ApplicationDomainType &type)
 {
-    // Q_ASSERT(!type.resourceInstanceIdentifier().isEmpty());
    Q_ASSERT(!type.identifier().isEmpty());
-    return qHash(type.resourceInstanceIdentifier() + type.identifier());
+    return getInternalIdentifer(type.resourceInstanceIdentifier(), type.identifier());
 }
 static qint64 getIdentifier(const QModelIndex &idx)
@@ -44,6 +52,86 @@ template <class T, class Ptr>
 ModelResult<T, Ptr>::ModelResult(const Sink::Query &query, const QList<QByteArray> &propertyColumns, const Sink::Log::Context &ctx)
    : QAbstractItemModel(), mLogCtx(ctx.subContext("modelresult")), mPropertyColumns(propertyColumns), mQuery(query)
 {
+    if (query.flags().testFlag(Sink::Query::UpdateStatus)) {
+        Sink::Query resourceQuery;
+        resourceQuery.setFilter(query.getResourceFilter());
+        mNotifier.reset(new Sink::Notifier{resourceQuery});
+        mNotifier->registerHandler([this](const Notification &notification) {
+            switch (notification.type) {
+                case Notification::Status:
+                case Notification::Warning:
+                case Notification::Error:
+                case Notification::Info:
+                case Notification::Progress:
+                    //These are the notifications we care about
+                    break;
+                default:
+                    //We're not interested
+                    return;
+            };
+            if (notification.resource.isEmpty() || notification.entities.isEmpty()) {
+                return;
+            }
+            QVector<qint64> idList;
+            for (const auto &entity : notification.entities) {
+                auto id = getInternalIdentifer(notification.resource, entity);
+                if (mEntities.contains(id)) {
+                    idList << id;
+                }
+            }
+            if (idList.isEmpty()) {
+                //We don't have this entity in our model
+                return;
+            }
+            const int newStatus = [&] {
+                if (notification.type == Notification::Warning || notification.type == Notification::Error) {
+                    return ApplicationDomain::SyncStatus::SyncError;
+                }
+                if (notification.type == Notification::Info) {
+                    switch (notification.code) {
+                        case ApplicationDomain::SyncInProgress:
+                            return ApplicationDomain::SyncInProgress;
+                        case ApplicationDomain::SyncSuccess:
+                            return ApplicationDomain::SyncSuccess;
+                        case ApplicationDomain::SyncError:
+                            return ApplicationDomain::SyncError;
+                        case ApplicationDomain::NoSyncStatus:
+                            break;
+                    }
+                    return ApplicationDomain::NoSyncStatus;
+                }
+                if (notification.type == Notification::Progress) {
+                    return ApplicationDomain::SyncStatus::SyncInProgress;
+                }
+                return ApplicationDomain::NoSyncStatus;
+            }();
+            for (const auto id : idList) {
+                const auto oldStatus = mEntityStatus.value(id);
+                QVector<int> changedRoles;
+                if (oldStatus != newStatus) {
+                    SinkTraceCtx(mLogCtx) << "Status changed for entity:" << newStatus << ", id: " << id;
+                    mEntityStatus.insert(id, newStatus);
+                    changedRoles << StatusRole;
+                }
+                if (notification.type == Notification::Progress) {
+                    changedRoles << ProgressRole;
+                } else if (notification.type == Notification::Warning || notification.type == Notification::Error) {
+                    changedRoles << WarningRole;
+                }
+                if (!changedRoles.isEmpty()) {
+                    const auto idx = createIndexFromId(id);
+                    SinkTraceCtx(mLogCtx) << "Index changed:" << idx << changedRoles;
+                    //We don't emit the changedRoles because the consuming model likely remaps the role anyways and would then need to translate dataChanged signals as well.
+                    emit dataChanged(idx, idx);
+                }
+            }
+        });
+    }
 }
 template <class T, class Ptr>
@@ -60,7 +148,7 @@ qint64 ModelResult<T, Ptr>::parentId(const Ptr &value)
    if (!mQuery.parentProperty().isEmpty()) {
        const auto identifier = value->getProperty(mQuery.parentProperty()).toByteArray();
        if (!identifier.isEmpty()) {
-            return qHash(T(value->resourceInstanceIdentifier(), identifier, 0, QSharedPointer<Sink::ApplicationDomain::BufferAdaptor>()));
+            return getInternalIdentifer(value->resourceInstanceIdentifier(), identifier);
        }
    }
    return 0;
@@ -106,6 +194,13 @@ QVariant ModelResult<T, Ptr>::data(const QModelIndex &index, int role) const
    if (role == ChildrenFetchedRole) {
        return childrenFetched(index);
    }
+    if (role == StatusRole) {
+        auto it = mEntityStatus.constFind(index.internalId());
+        if (it != mEntityStatus.constEnd()) {
+            return *it;
+        }
+        return {};
+    }
    if (role == Qt::DisplayRole && index.isValid()) {
        if (index.column() < mPropertyColumns.size()) {
            Q_ASSERT(mEntities.contains(index.internalId()));
@@ -296,15 +391,15 @@ void ModelResult<T, Ptr>::setEmitter(const typename Sink::ResultEmitter<Ptr>::Pt
    emitter->onInitialResultSetComplete([this, guard](const Ptr &parent, bool fetchedAll) {
        SinkTraceCtx(mLogCtx) << "Initial result set complete. Fetched all: " << fetchedAll;
        Q_ASSERT(guard);
-        threadBoundary.callInMainThread([=]() {
+        Q_ASSERT(QThread::currentThread() == this->thread());
-            const qint64 parentId = parent ? qHash(*parent) : 0;
-            const auto parentIndex = createIndexFromId(parentId);
+        const qint64 parentId = parent ? qHash(*parent) : 0;
-            mEntityChildrenFetchComplete.insert(parentId);
+        const auto parentIndex = createIndexFromId(parentId);
-            if (fetchedAll) {
+        mEntityChildrenFetchComplete.insert(parentId);
-                mEntityAllChildrenFetched.insert(parentId);
+        if (fetchedAll) {
-            }
+            mEntityAllChildrenFetched.insert(parentId);
-            emit dataChanged(parentIndex, parentIndex, QVector<int>() << ChildrenFetchedRole);
+        }
-        });
+        emit dataChanged(parentIndex, parentIndex, QVector<int>() << ChildrenFetchedRole);
    });
    mEmitter = emitter;
 }
diff --git a/common/modelresult.h b/common/modelresult.h
index f30a8e1..cc263cf 100644
--- a/common/modelresult.h
+++ b/common/modelresult.h
@@ -30,15 +30,23 @@
 #include "resultprovider.h"
 #include "threadboundary.h"
+namespace Sink {
+class Notifier;
+}
 template <class T, class Ptr>
 class ModelResult : public QAbstractItemModel
 {
 public:
+    //Update the copy in store.h as well if you modify this
    enum Roles
    {
        DomainObjectRole = Qt::UserRole + 1,
        ChildrenFetchedRole,
-        DomainObjectBaseRole
+        DomainObjectBaseRole,
+        StatusRole, //ApplicationDomain::SyncStatus
+        WarningRole, //ApplicationDomain::Warning, only if status == warning || status == error
+        ProgressRole //ApplicationDomain::Progress
    };
    ModelResult(const Sink::Query &query, const QList<QByteArray> &propertyColumns, const Sink::Log::Context &);
@@ -77,9 +85,11 @@ private:
    QSet<qint64 /* entity id */> mEntityChildrenFetched;
    QSet<qint64 /* entity id */> mEntityChildrenFetchComplete;
    QSet<qint64 /* entity id */> mEntityAllChildrenFetched;
+    QMap<qint64 /* entity id */, int /* Status */> mEntityStatus;
    QList<QByteArray> mPropertyColumns;
    Sink::Query mQuery;
    std::function<void(const Ptr &)> loadEntities;
    typename Sink::ResultEmitter<Ptr>::Ptr mEmitter;
    async::ThreadBoundary threadBoundary;
+    QScopedPointer<Sink::Notifier> mNotifier;
 };
diff --git a/common/notification.cpp b/common/notification.cpp
index b399d50..e688b6d 100644
--- a/common/notification.cpp
+++ b/common/notification.cpp
@@ -19,8 +19,37 @@
 */
 #include "notification.h"
+using namespace Sink;
+static QByteArray name(int type)
+{
+    switch (type) {
+        case Notification::Shutdown:
+            return "shutdown";
+        case Notification::Status:
+            return "status";
+        case Notification::Info:
+            return "info";
+        case Notification::Warning:
+            return "warning";
+        case Notification::Error:
+            return "error";
+        case Notification::Progress:
+            return "progress";
+        case Notification::Inspection:
+            return "inspection";
+        case Notification::RevisionUpdate:
+            return "revisionupdate";
+        case Notification::FlushCompletion:
+            return "flushcompletion";
+    }
+    return "Unknown:" + QByteArray::number(type);
+}
 QDebug operator<<(QDebug dbg, const Sink::Notification &n)
 {
-    dbg << "Notification(Id: " << n.id << ", Type: " << n.type  << ", Code: " << n.code << ", Message: " << n.message << ")";
+    dbg << "Notification(Type: " << name(n.type) << "Id, : " << n.id  << ", Code: ";
+    dbg << n.code;
+    dbg << ", Message: " << n.message << ", Entities: " << n.entities << ")";
    return dbg.space();
 }
diff --git a/common/notification.h b/common/notification.h
index 8224f2a..f5379fd 100644
--- a/common/notification.h
+++ b/common/notification.h
@@ -34,22 +34,29 @@ public:
    enum NoticationType {
        Shutdown,
        Status,
+        Info,
        Warning,
+        Error,
        Progress,
        Inspection,
        RevisionUpdate,
        FlushCompletion
    };
+    /**
+     * Used as code for Inspection type notifications
+     */
    enum InspectionCode {
        Success = 0,
        Failure
    };
    QByteArray id;
+    QByteArrayList entities;
    int type = 0;
    QString message;
    //A return code. Zero typically indicates success.
    int code = 0;
+    QByteArray resource;
 };
 }
diff --git a/common/notifier.cpp b/common/notifier.cpp
index 53db5be..f52e28b 100644
--- a/common/notifier.cpp
+++ b/common/notifier.cpp
@@ -24,6 +24,8 @@
 #include "resourceaccess.h"
 #include "resourceconfig.h"
+#include "query.h"
+#include "facadefactory.h"
 #include "log.h"
 using namespace Sink;
@@ -34,37 +36,64 @@ public:
    Private() : context(new QObject)
    {
    }
+    void listenForNotifications(const QSharedPointer<ResourceAccess> &access)
+    {
+        QObject::connect(access.data(), &ResourceAccess::notification, &context, [this](const Notification &notification) {
+            for (const auto &handler : handler) {
+                handler(notification);
+            }
+        });
+        resourceAccess << access;
+    }
    QList<QSharedPointer<ResourceAccess>> resourceAccess;
    QList<std::function<void(const Notification &)>> handler;
-    QSharedPointer<QObject> context;
+    QObject context;
 };
 Notifier::Notifier(const QSharedPointer<ResourceAccess> &resourceAccess) : d(new Sink::Notifier::Private)
 {
-    QObject::connect(resourceAccess.data(), &ResourceAccess::notification, d->context.data(), [this](const Notification &notification) {
+    d->listenForNotifications(resourceAccess);
-        for (const auto &handler : d->handler) {
-            handler(notification);
-        }
-    });
-    d->resourceAccess << resourceAccess;
 }
 Notifier::Notifier(const QByteArray &instanceIdentifier, const QByteArray &resourceType) : d(new Sink::Notifier::Private)
 {
-    auto resourceAccess = Sink::ResourceAccess::Ptr::create(instanceIdentifier, resourceType);
+    auto resourceAccess = Sink::ResourceAccessFactory::instance().getAccess(instanceIdentifier, resourceType);
    resourceAccess->open();
-    QObject::connect(resourceAccess.data(), &ResourceAccess::notification, d->context.data(), [this](const Notification &notification) {
+    d->listenForNotifications(resourceAccess);
-        for (const auto &handler : d->handler) {
-            handler(notification);
-        }
-    });
-    d->resourceAccess << resourceAccess;
 }
 Notifier::Notifier(const QByteArray &instanceIdentifier) : Notifier(instanceIdentifier, ResourceConfig::getResourceType(instanceIdentifier))
 {
 }
+Notifier::Notifier(const Sink::Query &resourceQuery) : d(new Sink::Notifier::Private)
+{
+    Sink::Log::Context resourceCtx{"notifier"};
+    auto facade = FacadeFactory::instance().getFacade<ApplicationDomain::SinkResource>();
+    Q_ASSERT(facade);
+    auto result = facade->load(resourceQuery, resourceCtx);
+    auto emitter = result.second;
+    emitter->onAdded([=](const ApplicationDomain::SinkResource::Ptr &resource) {
+        auto resourceAccess = Sink::ResourceAccessFactory::instance().getAccess(resource->identifier(), ResourceConfig::getResourceType(resource->identifier()));
+        resourceAccess->open();
+        d->listenForNotifications(resourceAccess);
+    });
+    emitter->onModified([](const ApplicationDomain::SinkResource::Ptr &) {
+    });
+    emitter->onRemoved([](const ApplicationDomain::SinkResource::Ptr &) {
+    });
+    emitter->onInitialResultSetComplete([](const ApplicationDomain::SinkResource::Ptr &, bool) {
+    });
+    emitter->onComplete([resourceCtx]() {
+        SinkTraceCtx(resourceCtx) << "Resource query complete";
+    });
+    emitter->fetch({});
+    result.first.exec();
+}
 void Notifier::registerHandler(std::function<void(const Notification &)> handler)
 {
    d->handler << handler;
diff --git a/common/notifier.h b/common/notifier.h
index 290458a..b5d3dfa 100644
--- a/common/notifier.h
+++ b/common/notifier.h
@@ -23,14 +23,14 @@
 #include "sink_export.h"
 #include <QByteArray>
 #include <QSharedPointer>
+#include <functional>
-#include <KAsync/Async>
 class QAbstractItemModel;
 namespace Sink {
 class ResourceAccess;
 class Notification;
+class Query;
 class SINK_EXPORT Notifier
 {
@@ -38,6 +38,7 @@ public:
    Notifier(const QSharedPointer<ResourceAccess> &resourceAccess);
    Notifier(const QByteArray &resourceInstanceIdentifier);
    Notifier(const QByteArray &resourceInstanceIdentifier, const QByteArray &resourceType);
+    Notifier(const Sink::Query &resourceQuery);
    void registerHandler(std::function<void(const Notification &)>);
 private:
diff --git a/common/pipeline.cpp b/common/pipeline.cpp
index 887b6b3..019784e 100644
--- a/common/pipeline.cpp
+++ b/common/pipeline.cpp
@@ -175,13 +175,14 @@ KAsync::Job<qint64> Pipeline::newEntity(void const *command, size_t size)
    auto o = Sink::ApplicationDomain::ApplicationDomainType{d->resourceContext.instanceId(), key, revision, memoryAdaptor};
    o.setChangedProperties(o.availableProperties().toSet());
-    auto preprocess = [&, this](ApplicationDomain::ApplicationDomainType &newEntity) {
+    auto newEntity = *ApplicationDomain::ApplicationDomainType::getInMemoryRepresentation<ApplicationDomain::ApplicationDomainType>(o, o.availableProperties());
-        foreach (const auto &processor, d->processors[bufferType]) {
+    newEntity.setChangedProperties(newEntity.availableProperties().toSet());
-            processor->newEntity(newEntity);
-        }
+    foreach (const auto &processor, d->processors[bufferType]) {
-    };
+        processor->newEntity(newEntity);
+    }
-    if (!d->entityStore.add(bufferType, o, replayToSource, preprocess)) {
+    if (!d->entityStore.add(bufferType, o, replayToSource)) {
        return KAsync::error<qint64>(0);
    }
@@ -195,6 +196,11 @@ struct CreateHelper {
    }
 };
+static KAsync::Job<void> create(const QByteArray &type, const ApplicationDomain::ApplicationDomainType &newEntity)
+{
+    return TypeHelper<CreateHelper>{type}.operator()<KAsync::Job<void>, const ApplicationDomain::ApplicationDomainType&>(newEntity);
+}
 KAsync::Job<qint64> Pipeline::modifiedEntity(void const *command, size_t size)
 {
    d->transactionItemCount++;
@@ -248,65 +254,71 @@ KAsync::Job<qint64> Pipeline::modifiedEntity(void const *command, size_t size)
        deletions = BufferUtils::fromVector(*modifyEntity->deletions());
    }
-    if (modifyEntity->targetResource()) {
+    const auto current = d->entityStore.readLatest(bufferType, diff.identifier());
-        auto isMove = modifyEntity->removeEntity();
+    if (current.identifier().isEmpty()) {
-        auto targetResource = BufferUtils::extractBuffer(modifyEntity->targetResource());
+        SinkWarningCtx(d->logCtx) << "Failed to read current version: " << diff.identifier();
-        auto changeset = diff.changedProperties();
+        return KAsync::error<qint64>(0);
-        const auto current = d->entityStore.readLatest(bufferType, diff.identifier());
+    }
-        if (current.identifier().isEmpty()) {
-            SinkWarningCtx(d->logCtx) << "Failed to read current version: " << diff.identifier();
-            return KAsync::error<qint64>(0);
-        }
-        auto newEntity = *ApplicationDomain::ApplicationDomainType::getInMemoryCopy<ApplicationDomain::ApplicationDomainType>(current, current.availableProperties());
+    auto newEntity = d->entityStore.applyDiff(bufferType, current, diff, deletions);
-        // Apply diff
+    bool isMove = false;
-        for (const auto &property : changeset) {
+    if (modifyEntity->targetResource()) {
-            const auto value = diff.getProperty(property);
+        isMove = modifyEntity->removeEntity();
-            if (value.isValid()) {
+        newEntity.setResource(BufferUtils::extractBuffer(modifyEntity->targetResource()));
-                newEntity.setProperty(property, value);
+    }
-            }
-        }
-        // Remove deletions
+    foreach (const auto &processor, d->processors[bufferType]) {
-        for (const auto &property : deletions) {
+        bool exitLoop = false;
-            newEntity.setProperty(property, QVariant());
+        const auto result = processor->processModification(Preprocessor::Modification, current, newEntity);
+        switch (result.action) {
+            case Preprocessor::MoveToResource:
+                isMove = true;
+                exitLoop = true;
+                break;
+            case Preprocessor::CopyToResource:
+                isMove = true;
+                exitLoop = true;
+                break;
+            case Preprocessor::DropModification:
+                SinkTraceCtx(d->logCtx) << "Dropping modification";
+                return KAsync::error<qint64>(0);
+            default:
+                break;
        }
-        newEntity.setResource(targetResource);
+        if (exitLoop) {
-        newEntity.setChangedProperties(newEntity.availableProperties().toSet());
+            break;
+        }
+    }
-        SinkTraceCtx(d->logCtx) << "Moving entity to new resource " << newEntity.identifier() << newEntity.resourceInstanceIdentifier() << targetResource;
+    //The entity is either being copied or moved
-        auto job = TypeHelper<CreateHelper>{bufferType}.operator()<KAsync::Job<void>, ApplicationDomain::ApplicationDomainType&>(newEntity);
+    if (newEntity.resourceInstanceIdentifier() != d->resourceContext.resourceInstanceIdentifier) {
-        job = job.then([this, current, isMove, targetResource, bufferType](const KAsync::Error &error) {
+        SinkTraceCtx(d->logCtx) << "Moving entity to new resource " << newEntity.identifier() << newEntity.resourceInstanceIdentifier();
-            if (!error) {
+        newEntity.setChangedProperties(newEntity.availableProperties().toSet());
-                SinkTraceCtx(d->logCtx) << "Move of " << current.identifier() << "was successfull";
+        return create(bufferType, newEntity)
-                if (isMove) {
+            .then([=](const KAsync::Error &error) {
-                    startTransaction();
+                if (!error) {
-                    flatbuffers::FlatBufferBuilder fbb;
+                    SinkTraceCtx(d->logCtx) << "Move of " << current.identifier() << "was successfull";
-                    auto entityId = fbb.CreateString(current.identifier());
+                    if (isMove) {
-                    auto type = fbb.CreateString(bufferType);
+                        flatbuffers::FlatBufferBuilder fbb;
-                    auto location = Sink::Commands::CreateDeleteEntity(fbb, current.revision(), entityId, type, true);
+                        auto entityId = fbb.CreateString(current.identifier());
-                    Sink::Commands::FinishDeleteEntityBuffer(fbb, location);
+                        auto type = fbb.CreateString(bufferType);
-                    const auto data = BufferUtils::extractBuffer(fbb);
+                        auto location = Sink::Commands::CreateDeleteEntity(fbb, current.revision(), entityId, type, true);
-                    deletedEntity(data, data.size()).exec();
+                        Sink::Commands::FinishDeleteEntityBuffer(fbb, location);
-                    commit();
+                        const auto data = BufferUtils::extractBuffer(fbb);
+                        deletedEntity(data, data.size()).exec();
+                    }
+                } else {
+                    SinkErrorCtx(d->logCtx) << "Failed to move entity " << newEntity.identifier() << " to resource " << newEntity.resourceInstanceIdentifier();
                }
-            } else {
+            })
-                SinkErrorCtx(d->logCtx) << "Failed to move entity " << targetResource << " to resource " << current.identifier();
+            .then([this] {
-            }
+                return d->entityStore.maxRevision();
-        });
+            });
-        job.exec();
-        return KAsync::value<qint64>(0);
    }
-    auto preprocess = [&, this](const ApplicationDomain::ApplicationDomainType &oldEntity, ApplicationDomain::ApplicationDomainType &newEntity) {
-        foreach (const auto &processor, d->processors[bufferType]) {
-            processor->modifiedEntity(oldEntity, newEntity);
-        }
-    };
    d->revisionChanged = true;
-    if (!d->entityStore.modify(bufferType, diff, deletions, replayToSource, preprocess)) {
+    if (!d->entityStore.modify(bufferType, current, newEntity, replayToSource)) {
        return KAsync::error<qint64>(0);
    }
@@ -331,14 +343,14 @@ KAsync::Job<qint64> Pipeline::deletedEntity(void const *command, size_t size)
    const QByteArray key = QByteArray(reinterpret_cast<char const *>(deleteEntity->entityId()->Data()), deleteEntity->entityId()->size());
    SinkTraceCtx(d->logCtx) << "Deleted Entity. Type: " << bufferType << "uid: "<< key << " replayToSource: " << replayToSource;
-    auto preprocess = [&, this](const ApplicationDomain::ApplicationDomainType &oldEntity) {
+    const auto current = d->entityStore.readLatest(bufferType, key);
-        foreach (const auto &processor, d->processors[bufferType]) {
-            processor->deletedEntity(oldEntity);
+    foreach (const auto &processor, d->processors[bufferType]) {
-        }
+        processor->deletedEntity(current);
-    };
+    }
    d->revisionChanged = true;
-    if (!d->entityStore.remove(bufferType, key, replayToSource, preprocess)) {
+    if (!d->entityStore.remove(bufferType, current, replayToSource)) {
        return KAsync::error<qint64>(0);
    }
@@ -385,6 +397,39 @@ void Preprocessor::finalizeBatch()
 {
 }
+void Preprocessor::newEntity(ApplicationDomain::ApplicationDomainType &newEntity)
+{
+}
+void Preprocessor::modifiedEntity(const ApplicationDomain::ApplicationDomainType &oldEntity, ApplicationDomain::ApplicationDomainType &newEntity)
+{
+}
+void Preprocessor::deletedEntity(const ApplicationDomain::ApplicationDomainType &oldEntity)
+{
+}
+Preprocessor::Result Preprocessor::processModification(Type type, const ApplicationDomain::ApplicationDomainType &current, ApplicationDomain::ApplicationDomainType &diff)
+{
+    switch(type) {
+        case Creation:
+            newEntity(diff);
+            return {NoAction};
+        case Modification:
+            modifiedEntity(current, diff);
+            return {NoAction};
+        case Deletion:
+            deletedEntity(current);
+            return {NoAction};
+        default:
+            break;
+    }
+    return {NoAction};
+}
 QByteArray Preprocessor::resourceInstanceIdentifier() const
 {
    return d->resourceInstanceIdentifier;
diff --git a/common/pipeline.h b/common/pipeline.h
index c6dc5fe..11d52fd 100644
--- a/common/pipeline.h
+++ b/common/pipeline.h
@@ -77,10 +77,28 @@ public:
    Preprocessor();
    virtual ~Preprocessor();
+    enum Action {
+        NoAction,
+        MoveToResource,
+        CopyToResource,
+        DropModification,
+        DeleteEntity
+    };
+    enum Type {
+        Creation,
+        Modification,
+        Deletion
+    };
+    struct Result {
+        Action action;
+    };
    virtual void startBatch();
-    virtual void newEntity(ApplicationDomain::ApplicationDomainType &newEntity) {};
+    virtual void newEntity(ApplicationDomain::ApplicationDomainType &newEntity);
-    virtual void modifiedEntity(const ApplicationDomain::ApplicationDomainType &oldEntity, ApplicationDomain::ApplicationDomainType &newEntity) {};
+    virtual void modifiedEntity(const ApplicationDomain::ApplicationDomainType &oldEntity, ApplicationDomain::ApplicationDomainType &newEntity);
-    virtual void deletedEntity(const ApplicationDomain::ApplicationDomainType &oldEntity) {};
+    virtual void deletedEntity(const ApplicationDomain::ApplicationDomainType &oldEntity);
+    virtual Result processModification(Type type, const ApplicationDomain::ApplicationDomainType &current, ApplicationDomain::ApplicationDomainType &diff);
    virtual void finalizeBatch();
    void setup(const QByteArray &resourceType, const QByteArray &resourceInstanceIdentifier, Pipeline *, Storage::EntityStore *entityStore);
diff --git a/common/propertymapper.cpp b/common/propertymapper.cpp
index 4d45644..c72cf31 100644
--- a/common/propertymapper.cpp
+++ b/common/propertymapper.cpp
@@ -22,6 +22,7 @@
 #include "applicationdomaintype.h"
 #include <QDateTime>
 #include "mail_generated.h"
+#include "contact_generated.h"
 template <>
 flatbuffers::uoffset_t variantToProperty<QString>(const QVariant &property, flatbuffers::FlatBufferBuilder &fbb)
@@ -110,6 +111,21 @@ flatbuffers::uoffset_t variantToProperty<QList<Sink::ApplicationDomain::Mail::Co
    return 0;
 }
+template <>
+flatbuffers::uoffset_t variantToProperty<QList<Sink::ApplicationDomain::Contact::Email>>(const QVariant &property, flatbuffers::FlatBufferBuilder &fbb)
+{
+    if (property.isValid()) {
+        const auto list = property.value<QList<Sink::ApplicationDomain::Contact::Email>>();
+        std::vector<flatbuffers::Offset<Sink::ApplicationDomain::Buffer::ContactEmail>> vector;
+        for (const auto &value : list) {
+            auto offset = Sink::ApplicationDomain::Buffer::CreateContactEmailDirect(fbb, value.type, value.email.toUtf8().constData()).o;
+            vector.push_back(offset);
+        }
+        return fbb.CreateVector(vector).o;
+    }
+    return 0;
+}
 QString propertyToString(const flatbuffers::String *property)
 {
@@ -217,6 +233,20 @@ QVariant propertyToVariant<QList<Sink::ApplicationDomain::Mail::Contact>>(const
 }
 template <>
+QVariant propertyToVariant<QList<Sink::ApplicationDomain::Contact::Email>>(const flatbuffers::Vector<flatbuffers::Offset<Sink::ApplicationDomain::Buffer::ContactEmail>> *property)
+{
+    if (property) {
+        QList<Sink::ApplicationDomain::Contact::Email> list;
+        for (auto it = property->begin(); it != property->end();) {
+            list << Sink::ApplicationDomain::Contact::Email{static_cast<Sink::ApplicationDomain::Contact::Email::Type>(it->type()), propertyToString(it->email())};
+            it.operator++();
+        }
+        return QVariant::fromValue(list);
+    }
+    return QVariant();
+}
+template <>
 QVariant propertyToVariant<bool>(uint8_t property)
 {
    return static_cast<bool>(property);
diff --git a/common/propertymapper.h b/common/propertymapper.h
index 70491a1..9ea0b73 100644
--- a/common/propertymapper.h
+++ b/common/propertymapper.h
@@ -29,6 +29,7 @@ namespace Sink {
 namespace ApplicationDomain {
 namespace Buffer {
    struct MailContact;
+    struct ContactEmail;
 }
 }
 }
@@ -54,6 +55,8 @@ template <typename T>
 QVariant SINK_EXPORT propertyToVariant(const Sink::ApplicationDomain::Buffer::MailContact *);
 template <typename T>
 QVariant SINK_EXPORT propertyToVariant(const flatbuffers::Vector<flatbuffers::Offset<Sink::ApplicationDomain::Buffer::MailContact>> *);
+template <typename T>
+QVariant SINK_EXPORT propertyToVariant(const flatbuffers::Vector<flatbuffers::Offset<Sink::ApplicationDomain::Buffer::ContactEmail>> *);
 /**
 * The property mapper is a non-typesafe virtual dispatch.
@@ -131,6 +134,12 @@ public:
        addMapping(T::name, [f](Buffer const *buffer) -> QVariant { return propertyToVariant<typename T::Type>((buffer->*f)()); });
    }
+    template <typename T, typename Buffer>
+    void addMapping(const flatbuffers::Vector<flatbuffers::Offset<Sink::ApplicationDomain::Buffer::ContactEmail>> *(Buffer::*f)() const)
+    {
+        addMapping(T::name, [f](Buffer const *buffer) -> QVariant { return propertyToVariant<typename T::Type>((buffer->*f)()); });
+    }
 private:
    QHash<QByteArray, std::function<QVariant(BufferType const *)>> mReadAccessors;
 };
@@ -218,6 +227,15 @@ public:
        });
    }
+    template <typename T>
+    void addMapping(void (BufferBuilder::*f)(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<Sink::ApplicationDomain::Buffer::ContactEmail>>>))
+    {
+        addMapping(T::name, [f](const QVariant &value, flatbuffers::FlatBufferBuilder &fbb) -> std::function<void(BufferBuilder &)> {
+            auto offset = variantToProperty<typename T::Type>(value, fbb);
+            return [offset, f](BufferBuilder &builder) { (builder.*f)(offset); };
+        });
+    }
 private:
    QHash<QByteArray, std::function<std::function<void(BufferBuilder &)>(const QVariant &, flatbuffers::FlatBufferBuilder &)>> mWriteAccessors;
 };
diff --git a/common/query.h b/common/query.h
index 8e9050d..5b37cdd 100644
--- a/common/query.h
+++ b/common/query.h
@@ -300,7 +300,9 @@ public:
        /** Leave the query running and continuously update the result set. */
        LiveQuery = 1,
        /** Run the query synchronously. */
-        SynchronousQuery = 2
+        SynchronousQuery = 2,
+        /** Include status updates via notifications */
+        UpdateStatus = 4
    };
    Q_DECLARE_FLAGS(Flags, Flag)
@@ -410,6 +412,11 @@ public:
        mFlags = flags;
    }
+    Flags flags() const
+    {
+        return mFlags;
+    }
    bool liveQuery() const
    {
        return mFlags.testFlag(LiveQuery);
@@ -509,6 +516,31 @@ public:
    }
    template <typename T>
+    SyncScope &resourceFilter(const ApplicationDomain::ApplicationDomainType &entity)
+    {
+        mResourceFilter.propertyFilter.insert(T::name, Comparator(entity.identifier()));
+        return *this;
+    }
+    SyncScope &resourceFilter(const QByteArray &name, const Comparator &comparator)
+    {
+        mResourceFilter.propertyFilter.insert(name, comparator);
+        return *this;
+    }
+    template <typename T>
+    SyncScope &resourceContainsFilter(const QVariant &value)
+    {
+        return resourceFilter(T::name, Comparator(value, Comparator::Contains));
+    }
+    template <typename T>
+    SyncScope &resourceFilter(const QVariant &value)
+    {
+        return resourceFilter(T::name, value);
+    }
+    template <typename T>
    SyncScope &filter(const Query::Comparator &comparator)
    {
        return filter(T::name, comparator);
diff --git a/common/queryrunner.cpp b/common/queryrunner.cpp
index 802fc48..43f48c0 100644
--- a/common/queryrunner.cpp
+++ b/common/queryrunner.cpp
@@ -51,7 +51,7 @@ public:
    virtual ~QueryWorker();
    ReplayResult executeIncrementalQuery(const Sink::Query &query, Sink::ResultProviderInterface<typename DomainType::Ptr> &resultProvider, DataStoreQuery::State::Ptr state);
-    ReplayResult executeInitialQuery(const Sink::Query &query, const typename DomainType::Ptr &parent, Sink::ResultProviderInterface<typename DomainType::Ptr> &resultProvider, int offset, int batchsize);
+    ReplayResult executeInitialQuery(const Sink::Query &query, const typename DomainType::Ptr &parent, Sink::ResultProviderInterface<typename DomainType::Ptr> &resultProvider, int batchsize, DataStoreQuery::State::Ptr state);
 private:
    void resultProviderCallback(const Sink::Query &query, Sink::ResultProviderInterface<typename DomainType::Ptr> &resultProvider, const ResultSet::Result &result);
@@ -72,18 +72,18 @@ QueryRunner<DomainType>::QueryRunner(const Sink::Query &query, const Sink::Resou
    auto guardPtr = QPointer<QObject>(&guard);
    auto fetcher = [=](const typename DomainType::Ptr &parent) {
        const QByteArray parentId = parent ? parent->identifier() : QByteArray();
-        SinkTraceCtx(mLogCtx) << "Running fetcher. Offset: " << mOffset[parentId] << " Batchsize: " << mBatchSize;
+        SinkTraceCtx(mLogCtx) << "Running fetcher. Batchsize: " << mBatchSize;
        auto resultProvider = mResultProvider;
        auto resultTransformation = mResultTransformation;
-        auto offset = mOffset[parentId];
        auto batchSize = mBatchSize;
        auto resourceContext = mResourceContext;
        auto logCtx = mLogCtx;
+        auto state = mQueryState.value(parentId);
        const bool runAsync = !query.synchronousQuery();
        //The lambda will be executed in a separate thread, so copy all arguments
-        async::run<ReplayResult>([resultTransformation, offset, batchSize, query, bufferType, resourceContext, resultProvider, parent, logCtx]() {
+        async::run<ReplayResult>([=]() {
            QueryWorker<DomainType> worker(query, resourceContext, bufferType, resultTransformation, logCtx);
-            return worker.executeInitialQuery(query, parent, *resultProvider, offset, batchSize);
+            return worker.executeInitialQuery(query, parent, *resultProvider, batchSize, state);
        }, runAsync)
            .then([this, parentId, query, parent, resultProvider, guardPtr](const ReplayResult &result) {
                if (!guardPtr) {
@@ -91,8 +91,7 @@ QueryRunner<DomainType>::QueryRunner(const Sink::Query &query, const Sink::Resou
                    return;
                }
                mInitialQueryComplete = true;
-                mQueryState = result.queryState;
+                mQueryState[parentId] = result.queryState;
-                mOffset[parentId] += result.replayedEntities;
                // Only send the revision replayed information if we're connected to the resource, there's no need to start the resource otherwise.
                if (query.liveQuery()) {
                    mResourceAccess->sendRevisionReplayedCommand(result.newRevision);
@@ -111,10 +110,11 @@ QueryRunner<DomainType>::QueryRunner(const Sink::Query &query, const Sink::Resou
        Q_ASSERT(!query.synchronousQuery());
        // Incremental updates are always loaded directly, leaving it up to the result to discard the changes if they are not interesting
        setQuery([=]() -> KAsync::Job<void> {
+            const QByteArray parentId;
            auto resultProvider = mResultProvider;
            auto resourceContext = mResourceContext;
            auto logCtx = mLogCtx;
-            auto state = mQueryState;
+            auto state = mQueryState.value(parentId);
            if (!mInitialQueryComplete) {
                SinkWarningCtx(mLogCtx) << "Can't start the incremental query before the initial query is complete";
                fetcher({});
@@ -225,7 +225,7 @@ ReplayResult QueryWorker<DomainType>::executeIncrementalQuery(const Sink::Query
        SinkWarningCtx(mLogCtx) << "No previous query state.";
        return {0, 0, false, DataStoreQuery::State::Ptr{}};
    }
-    auto preparedQuery = DataStoreQuery{*state, ApplicationDomain::getTypeName<DomainType>(), entityStore};
+    auto preparedQuery = DataStoreQuery{*state, ApplicationDomain::getTypeName<DomainType>(), entityStore, true};
    auto resultSet = preparedQuery.update(baseRevision);
    SinkTraceCtx(mLogCtx) << "Filtered set retrieved. " << Log::TraceTime(time.elapsed());
    auto replayResult = resultSet.replaySet(0, 0, [this, query, &resultProvider](const ResultSet::Result &result) {
@@ -240,7 +240,7 @@ ReplayResult QueryWorker<DomainType>::executeIncrementalQuery(const Sink::Query
 template <class DomainType>
 ReplayResult QueryWorker<DomainType>::executeInitialQuery(
-    const Sink::Query &query, const typename DomainType::Ptr &parent, Sink::ResultProviderInterface<typename DomainType::Ptr> &resultProvider, int offset, int batchsize)
+    const Sink::Query &query, const typename DomainType::Ptr &parent, Sink::ResultProviderInterface<typename DomainType::Ptr> &resultProvider, int batchsize, DataStoreQuery::State::Ptr state)
 {
    QTime time;
    time.start();
@@ -257,11 +257,17 @@ ReplayResult QueryWorker<DomainType>::executeInitialQuery(
    }
    auto entityStore = EntityStore{mResourceContext, mLogCtx};
-    auto preparedQuery = DataStoreQuery{modifiedQuery, ApplicationDomain::getTypeName<DomainType>(), entityStore};
+    auto preparedQuery = [&] {
-    auto resultSet = preparedQuery.execute();
+        if (state) {
+            return DataStoreQuery{*state, ApplicationDomain::getTypeName<DomainType>(), entityStore, false};
+        } else {
+            return DataStoreQuery{modifiedQuery, ApplicationDomain::getTypeName<DomainType>(), entityStore};
+        }
+    }();
+    auto resultSet = preparedQuery.execute();;
-    SinkTraceCtx(mLogCtx) << "Filtered set retrieved. " << Log::TraceTime(time.elapsed());
+    SinkTraceCtx(mLogCtx) << "Filtered set retrieved." << Log::TraceTime(time.elapsed());
-    auto replayResult = resultSet.replaySet(offset, batchsize, [this, query, &resultProvider](const ResultSet::Result &result) {
+    auto replayResult = resultSet.replaySet(0, batchsize, [this, query, &resultProvider](const ResultSet::Result &result) {
        resultProviderCallback(query, resultProvider, result);
    });
@@ -269,9 +275,7 @@ ReplayResult QueryWorker<DomainType>::executeInitialQuery(
        << (replayResult.replayedAll ? "Replayed all available results.\n" : "")
        << "Initial query took: " << Log::TraceTime(time.elapsed());
-    auto state = preparedQuery.getState();
+    return {entityStore.maxRevision(), replayResult.replayedEntities, replayResult.replayedAll, preparedQuery.getState()};
-    return {entityStore.maxRevision(), replayResult.replayedEntities, replayResult.replayedAll, state};
 }
 #define REGISTER_TYPE(T) \
diff --git a/common/queryrunner.h b/common/queryrunner.h
index f5c7ead..5308eac 100644
--- a/common/queryrunner.h
+++ b/common/queryrunner.h
@@ -98,11 +98,10 @@ private:
    QSharedPointer<Sink::ResourceAccessInterface> mResourceAccess;
    QSharedPointer<Sink::ResultProvider<typename DomainType::Ptr>> mResultProvider;
    ResultTransformation mResultTransformation;
-    QHash<QByteArray, qint64> mOffset;
+    QHash<QByteArray, DataStoreQuery::State::Ptr> mQueryState;
    int mBatchSize;
    QObject guard;
    Sink::Log::Context mLogCtx;
-    DataStoreQuery::State::Ptr mQueryState;
    bool mInitialQueryComplete = false;
    bool mQueryInProgress = false;
 };
diff --git a/common/resourceaccess.cpp b/common/resourceaccess.cpp
index 50845ac..ad8cae9 100644
--- a/common/resourceaccess.cpp
+++ b/common/resourceaccess.cpp
@@ -547,6 +547,7 @@ static Sink::Notification getNotification(const Sink::Commands::Notification *bu
    }
    n.type = buffer->type();
    n.code = buffer->code();
+    n.entities = BufferUtils::fromVector(*buffer->entities());
    return n;
 }
@@ -601,20 +602,23 @@ bool ResourceAccess::processMessageBuffer()
                    queuedInvoke([=]() { emit notification(n); }, this);
                } break;
                case Sink::Notification::Status:
-                    if (mResourceStatus == buffer->code()) {
+                    if (mResourceStatus != buffer->code()) {
-                        SinkTrace() << "Got an unnecessary status notification";
+                        mResourceStatus = buffer->code();
-                        break;
+                        SinkTrace() << "Updated status: " << mResourceStatus;
                    }
-                    mResourceStatus = buffer->code();
+                    [[clang::fallthrough]];
-                    SinkTrace() << "Updated status: " << mResourceStatus;
+                case Sink::Notification::Info:
                    [[clang::fallthrough]];
                case Sink::Notification::Warning:
                    [[clang::fallthrough]];
+                case Sink::Notification::Error:
+                    [[clang::fallthrough]];
                case Sink::Notification::FlushCompletion:
                    [[clang::fallthrough]];
                case Sink::Notification::Progress: {
                    auto n = getNotification(buffer);
-                    SinkTrace() << "Received notification: " << n.type;
+                    SinkTrace() << "Received notification: " << n;
+                    n.resource = d->resourceInstanceIdentifier;
                    emit notification(n);
                } break;
                case Sink::Notification::RevisionUpdate:
diff --git a/common/resourcecontext.h b/common/resourcecontext.h
index 6058ac7..6ceba01 100644
--- a/common/resourcecontext.h
+++ b/common/resourcecontext.h
@@ -55,7 +55,9 @@ struct ResourceContext {
    DomainTypeAdaptorFactoryInterface &adaptorFactory(const QByteArray &type) const
    {
        auto factory = adaptorFactories.value(type);
-        Q_ASSERT(factory);
+        if (!factory) {
+            qFatal("Failed to find a factory for %s", type.constData());
+        }
        return *factory;
    }
diff --git a/common/resourcecontrol.cpp b/common/resourcecontrol.cpp
index 1f61a1c..70a3f7d 100644
--- a/common/resourcecontrol.cpp
+++ b/common/resourcecontrol.cpp
@@ -100,9 +100,9 @@ KAsync::Job<void> ResourceControl::flush(Flush::FlushType type, const QByteArray
    auto notifier = QSharedPointer<Sink::Notifier>::create(resourceAccess);
    auto id = QUuid::createUuid().toByteArray();
    return KAsync::start<void>([=](KAsync::Future<void> &future) {
-            SinkTrace() << "Waiting for notification notification " << id;
+            SinkTrace() << "Waiting for flush completion notification " << id;
            notifier->registerHandler([&future, id](const Notification &notification) {
-                SinkTrace() << "Received notification " << notification.type << notification.id;
+                SinkTrace() << "Received notification: " << notification.type << notification.id;
                if (notification.id == id) {
                    SinkTrace() << "FlushComplete";
                    if (notification.code) {
diff --git a/common/resourcefacade.cpp b/common/resourcefacade.cpp
index 4a8037d..dee0711 100644
--- a/common/resourcefacade.cpp
+++ b/common/resourcefacade.cpp
@@ -34,33 +34,42 @@ SINK_DEBUG_AREA("ResourceFacade")
 template<typename DomainType>
 ConfigNotifier LocalStorageFacade<DomainType>::sConfigNotifier;
-static void applyConfig(ConfigStore &configStore, const QByteArray &id, ApplicationDomain::ApplicationDomainType &object)
+static void applyConfig(ConfigStore &configStore, const QByteArray &id, ApplicationDomain::ApplicationDomainType &object, const QByteArrayList &requestedProperties)
 {
    const auto configurationValues = configStore.get(id);
    for (auto it = configurationValues.constBegin(); it != configurationValues.constEnd(); it++) {
        object.setProperty(it.key(), it.value());
    }
+    //Populate the object with dummy values for non-available but requested properties.
+    //This avoid a warning about non-existing properties in bufferadaptor.h
+    if (!requestedProperties.isEmpty()) {
+        for (const auto &requested: requestedProperties) {
+            if (!object.hasProperty(requested)) {
+                object.setProperty(requested, QVariant{});
+            }
+        }
+    }
 }
 template <typename DomainType>
-static typename DomainType::Ptr readFromConfig(ConfigStore &configStore, const QByteArray &id, const QByteArray &type)
+static typename DomainType::Ptr readFromConfig(ConfigStore &configStore, const QByteArray &id, const QByteArray &type, const QByteArrayList &requestedProperties)
 {
    auto object = DomainType::Ptr::create(id);
-    applyConfig(configStore, id, *object);
+    applyConfig(configStore, id, *object, requestedProperties);
    return object;
 }
 template <>
-typename ApplicationDomain::SinkAccount::Ptr readFromConfig<ApplicationDomain::SinkAccount>(ConfigStore &configStore, const QByteArray &id, const QByteArray &type)
+typename ApplicationDomain::SinkAccount::Ptr readFromConfig<ApplicationDomain::SinkAccount>(ConfigStore &configStore, const QByteArray &id, const QByteArray &type, const QByteArrayList &requestedProperties)
 {
    auto object = ApplicationDomain::SinkAccount::Ptr::create(id);
    object->setProperty(ApplicationDomain::SinkAccount::AccountType::name, type);
-    applyConfig(configStore, id, *object);
+    applyConfig(configStore, id, *object, requestedProperties);
    return object;
 }
 template <>
-typename ApplicationDomain::SinkResource::Ptr readFromConfig<ApplicationDomain::SinkResource>(ConfigStore &configStore, const QByteArray &id, const QByteArray &type)
+typename ApplicationDomain::SinkResource::Ptr readFromConfig<ApplicationDomain::SinkResource>(ConfigStore &configStore, const QByteArray &id, const QByteArray &type, const QByteArrayList &requestedProperties)
 {
    auto object = ApplicationDomain::SinkResource::Ptr::create(id);
    object->setProperty(ApplicationDomain::SinkResource::ResourceType::name, type);
@@ -70,7 +79,7 @@ typename ApplicationDomain::SinkResource::Ptr readFromConfig<ApplicationDomain::
            object->setCapabilities(res->capabilities());
        }
    }
-    applyConfig(configStore, id, *object);
+    applyConfig(configStore, id, *object, requestedProperties);
    return object;
 }
@@ -104,7 +113,7 @@ LocalStorageQueryRunner<DomainType>::LocalStorageQueryRunner(const Query &query,
            if (!query.ids().isEmpty() && !query.ids().contains(res)) {
                continue;
            }
-            auto entity = readFromConfig<DomainType>(mConfigStore, res, type);
+            auto entity = readFromConfig<DomainType>(mConfigStore, res, type, query.requestedProperties);
            if (!matchesFilter(query.getBaseFilters(), *entity)){
                SinkTraceCtx(mLogCtx) << "Skipping due to filter." << res;
                continue;
@@ -169,7 +178,7 @@ template<typename DomainType>
 void LocalStorageQueryRunner<DomainType>::statusChanged(const QByteArray &identifier)
 {
    SinkTraceCtx(mLogCtx) << "Status changed " << identifier;
-    auto entity = readFromConfig<DomainType>(mConfigStore, identifier, ApplicationDomain::getTypeName<DomainType>());
+    auto entity = readFromConfig<DomainType>(mConfigStore, identifier, ApplicationDomain::getTypeName<DomainType>(), QByteArrayList{});
    updateStatus(*entity);
    mResultProvider->modify(entity);
 }
@@ -213,7 +222,7 @@ KAsync::Job<void> LocalStorageFacade<DomainType>::create(const DomainType &domai
            }
            configStore.modify(identifier, configurationValues);
        }
-        sConfigNotifier.add(::readFromConfig<DomainType>(configStore, identifier, type));
+        sConfigNotifier.add(::readFromConfig<DomainType>(configStore, identifier, type, QByteArrayList{}));
    });
 }
@@ -242,7 +251,7 @@ KAsync::Job<void> LocalStorageFacade<DomainType>::modify(const DomainType &domai
        }
        const auto type = configStore.getEntries().value(identifier);
-        sConfigNotifier.modify(::readFromConfig<DomainType>(configStore, identifier, type));
+        sConfigNotifier.modify(::readFromConfig<DomainType>(configStore, identifier, type, QByteArrayList{}));
    });
 }
@@ -337,10 +346,12 @@ QPair<KAsync::Job<void>, typename Sink::ResultEmitter<typename ApplicationDomain
    runner->setStatusUpdater([runner, monitoredResources, ctx](ApplicationDomain::SinkAccount &account) {
        Query query;
        query.filter<ApplicationDomain::SinkResource::Account>(account.identifier());
+        query.request<ApplicationDomain::SinkResource::Account>()
+             .request<ApplicationDomain::SinkResource::Capabilities>();
        const auto resources = Store::read<ApplicationDomain::SinkResource>(query);
        SinkTraceCtx(ctx) << "Found resource belonging to the account " << account.identifier() << " : " << resources;
        auto accountIdentifier = account.identifier();
-        ApplicationDomain::Status status = ApplicationDomain::ConnectedStatus;
+        QList<int> states;
        for (const auto &resource : resources) {
            auto resourceAccess = ResourceAccessFactory::instance().getAccess(resource.identifier(), ResourceConfig::getResourceType(resource.identifier()));
            if (!monitoredResources->contains(resource.identifier())) {
@@ -353,27 +364,20 @@ QPair<KAsync::Job<void>, typename Sink::ResultEmitter<typename ApplicationDomain
                Q_ASSERT(ret);
                monitoredResources->insert(resource.identifier());
            }
+            states << resourceAccess->getResourceStatus();
-            //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;
-            }
        }
+        const auto status = [&] {
+            if (states.contains(ApplicationDomain::ErrorStatus)) {
+                return ApplicationDomain::ErrorStatus;
+            }
+            if (states.contains(ApplicationDomain::BusyStatus)) {
+                return ApplicationDomain::BusyStatus;
+            }
+            if (states.contains(ApplicationDomain::ConnectedStatus)) {
+                return ApplicationDomain::ConnectedStatus;
+            }
+            return ApplicationDomain::OfflineStatus;
+        }();
        account.setStatusStatus(status);
    });
    return qMakePair(KAsync::null<void>(), runner->emitter());
diff --git a/common/resultprovider.h b/common/resultprovider.h
index a2ed0b5..d6feaf9 100644
--- a/common/resultprovider.h
+++ b/common/resultprovider.h
@@ -268,8 +268,9 @@ public:
    void initialResultSetComplete(const DomainType &parent, bool replayedAll)
    {
-        QMutexLocker locker{&mMutex};
+        //This callback is only ever called from the main thread, so we don't do any locking
        if (initialResultSetCompleteHandler && guardOk()) {
+            //This can directly lead to our destruction and thus waitForMethodExecutionEnd
            initialResultSetCompleteHandler(parent, replayedAll);
        }
    }
@@ -313,6 +314,13 @@ private:
    std::function<void(void)> clearHandler;
    std::function<void(const DomainType &parent)> mFetcher;
+    /*
+     * This mutex is here to protect the emitter from getting destroyed while the producer-thread (ResultProvider) is calling into it,
+     * and vice-verca, to protect the producer thread from calling into a destroyed emitter.
+     *
+     * This is necessary because Emitter and ResultProvider have lifetimes managed by two different threads.
+     * The emitter lives in the application thread, and the resultprovider in the query thread.
+     */
    QMutex mMutex;
    bool mDone = false;
 };
diff --git a/common/specialpurposepreprocessor.cpp b/common/specialpurposepreprocessor.cpp
index be5fa50..25a6d1a 100644
--- a/common/specialpurposepreprocessor.cpp
+++ b/common/specialpurposepreprocessor.cpp
@@ -46,7 +46,7 @@ QByteArray getSpecialPurposeType(const QString &name)
 }
 }
-SpecialPurposeProcessor::SpecialPurposeProcessor(const QByteArray &resourceType, const QByteArray &resourceInstanceIdentifier) : mResourceType(resourceType), mResourceInstanceIdentifier(resourceInstanceIdentifier) {}
+SpecialPurposeProcessor::SpecialPurposeProcessor() : Sink::Preprocessor() {}
 QByteArray SpecialPurposeProcessor::findFolder(const QByteArray &specialPurpose, bool createIfMissing)
 {
@@ -60,7 +60,7 @@ QByteArray SpecialPurposeProcessor::findFolder(const QByteArray &specialPurpose,
        if (!mSpecialPurposeFolders.contains(specialPurpose) && createIfMissing) {
            SinkTrace() << "Failed to find a " << specialPurpose << " folder, creating a new one";
-            auto folder = ApplicationDomain::Folder::create(mResourceInstanceIdentifier);
+            auto folder = ApplicationDomain::Folder::create(resourceInstanceIdentifier());
            folder.setSpecialPurpose(QByteArrayList() << specialPurpose);
            folder.setName(sSpecialPurposeFolders.value(specialPurpose));
            folder.setIcon("folder");
@@ -104,7 +104,19 @@ void SpecialPurposeProcessor::moveToFolder(Sink::ApplicationDomain::ApplicationD
 void SpecialPurposeProcessor::newEntity(Sink::ApplicationDomain::ApplicationDomainType &newEntity)
 {
-    moveToFolder(newEntity);
+    auto mail = newEntity.cast<ApplicationDomain::Mail>();
+    const auto folder = mail.getFolder();
+    if (folder.isEmpty()) {
+        moveToFolder(newEntity);
+    } else {
+        bool isDraft = findFolder(ApplicationDomain::SpecialPurpose::Mail::drafts) == folder;
+        bool isSent = findFolder(ApplicationDomain::SpecialPurpose::Mail::sent) == folder;
+        bool isTrash = findFolder(ApplicationDomain::SpecialPurpose::Mail::trash) == folder;
+        mail.setDraft(isDraft);
+        mail.setTrash(isTrash);
+        mail.setSent(isSent);
+    }
 }
 void SpecialPurposeProcessor::modifiedEntity(const Sink::ApplicationDomain::ApplicationDomainType &oldEntity, Sink::ApplicationDomain::ApplicationDomainType &newEntity)
@@ -118,8 +130,8 @@ void SpecialPurposeProcessor::modifiedEntity(const Sink::ApplicationDomain::Appl
        bool isSent = findFolder(ApplicationDomain::SpecialPurpose::Mail::sent) == folder;
        bool isTrash = findFolder(ApplicationDomain::SpecialPurpose::Mail::trash) == folder;
        mail.setDraft(isDraft);
-        mail.setTrash(isSent);
+        mail.setTrash(isTrash);
-        mail.setSent(isTrash);
+        mail.setSent(isSent);
    } else {
        moveToFolder(newEntity);
    }
diff --git a/common/specialpurposepreprocessor.h b/common/specialpurposepreprocessor.h
index 6eb325c..6173aff 100644
--- a/common/specialpurposepreprocessor.h
+++ b/common/specialpurposepreprocessor.h
@@ -28,7 +28,7 @@ namespace SpecialPurpose {
 class SINK_EXPORT SpecialPurposeProcessor : public Sink::Preprocessor
 {
 public:
-    SpecialPurposeProcessor(const QByteArray &resourceType, const QByteArray &resourceInstanceIdentifier);
+    SpecialPurposeProcessor();
    void newEntity(Sink::ApplicationDomain::ApplicationDomainType &newEntity) Q_DECL_OVERRIDE;
    void modifiedEntity(const Sink::ApplicationDomain::ApplicationDomainType &oldEntity, Sink::ApplicationDomain::ApplicationDomainType &newEntity) Q_DECL_OVERRIDE;
@@ -39,6 +39,4 @@ private:
    bool isSpecialPurposeFolder(const QByteArray &folder) const;
    QHash<QByteArray, QByteArray> mSpecialPurposeFolders;
-    QByteArray mResourceType;
-    QByteArray mResourceInstanceIdentifier;
 };
diff --git a/common/storage.h b/common/storage.h
index fd349f3..71e9401 100644
--- a/common/storage.h
+++ b/common/storage.h
@@ -128,14 +128,14 @@ public:
    public:
        Transaction();
        ~Transaction();
-        bool commit(const std::function<void(const DataStore::Error &error)> &errorHandler = std::function<void(const DataStore::Error &error)>());
+        bool commit(const std::function<void(const DataStore::Error &error)> &errorHandler = {});
        void abort();
        QList<QByteArray> getDatabaseNames() const;
        bool validateNamedDatabases();
-        NamedDatabase openDatabase(const QByteArray &name = QByteArray("default"),
+        NamedDatabase openDatabase(const QByteArray &name = {"default"},
-            const std::function<void(const DataStore::Error &error)> &errorHandler = std::function<void(const DataStore::Error &error)>(), bool allowDuplicates = false) const;
+            const std::function<void(const DataStore::Error &error)> &errorHandler = {}, bool allowDuplicates = false) const;
        Transaction(Transaction &&other);
        Transaction &operator=(Transaction &&other);
@@ -189,6 +189,9 @@ public:
    static QByteArray getTypeFromRevision(const Transaction &, qint64 revision);
    static void recordRevision(Transaction &, qint64 revision, const QByteArray &uid, const QByteArray &type);
    static void removeRevision(Transaction &, qint64 revision);
+    static void recordUid(DataStore::Transaction &transaction, const QByteArray &uid);
+    static void removeUid(DataStore::Transaction &transaction, const QByteArray &uid);
+    static void getUids(const Transaction &, const std::function<void(const QByteArray &uid)> &);
    bool exists() const;
diff --git a/common/storage/entitystore.cpp b/common/storage/entitystore.cpp
index 909f1b2..b7309ab 100644
--- a/common/storage/entitystore.cpp
+++ b/common/storage/entitystore.cpp
@@ -31,8 +31,7 @@
 #include "bufferutils.h"
 #include "entity_generated.h"
 #include "applicationdomaintype_p.h"
+#include "typeimplementations.h"
-#include "domaintypes.h"
 using namespace Sink;
 using namespace Sink::Storage;
@@ -168,19 +167,15 @@ void EntityStore::copyBlobs(ApplicationDomain::ApplicationDomainType &entity, qi
    }
 }
-bool EntityStore::add(const QByteArray &type, const ApplicationDomain::ApplicationDomainType &entity_, bool replayToSource, const PreprocessCreation &preprocess)
+bool EntityStore::add(const QByteArray &type, ApplicationDomain::ApplicationDomainType entity, bool replayToSource)
 {
-    if (entity_.identifier().isEmpty()) {
+    if (entity.identifier().isEmpty()) {
        SinkWarningCtx(d->logCtx) << "Can't write entity with an empty identifier";
        return false;
    }
-    auto entity = *ApplicationDomain::ApplicationDomainType::getInMemoryRepresentation<ApplicationDomain::ApplicationDomainType>(entity_, entity_.availableProperties());
-    entity.setChangedProperties(entity.availableProperties().toSet());
    SinkTraceCtx(d->logCtx) << "New entity " << entity;
-    preprocess(entity);
    d->typeIndex(type).add(entity.identifier(), entity, d->transaction);
    //The maxRevision may have changed meanwhile if the entity created sub-entities
@@ -205,26 +200,20 @@ bool EntityStore::add(const QByteArray &type, const ApplicationDomain::Applicati
            [&](const DataStore::Error &error) { SinkWarningCtx(d->logCtx) << "Failed to write entity" << entity.identifier() << newRevision; });
    DataStore::setMaxRevision(d->transaction, newRevision);
    DataStore::recordRevision(d->transaction, newRevision, entity.identifier(), type);
+    DataStore::recordUid(d->transaction, entity.identifier());
    SinkTraceCtx(d->logCtx) << "Wrote entity: " << entity.identifier() << type << newRevision;
    return true;
 }
-bool EntityStore::modify(const QByteArray &type, const ApplicationDomain::ApplicationDomainType &diff, const QByteArrayList &deletions, bool replayToSource, const PreprocessModification &preprocess)
+ApplicationDomain::ApplicationDomainType EntityStore::applyDiff(const QByteArray &type, const ApplicationDomain::ApplicationDomainType &current, const ApplicationDomain::ApplicationDomainType &diff, const QByteArrayList &deletions) const
 {
-    auto changeset = diff.changedProperties();
-    const auto current = readLatest(type, diff.identifier());
-    if (current.identifier().isEmpty()) {
-        SinkWarningCtx(d->logCtx) << "Failed to read current version: " << diff.identifier();
-        return false;
-    }
    auto newEntity = *ApplicationDomain::ApplicationDomainType::getInMemoryRepresentation<ApplicationDomain::ApplicationDomainType>(current, current.availableProperties());
    SinkTraceCtx(d->logCtx) << "Modified entity: " << newEntity;
    // Apply diff
    //SinkTrace() << "Applying changed properties: " << changeset;
-    for (const auto &property : changeset) {
+    for (const auto &property : diff.changedProperties()) {
        const auto value = diff.getProperty(property);
        if (value.isValid()) {
            //SinkTrace() << "Setting property: " << property;
@@ -237,8 +226,25 @@ bool EntityStore::modify(const QByteArray &type, const ApplicationDomain::Applic
        //SinkTrace() << "Removing property: " << property;
        newEntity.setProperty(property, QVariant());
    }
+    return newEntity;
+}
+bool EntityStore::modify(const QByteArray &type, const ApplicationDomain::ApplicationDomainType &diff, const QByteArrayList &deletions, bool replayToSource)
+{
+    const auto current = readLatest(type, diff.identifier());
+    if (current.identifier().isEmpty()) {
+        SinkWarningCtx(d->logCtx) << "Failed to read current version: " << diff.identifier();
+        return false;
+    }
+    auto newEntity = applyDiff(type, current, diff, deletions);
+    return modify(type, current, newEntity, replayToSource);
+}
+bool EntityStore::modify(const QByteArray &type, const ApplicationDomain::ApplicationDomainType &current, ApplicationDomain::ApplicationDomainType newEntity, bool replayToSource)
+{
+    SinkTraceCtx(d->logCtx) << "Modified entity: " << newEntity;
-    preprocess(current, newEntity);
    d->typeIndex(type).remove(current.identifier(), current, d->transaction);
    d->typeIndex(type).add(newEntity.identifier(), newEntity, d->transaction);
@@ -250,7 +256,7 @@ bool EntityStore::modify(const QByteArray &type, const ApplicationDomain::Applic
    flatbuffers::FlatBufferBuilder metadataFbb;
    {
        //We add availableProperties to account for the properties that have been changed by the preprocessors
-        auto modifiedProperties = BufferUtils::toVector(metadataFbb, changeset + newEntity.changedProperties());
+        auto modifiedProperties = BufferUtils::toVector(metadataFbb, newEntity.changedProperties());
        auto metadataBuilder = MetadataBuilder(metadataFbb);
        metadataBuilder.add_revision(newRevision);
        metadataBuilder.add_operation(Operation_Modification);
@@ -259,7 +265,7 @@ bool EntityStore::modify(const QByteArray &type, const ApplicationDomain::Applic
        auto metadataBuffer = metadataBuilder.Finish();
        FinishMetadataBuffer(metadataFbb, metadataBuffer);
    }
-    SinkTraceCtx(d->logCtx) << "Changed properties: " << changeset + newEntity.changedProperties();
+    SinkTraceCtx(d->logCtx) << "Changed properties: " << newEntity.changedProperties();
    newEntity.setChangedProperties(newEntity.availableProperties().toSet());
@@ -275,36 +281,14 @@ bool EntityStore::modify(const QByteArray &type, const ApplicationDomain::Applic
    return true;
 }
-bool EntityStore::remove(const QByteArray &type, const QByteArray &uid, bool replayToSource, const PreprocessRemoval &preprocess)
+bool EntityStore::remove(const QByteArray &type, const Sink::ApplicationDomain::ApplicationDomainType &current, bool replayToSource)
 {
-    bool found = false;
+    const auto uid = current.identifier();
-    bool alreadyRemoved = false;
+    if (!exists(type, uid)) {
-    DataStore::mainDatabase(d->transaction, type)
-        .findLatest(uid,
-            [&found, &alreadyRemoved](const QByteArray &key, const QByteArray &data) -> bool {
-                auto entity = GetEntity(data.data());
-                if (entity && entity->metadata()) {
-                    auto metadata = GetMetadata(entity->metadata()->Data());
-                    found = true;
-                    if (metadata->operation() == Operation_Removal) {
-                        alreadyRemoved = true;
-                    }
-                }
-                return false;
-            },
-            [&](const DataStore::Error &error) { SinkWarningCtx(d->logCtx) << "Failed to read old revision from storage: " << error.message; });
-    if (!found) {
-        SinkWarningCtx(d->logCtx) << "Remove: Failed to find entity " << uid;
-        return false;
-    }
-    if (alreadyRemoved) {
        SinkWarningCtx(d->logCtx) << "Remove: Entity is already removed " << uid;
        return false;
    }
-    const auto current = readLatest(type, uid);
-    preprocess(current);
    d->typeIndex(type).remove(current.identifier(), current, d->transaction);
    SinkTraceCtx(d->logCtx) << "Removed entity " << current;
@@ -328,6 +312,7 @@ bool EntityStore::remove(const QByteArray &type, const QByteArray &uid, bool rep
            [&](const DataStore::Error &error) { SinkWarningCtx(d->logCtx) << "Failed to write entity" << uid << newRevision; });
    DataStore::setMaxRevision(d->transaction, newRevision);
    DataStore::recordRevision(d->transaction, newRevision, uid, type);
+    DataStore::removeUid(d->transaction, uid);
    return true;
 }
@@ -521,15 +506,9 @@ ApplicationDomain::ApplicationDomainType EntityStore::readEntity(const QByteArra
 void EntityStore::readAll(const QByteArray &type, const std::function<void(const ApplicationDomain::ApplicationDomainType &entity)> &callback)
 {
-    auto db = DataStore::mainDatabase(d->getTransaction(), type);
+    readAllUids(type, [&] (const QByteArray &uid) {
-    db.scan("",
+        readLatest(type, uid, callback);
-        [=](const QByteArray &key, const QByteArray &value) -> bool {
+    });
-            auto uid = DataStore::uidFromKey(key);
-            auto buffer = Sink::EntityBuffer{value.data(), value.size()};
-            callback(d->createApplicationDomainType(type, uid, DataStore::maxRevision(d->getTransaction()), buffer));
-            return true;
-        },
-        [&](const DataStore::Error &error) { SinkWarningCtx(d->logCtx) << "Error during query: " << error.message; });
 }
 void EntityStore::readRevisions(qint64 baseRevision, const QByteArray &expectedType, const std::function<void(const QByteArray &key)> &callback)
@@ -588,15 +567,7 @@ ApplicationDomain::ApplicationDomainType EntityStore::readPrevious(const QByteAr
 void EntityStore::readAllUids(const QByteArray &type, const std::function<void(const QByteArray &uid)> callback)
 {
-    //TODO use uid index instead
+    DataStore::getUids(d->getTransaction(), callback);
-    //FIXME we currently report each uid for every revision with the same uid
-    auto db = DataStore::mainDatabase(d->getTransaction(), type);
-    db.scan("",
-        [callback](const QByteArray &key, const QByteArray &) -> bool {
-            callback(Sink::Storage::DataStore::uidFromKey(key));
-            return true;
-        },
-        [&](const Sink::Storage::DataStore::Error &error) { SinkWarningCtx(d->logCtx) << "Failed to read current value from storage: " << error.message; });
 }
 bool EntityStore::contains(const QByteArray &type, const QByteArray &uid)
@@ -604,6 +575,36 @@ bool EntityStore::contains(const QByteArray &type, const QByteArray &uid)
    return DataStore::mainDatabase(d->getTransaction(), type).contains(uid);
 }
+bool EntityStore::exists(const QByteArray &type, const QByteArray &uid)
+{
+    bool found = false;
+    bool alreadyRemoved = false;
+    DataStore::mainDatabase(d->transaction, type)
+        .findLatest(uid,
+            [&found, &alreadyRemoved](const QByteArray &key, const QByteArray &data) -> bool {
+                auto entity = GetEntity(data.data());
+                if (entity && entity->metadata()) {
+                    auto metadata = GetMetadata(entity->metadata()->Data());
+                    found = true;
+                    if (metadata->operation() == Operation_Removal) {
+                        alreadyRemoved = true;
+                    }
+                }
+                return false;
+            },
+            [&](const DataStore::Error &error) { SinkWarningCtx(d->logCtx) << "Failed to read old revision from storage: " << error.message; });
+    if (!found) {
+        SinkTraceCtx(d->logCtx) << "Remove: Failed to find entity " << uid;
+        return false;
+    }
+    if (alreadyRemoved) {
+        SinkTraceCtx(d->logCtx) << "Remove: Entity is already removed " << uid;
+        return false;
+    }
+    return true;
+}
 qint64 EntityStore::maxRevision()
 {
    if (!d->exists()) {
diff --git a/common/storage/entitystore.h b/common/storage/entitystore.h
index 46410cd..00241f2 100644
--- a/common/storage/entitystore.h
+++ b/common/storage/entitystore.h
@@ -38,15 +38,13 @@ public:
    typedef QSharedPointer<EntityStore> Ptr;
    EntityStore(const ResourceContext &resourceContext, const Sink::Log::Context &);
-    typedef std::function<void(const ApplicationDomain::ApplicationDomainType &, ApplicationDomain::ApplicationDomainType &)> PreprocessModification;
-    typedef std::function<void(ApplicationDomain::ApplicationDomainType &)> PreprocessCreation;
-    typedef std::function<void(const ApplicationDomain::ApplicationDomainType &)> PreprocessRemoval;
    //Only the pipeline may call the following functions outside of tests
-    bool add(const QByteArray &type, const ApplicationDomain::ApplicationDomainType &, bool replayToSource, const PreprocessCreation &);
+    bool add(const QByteArray &type, ApplicationDomain::ApplicationDomainType newEntity, bool replayToSource);
-    bool modify(const QByteArray &type, const ApplicationDomain::ApplicationDomainType &, const QByteArrayList &deletions, bool replayToSource, const PreprocessModification &);
+    bool modify(const QByteArray &type, const ApplicationDomain::ApplicationDomainType &diff, const QByteArrayList &deletions, bool replayToSource);
-    bool remove(const QByteArray &type, const QByteArray &uid, bool replayToSource, const PreprocessRemoval &);
+    bool modify(const QByteArray &type, const ApplicationDomain::ApplicationDomainType &current, ApplicationDomain::ApplicationDomainType newEntity, bool replayToSource);
+    bool remove(const QByteArray &type, const ApplicationDomain::ApplicationDomainType &current, bool replayToSource);
    bool cleanupRevisions(qint64 revision);
+    ApplicationDomain::ApplicationDomainType applyDiff(const QByteArray &type, const ApplicationDomain::ApplicationDomainType &current, const ApplicationDomain::ApplicationDomainType &diff, const QByteArrayList &deletions) const;
    void startTransaction(Sink::Storage::DataStore::AccessMode);
    void commitTransaction();
@@ -105,8 +103,12 @@ public:
    void readRevisions(qint64 baseRevision, const QByteArray &type, const std::function<void(const QByteArray &key)> &callback);
+    ///Db contains entity (but may already be marked as removed
    bool contains(const QByteArray &type, const QByteArray &uid);
+    ///Db contains entity and entity is not yet removed
+    bool exists(const QByteArray &type, const QByteArray &uid);
    qint64 maxRevision();
    Sink::Log::Context logContext() const;
diff --git a/common/storage_common.cpp b/common/storage_common.cpp
index d8b1f42..81a38c7 100644
--- a/common/storage_common.cpp
+++ b/common/storage_common.cpp
@@ -28,7 +28,7 @@ SINK_DEBUG_AREA("storage")
 QDebug& operator<<(QDebug &dbg, const Sink::Storage::DataStore::Error &error)
 {
-    dbg << error.message;
+    dbg << error.message << "Code: " << error.code << "Db: " << error.store;
    return dbg;
 }
@@ -146,6 +146,24 @@ void DataStore::removeRevision(DataStore::Transaction &transaction, qint64 revis
    transaction.openDatabase("revisionType").remove(QByteArray::number(revision));
 }
+void DataStore::recordUid(DataStore::Transaction &transaction, const QByteArray &uid)
+{
+    transaction.openDatabase("uids").write(uid, "");
+}
+void DataStore::removeUid(DataStore::Transaction &transaction, const QByteArray &uid)
+{
+    transaction.openDatabase("uids").remove(uid);
+}
+void DataStore::getUids(const Transaction &transaction, const std::function<void(const QByteArray &uid)> &callback)
+{
+    transaction.openDatabase("uids").scan("", [&] (const QByteArray &key, const QByteArray &) {
+        callback(key);
+        return true;
+    });
+}
 bool DataStore::isInternalKey(const char *key)
 {
    return key && strncmp(key, s_internalPrefix, s_internalPrefixSize) == 0;
diff --git a/common/storage_lmdb.cpp b/common/storage_lmdb.cpp
index ed385ad..08eea37 100644
--- a/common/storage_lmdb.cpp
+++ b/common/storage_lmdb.cpp
@@ -62,6 +62,44 @@ int getErrorCode(int e)
    return -1;
 }
+static QList<QByteArray> getDatabaseNames(MDB_txn *transaction)
+{
+    if (!transaction) {
+        SinkWarning() << "Invalid transaction";
+        return QList<QByteArray>();
+    }
+    int rc;
+    QList<QByteArray> list;
+    MDB_dbi dbi;
+    if ((rc = mdb_dbi_open(transaction, nullptr, 0, &dbi) == 0)) {
+        MDB_val key;
+        MDB_val data;
+        MDB_cursor *cursor;
+        mdb_cursor_open(transaction, dbi, &cursor);
+        if ((rc = mdb_cursor_get(cursor, &key, &data, MDB_FIRST)) == 0) {
+            list << QByteArray::fromRawData((char *)key.mv_data, key.mv_size);
+            while ((rc = mdb_cursor_get(cursor, &key, &data, MDB_NEXT)) == 0) {
+                list << QByteArray::fromRawData((char *)key.mv_data, key.mv_size);
+            }
+        } else {
+            //Normal if we don't have any databases yet
+            if (rc == MDB_NOTFOUND) {
+                rc = 0;
+            }
+            if (rc) {
+                SinkWarning() << "Failed to get a value" << rc;
+            }
+        }
+        mdb_cursor_close(cursor);
+    } else {
+        SinkWarning() << "Failed to open db" << rc << QByteArray(mdb_strerror(rc));
+    }
+    return list;
+}
 class DataStore::NamedDatabase::Private
 {
 public:
@@ -93,6 +131,18 @@ public:
        const auto dbiName = name + db;
        if (sDbis.contains(dbiName)) {
            dbi = sDbis.value(dbiName);
+            //sDbis can contain dbi's that are not available to this transaction.
+            //We use mdb_dbi_flags to check if the dbi is valid for this transaction.
+            uint f;
+            if (mdb_dbi_flags(transaction, dbi, &f) == EINVAL) {
+                //In readonly mode we can just ignore this. In read-write we would have tried to concurrently create a db.
+                if (!readOnly) {
+                    SinkWarning() << "Tried to create database in second transaction: " << dbiName;
+                }
+                dbi = 0;
+                transaction = 0;
+                return false;
+            }
        } else {
            MDB_dbi flagtableDbi;
            if (const int rc = mdb_dbi_open(transaction, "__flagtable", readOnly ? 0 : MDB_CREATE, &flagtableDbi)) {
@@ -279,7 +329,8 @@ int DataStore::NamedDatabase::scan(const QByteArray &k, const std::function<bool
    rc = mdb_cursor_open(d->transaction, d->dbi, &cursor);
    if (rc) {
-        Error error(d->name.toLatin1() + d->db, getErrorCode(rc), QByteArray("Error during mdb_cursor open: ") + QByteArray(mdb_strerror(rc)));
+        //Invalid arguments can mean that the transaction doesn't contain the db dbi
+        Error error(d->name.toLatin1() + d->db, getErrorCode(rc), QByteArray("Error during mdb_cursor_open: ") + QByteArray(mdb_strerror(rc)) + ". Key: " + k);
        errorHandler ? errorHandler(error) : d->defaultErrorHandler(error);
        return 0;
    }
@@ -447,7 +498,6 @@ public:
    MDB_env *env;
    MDB_txn *transaction;
-    MDB_dbi dbi;
    bool requestedRead;
    std::function<void(const DataStore::Error &error)> defaultErrorHandler;
    QString name;
@@ -578,8 +628,7 @@ static bool ensureCorrectDb(DataStore::NamedDatabase &database, const QByteArray
        }
        return false;
    },
-    [](const DataStore::Error &error) -> bool{
+    [&](const DataStore::Error &) {
-        return false;
    }, false);
    //This is the first time we open this database in a write transaction, write the db name
    if (!count) {
@@ -637,35 +686,8 @@ QList<QByteArray> DataStore::Transaction::getDatabaseNames() const
        SinkWarning() << "Invalid transaction";
        return QList<QByteArray>();
    }
+    return Sink::Storage::getDatabaseNames(d->transaction);
-    int rc;
-    QList<QByteArray> list;
-    Q_ASSERT(d->transaction);
-    if ((rc = mdb_dbi_open(d->transaction, nullptr, 0, &d->dbi) == 0)) {
-        MDB_val key;
-        MDB_val data;
-        MDB_cursor *cursor;
-        mdb_cursor_open(d->transaction, d->dbi, &cursor);
-        if ((rc = mdb_cursor_get(cursor, &key, &data, MDB_FIRST)) == 0) {
-            list << QByteArray::fromRawData((char *)key.mv_data, key.mv_size);
-            while ((rc = mdb_cursor_get(cursor, &key, &data, MDB_NEXT)) == 0) {
-                list << QByteArray::fromRawData((char *)key.mv_data, key.mv_size);
-            }
-        } else {
-            //Normal if we don't have any databases yet
-            if (rc == MDB_NOTFOUND) {
-                rc = 0;
-            }
-            if (rc) {
-                SinkWarning() << "Failed to get a value" << rc;
-            }
-        }
-        mdb_cursor_close(cursor);
-    } else {
-        SinkWarning() << "Failed to open db" << rc << QByteArray(mdb_strerror(rc));
-    }
-    return list;
 }
diff --git a/common/store.cpp b/common/store.cpp
index 1c8620b..d266098 100644
--- a/common/store.cpp
+++ b/common/store.cpp
@@ -92,6 +92,7 @@ QPair<typename AggregatingResultEmitter<typename DomainType::Ptr>::Ptr,  typenam
        auto facade = FacadeFactory::instance().getFacade<ApplicationDomain::SinkResource>();
        Q_ASSERT(facade);
        Sink::Query resourceQuery;
+        resourceQuery.request<ApplicationDomain::SinkResource::Capabilities>();
        if (query.liveQuery()) {
            SinkTraceCtx(ctx) << "Listening for new resources.";
            resourceQuery.setFlags(Query::LiveQuery);
@@ -103,6 +104,7 @@ QPair<typename AggregatingResultEmitter<typename DomainType::Ptr>::Ptr,  typenam
            resourceFilter.propertyFilter.insert(ApplicationDomain::SinkResource::Capabilities::name, Query::Comparator{ApplicationDomain::getTypeName<DomainType>(), Query::Comparator::Contains});
        }
        resourceQuery.setFilter(resourceFilter);
+        resourceQuery.requestedProperties << resourceFilter.propertyFilter.keys();
        auto result = facade->load(resourceQuery, resourceCtx);
        auto emitter = result.second;
@@ -249,7 +251,7 @@ KAsync::Job<void> Store::remove(const Sink::Query &query)
 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
+    // TODO: all clients should react to a notification from the resource
    Sink::Storage::DataStore::clearEnv();
    SinkTrace() << "Remove data from disk " << identifier;
    auto time = QSharedPointer<QTime>::create();
@@ -277,18 +279,18 @@ KAsync::Job<void> Store::removeDataFromDisk(const QByteArray &identifier)
 static KAsync::Job<void> synchronize(const QByteArray &resource, const Sink::SyncScope &scope)
 {
-    SinkLog() << "Synchronizing " << resource;
+    SinkLog() << "Synchronizing " << resource << scope;
    auto resourceAccess = ResourceAccessFactory::instance().getAccess(resource, ResourceConfig::getResourceType(resource));
    return resourceAccess->synchronizeResource(scope)
        .addToContext(resourceAccess)
-        .then<void>([](const KAsync::Error &error) {
+        .then([=](const KAsync::Error &error) {
-                if (error) {
+            if (error) {
-                    SinkWarning() << "Error during sync.";
+                SinkWarning() << "Error during sync.";
-                    return KAsync::error<void>(error);
+                return KAsync::error(error);
-                }
+            }
-                SinkTrace() << "synced.";
+            SinkTrace() << "Synchronization of resource " << resource << " complete.";
-                return KAsync::null<void>();
+            return KAsync::null();
-            });
+        });
 }
 KAsync::Job<void> Store::synchronize(const Sink::Query &query)
diff --git a/common/store.h b/common/store.h
index 86e4d20..fae76e5 100644
--- a/common/store.h
+++ b/common/store.h
@@ -48,11 +48,15 @@ QString SINK_EXPORT storageLocation();
 */
 QString SINK_EXPORT getTemporaryFilePath();
+// Must be the same as in ModelResult
 enum Roles
 {
-    DomainObjectRole = Qt::UserRole + 1, // Must be the same as in ModelResult
+    DomainObjectRole = Qt::UserRole + 1,
    ChildrenFetchedRole,
-    DomainObjectBaseRole
+    DomainObjectBaseRole,
+    StatusRole, //ApplicationDomain::SyncStatus
+    WarningRole, //ApplicationDomain::Warning, only if status == warning || status == error
+    ProgressRole //ApplicationDomain::Progress
 };
 /**
diff --git a/common/synchronizer.cpp b/common/synchronizer.cpp
index b147615..3e7bd30 100644
--- a/common/synchronizer.cpp
+++ b/common/synchronizer.cpp
@@ -33,13 +33,14 @@
 using namespace Sink;
 Synchronizer::Synchronizer(const Sink::ResourceContext &context)
-    : ChangeReplay(context),
+    : ChangeReplay(context, {"synchronizer"}),
    mLogCtx{"synchronizer"},
    mResourceContext(context),
    mEntityStore(Storage::EntityStore::Ptr::create(mResourceContext, mLogCtx)),
    mSyncStorage(Sink::storageLocation(), mResourceContext.instanceId() + ".synchronization", Sink::Storage::DataStore::DataStore::ReadWrite),
    mSyncInProgress(false)
 {
+    mCurrentState.push(ApplicationDomain::Status::OfflineStatus);
    SinkTraceCtx(mLogCtx) << "Starting synchronizer: " << mResourceContext.resourceType << mResourceContext.instanceId();
 }
@@ -252,15 +253,21 @@ void Synchronizer::modify(const DomainType &entity, const QByteArray &newResourc
 QList<Synchronizer::SyncRequest> Synchronizer::getSyncRequests(const Sink::QueryBase &query)
 {
-    QList<Synchronizer::SyncRequest> list;
+    return QList<Synchronizer::SyncRequest>() << Synchronizer::SyncRequest{query, "sync"};
-    list << Synchronizer::SyncRequest{query, "sync"};
+}
-    return list;
+void Synchronizer::mergeIntoQueue(const Synchronizer::SyncRequest &request, QList<Synchronizer::SyncRequest> &queue)
+{
+    mSyncRequestQueue << request;
 }
 void Synchronizer::synchronize(const Sink::QueryBase &query)
 {
    SinkTraceCtx(mLogCtx) << "Synchronizing";
-    mSyncRequestQueue << getSyncRequests(query);
+    auto newRequests = getSyncRequests(query);
+    for (const auto &request: newRequests) {
+        mergeIntoQueue(request, mSyncRequestQueue);
+    }
    processSyncQueue().exec();
 }
@@ -286,6 +293,42 @@ void Synchronizer::flushComplete(const QByteArray &flushId)
    }
 }
+void Synchronizer::emitNotification(Notification::NoticationType type, int code, const QString &message, const QByteArray &id, const QByteArrayList &entities)
+{
+    Sink::Notification n;
+    n.id = id;
+    n.type = type;
+    n.message = message;
+    n.code = code;
+    n.entities = entities;
+    emit notify(n);
+}
+void Synchronizer::reportProgress(int progress, int total)
+{
+    SinkLogCtx(mLogCtx) << "Progress: " << progress << " out of " << total;
+}
+void Synchronizer::setStatusFromResult(const KAsync::Error &error, const QString &s, const QByteArray &requestId)
+{
+    if (error) {
+        if (error.errorCode == ApplicationDomain::ConnectionError) {
+            //Couldn't connect, so we assume we don't have a network connection.
+            setStatus(ApplicationDomain::OfflineStatus, s, requestId);
+        } else if (error.errorCode == ApplicationDomain::ConfigurationError) {
+            //There is an error with the configuration.
+            setStatus(ApplicationDomain::ErrorStatus, s, requestId);
+        } else if (error.errorCode == ApplicationDomain::LoginError) {
+            //If we failed to login altough we could connect that indicates a problem with our setup.
+            setStatus(ApplicationDomain::ErrorStatus, s, requestId);
+        }
+        //We don't know what kind of error this was, so we assume it's transient and don't change ou status.
+    } else {
+        //An operation against the server worked, so we're probably online.
+        setStatus(ApplicationDomain::ConnectedStatus, s, requestId);
+    }
+}
 KAsync::Job<void> Synchronizer::processRequest(const SyncRequest &request)
 {
    if (request.options & SyncRequest::RequestFlush) {
@@ -310,35 +353,21 @@ KAsync::Job<void> Synchronizer::processRequest(const SyncRequest &request)
        });
    } else if (request.requestType == Synchronizer::SyncRequest::Synchronization) {
        return KAsync::start([this, request] {
-            Sink::Notification n;
-            n.id = request.requestId;
-            n.type = Notification::Status;
-            n.message = "Synchronization has started.";
-            n.code = ApplicationDomain::BusyStatus;
-            emit notify(n);
            SinkLogCtx(mLogCtx) << "Synchronizing: " << request.query;
+            emitNotification(Notification::Info, ApplicationDomain::SyncInProgress, {}, {}, request.applicableEntities);
        }).then(synchronizeWithSource(request.query)).then([this] {
            //Commit after every request, so implementations only have to commit more if they add a lot of data.
            commit();
        }).then<void>([this, request](const KAsync::Error &error) {
+            setStatusFromResult(error, "Synchronization has ended.", request.requestId);
            if (error) {
                //Emit notification with error
-                SinkWarningCtx(mLogCtx) << "Synchronization failed: " << error.errorMessage;
+                SinkWarningCtx(mLogCtx) << "Synchronization failed: " << error;
-                Sink::Notification n;
+                emitNotification(Notification::Warning, ApplicationDomain::SyncError, {}, {}, request.applicableEntities);
-                n.id = request.requestId;
-                n.type = Notification::Status;
-                n.message = "Synchronization has ended.";
-                n.code = ApplicationDomain::ErrorStatus;
-                emit notify(n);
                return KAsync::error(error);
            } else {
                SinkLogCtx(mLogCtx) << "Done Synchronizing";
-                Sink::Notification n;
+                emitNotification(Notification::Info, ApplicationDomain::SyncSuccess, {}, {}, request.applicableEntities);
-                n.id = request.requestId;
-                n.type = Notification::Status;
-                n.message = "Synchronization has ended.";
-                n.code = ApplicationDomain::ConnectedStatus;
-                emit notify(n);
                return KAsync::null();
            }
        });
@@ -347,11 +376,8 @@ KAsync::Job<void> Synchronizer::processRequest(const SyncRequest &request)
            Q_ASSERT(!request.requestId.isEmpty());
            //FIXME it looks like this is emitted before the replay actually finishes
            if (request.flushType == Flush::FlushReplayQueue) {
-                SinkTraceCtx(mLogCtx) << "Emitting flush completion.";
+                SinkTraceCtx(mLogCtx) << "Emitting flush completion: " << request.requestId;
-                Sink::Notification n;
+                emitNotification(Notification::FlushCompletion, 0, "", request.requestId);
-                n.type = Sink::Notification::FlushCompletion;
-                n.id = request.requestId;
-                emit notify(n);
            } else {
                flatbuffers::FlatBufferBuilder fbb;
                auto flushId = fbb.CreateString(request.requestId.toStdString());
@@ -361,7 +387,24 @@ KAsync::Job<void> Synchronizer::processRequest(const SyncRequest &request)
            }
        });
    } else if (request.requestType == Synchronizer::SyncRequest::ChangeReplay) {
-        return replayNextRevision();
+        if (ChangeReplay::allChangesReplayed()) {
+            return KAsync::null();
+        } else {
+            return KAsync::start([this, request] {
+                SinkLogCtx(mLogCtx) << "Replaying changes.";
+            })
+            .then(replayNextRevision())
+            .then<void>([this, request](const KAsync::Error &error) {
+                setStatusFromResult(error, "Changereplay has ended.", "changereplay");
+                if (error) {
+                    SinkWarningCtx(mLogCtx) << "Changereplay failed: " << error.errorMessage;
+                    return KAsync::error(error);
+                } else {
+                    SinkLogCtx(mLogCtx) << "Done replaying changes";
+                    return KAsync::null();
+                }
+            });
+        }
    } else {
        SinkWarningCtx(mLogCtx) << "Unknown request type: " << request.requestType;
        return KAsync::error(KAsync::Error{"Unknown request type."});
@@ -369,6 +412,34 @@ KAsync::Job<void> Synchronizer::processRequest(const SyncRequest &request)
 }
+void Synchronizer::setStatus(ApplicationDomain::Status state, const QString &reason, const QByteArray requestId)
+{
+    if (state != mCurrentState.top()) {
+        if (mCurrentState.top() == ApplicationDomain::BusyStatus) {
+            mCurrentState.pop();
+        }
+        mCurrentState.push(state);
+        emitNotification(Notification::Status, state, reason, requestId);
+    }
+}
+void Synchronizer::resetStatus(const QByteArray requestId)
+{
+    mCurrentState.pop();
+    emitNotification(Notification::Status, mCurrentState.top(), {}, requestId);
+}
+void Synchronizer::setBusy(bool busy, const QString &reason, const QByteArray requestId)
+{
+    if (busy) {
+        setStatus(ApplicationDomain::BusyStatus, reason, requestId);
+    } else {
+        if (mCurrentState.top() == ApplicationDomain::BusyStatus) {
+            resetStatus(requestId);
+        }
+    }
+}
 KAsync::Job<void> Synchronizer::processSyncQueue()
 {
    if (mSyncRequestQueue.isEmpty()) {
@@ -387,14 +458,20 @@ KAsync::Job<void> Synchronizer::processSyncQueue()
    }
    const auto request = mSyncRequestQueue.takeFirst();
-    return KAsync::start([this] {
+    return KAsync::start([=] {
        mMessageQueue->startTransaction();
        mEntityStore->startTransaction(Sink::Storage::DataStore::ReadOnly);
        mSyncInProgress = true;
+        if (request.requestType == Synchronizer::SyncRequest::Synchronization) {
+            setBusy(true, "Synchronization has started.", request.requestId);
+        } else if (request.requestType == Synchronizer::SyncRequest::ChangeReplay) {
+            setBusy(true, "ChangeReplay has started.", "changereplay");
+        }
    })
    .then(processRequest(request))
-    .then<void>([this](const KAsync::Error &error) {
+    .then<void>([this, request](const KAsync::Error &error) {
        SinkTraceCtx(mLogCtx) << "Sync request processed";
+        setBusy(false, {}, request.requestId);
        mEntityStore->abortTransaction();
        mSyncTransaction.abort();
        mMessageQueue->commit();
@@ -404,8 +481,8 @@ KAsync::Job<void> Synchronizer::processSyncQueue()
            emit changesReplayed();
        }
        if (error) {
-            SinkWarningCtx(mLogCtx) << "Error during sync: " << error.errorMessage;
+            SinkWarningCtx(mLogCtx) << "Error during sync: " << error;
-            return KAsync::error(error);
+            emitNotification(Notification::Error, error.errorCode, error.errorMessage, request.requestId);
        }
        //In case we got more requests meanwhile.
        return processSyncQueue();
@@ -499,6 +576,12 @@ KAsync::Job<void> Synchronizer::replay(const QByteArray &type, const QByteArray
    } else if (type == ApplicationDomain::getTypeName<ApplicationDomain::Mail>()) {
        auto mail = store().readEntity<ApplicationDomain::Mail>(key);
        job = replay(mail, operation, oldRemoteId, modifiedProperties);
+    } else if (type == ApplicationDomain::getTypeName<ApplicationDomain::Contact>()) {
+        auto mail = store().readEntity<ApplicationDomain::Contact>(key);
+        job = replay(mail, operation, oldRemoteId, modifiedProperties);
+    } else if (type == ApplicationDomain::getTypeName<ApplicationDomain::Addressbook>()) {
+        auto mail = store().readEntity<ApplicationDomain::Addressbook>(key);
+        job = replay(mail, operation, oldRemoteId, modifiedProperties);
    } else {
        SinkErrorCtx(mLogCtx) << "Replayed unknown type: " << type;
    }
@@ -506,21 +589,19 @@ KAsync::Job<void> Synchronizer::replay(const QByteArray &type, const QByteArray
    return job.then([this, operation, type, uid, oldRemoteId](const QByteArray &remoteId) {
        if (operation == Sink::Operation_Creation) {
            SinkTraceCtx(mLogCtx) << "Replayed creation with remote id: " << remoteId;
-            if (remoteId.isEmpty()) {
+            if (!remoteId.isEmpty()) {
-                SinkWarningCtx(mLogCtx) << "Returned an empty remoteId from the creation";
-            } else {
                syncStore().recordRemoteId(type, uid, remoteId);
            }
        } else if (operation == Sink::Operation_Modification) {
            SinkTraceCtx(mLogCtx) << "Replayed modification with remote id: " << remoteId;
-            if (remoteId.isEmpty()) {
+            if (!remoteId.isEmpty()) {
-                SinkWarningCtx(mLogCtx) << "Returned an empty remoteId from the modification";
-            } else {
               syncStore().updateRemoteId(type, uid, remoteId);
            }
        } else if (operation == Sink::Operation_Removal) {
            SinkTraceCtx(mLogCtx) << "Replayed removal with remote id: " << oldRemoteId;
-            syncStore().removeRemoteId(type, uid, oldRemoteId);
+            if (!oldRemoteId.isEmpty()) {
+                syncStore().removeRemoteId(type, uid, oldRemoteId);
+            }
        } else {
            SinkErrorCtx(mLogCtx) << "Unkown operation" << operation;
        }
@@ -539,6 +620,11 @@ KAsync::Job<QByteArray> Synchronizer::replay(const ApplicationDomain::Contact &,
    return KAsync::null<QByteArray>();
 }
+KAsync::Job<QByteArray> Synchronizer::replay(const ApplicationDomain::Addressbook &, Sink::Operation, const QByteArray &, const QList<QByteArray> &)
+{
+    return KAsync::null<QByteArray>();
+}
 KAsync::Job<QByteArray> Synchronizer::replay(const ApplicationDomain::Mail &, Sink::Operation, const QByteArray &, const QList<QByteArray> &)
 {
    return KAsync::null<QByteArray>();
diff --git a/common/synchronizer.h b/common/synchronizer.h
index 120a8a5..b1ee122 100644
--- a/common/synchronizer.h
+++ b/common/synchronizer.h
@@ -21,6 +21,7 @@
 #include "sink_export.h"
 #include <QObject>
+#include <QStack>
 #include <KAsync/Async>
 #include <domainadaptor.h>
 #include <query.h>
@@ -73,9 +74,9 @@ protected:
 protected:
    ///Implement to write back changes to the server
    virtual KAsync::Job<QByteArray> replay(const Sink::ApplicationDomain::Contact &, Sink::Operation, const QByteArray &oldRemoteId, const QList<QByteArray> &);
+    virtual KAsync::Job<QByteArray> replay(const Sink::ApplicationDomain::Addressbook &, Sink::Operation, const QByteArray &oldRemoteId, const QList<QByteArray> &);
    virtual KAsync::Job<QByteArray> replay(const Sink::ApplicationDomain::Mail &, Sink::Operation, const QByteArray &oldRemoteId, const QList<QByteArray> &);
    virtual KAsync::Job<QByteArray> replay(const Sink::ApplicationDomain::Folder &, Sink::Operation, const QByteArray &oldRemoteId, const QList<QByteArray> &);
 protected:
    ///Calls the callback to enqueue the command
    void enqueueCommand(int commandId, const QByteArray &data);
@@ -134,7 +135,8 @@ protected:
            : requestId(requestId_),
            requestType(Synchronization),
            options(o),
-            query(q)
+            query(q),
+            applicableEntities(q.ids())
        {
        }
@@ -155,6 +157,7 @@ protected:
        RequestType requestType;
        RequestOptions options = NoOptions;
        Sink::QueryBase query;
+        QByteArrayList applicableEntities;
    };
    /**
@@ -175,9 +178,28 @@ protected:
     */
    virtual QList<Synchronizer::SyncRequest> getSyncRequests(const Sink::QueryBase &query);
+    /**
+     * This allows the synchronizer to merge new requests with existing requests in the queue.
+     */
+    virtual void mergeIntoQueue(const Synchronizer::SyncRequest &request, QList<Synchronizer::SyncRequest> &queue);
+    void emitNotification(Notification::NoticationType type, int code, const QString &message, const QByteArray &id = QByteArray{}, const QByteArrayList &entiteis = QByteArrayList{});
+    /**
+     * Report progress for current task
+     */
+    void reportProgress(int progress, int total);
 protected:
    Sink::Log::Context mLogCtx;
 private:
+    QStack<ApplicationDomain::Status> mCurrentState;
+    void setStatusFromResult(const KAsync::Error &error, const QString &s, const QByteArray &requestId);
+    void setStatus(ApplicationDomain::Status busy, const QString &reason, const QByteArray requestId);
+    void resetStatus(const QByteArray requestId);
+    void setBusy(bool busy, const QString &reason, const QByteArray requestId);
    void modifyIfChanged(Storage::EntityStore &store, const QByteArray &bufferType, const QByteArray &sinkId, const Sink::ApplicationDomain::ApplicationDomainType &entity);
    KAsync::Job<void> processRequest(const SyncRequest &request);
    KAsync::Job<void> processSyncQueue();
diff --git a/common/synchronizerstore.cpp b/common/synchronizerstore.cpp
index dea4821..5364094 100644
--- a/common/synchronizerstore.cpp
+++ b/common/synchronizerstore.cpp
@@ -73,7 +73,8 @@ QByteArray SynchronizerStore::resolveLocalId(const QByteArray &bufferType, const
 {
    QByteArray remoteId = Index("localid.mapping." + bufferType, mTransaction).lookup(localId);
    if (remoteId.isEmpty()) {
-        SinkWarning() << "Couldn't find the remote id for " << bufferType << localId;
+        //This can happen if we didn't store the remote id in the first place
+        SinkTrace() << "Couldn't find the remote id for " << bufferType << localId;
        return QByteArray();
    }
    return remoteId;
diff --git a/common/typeindex.cpp b/common/typeindex.cpp
index 5589e13..153aa43 100644
--- a/common/typeindex.cpp
+++ b/common/typeindex.cpp
@@ -190,7 +190,7 @@ static QVector<QByteArray> indexLookup(Index &index, QueryBase::Comparator filte
    for (const auto &lookupKey : lookupKeys) {
        index.lookup(lookupKey, [&](const QByteArray &value) { keys << value; },
-            [lookupKey](const Index::Error &error) { SinkWarning() << "Error in index: " << error.message << lookupKey; }, true);
+            [lookupKey](const Index::Error &error) { SinkWarning() << "Lookup error in index: " << error.message << lookupKey; }, true);
    }
    return keys;
 }
@@ -272,7 +272,7 @@ QVector<QByteArray> TypeIndex::secondaryLookup<QByteArray>(const QByteArray &lef
    Index index(indexName(leftName + rightName), *mTransaction);
    const auto lookupKey = getByteArray(value);
    index.lookup(
-        lookupKey, [&](const QByteArray &value) { keys << value; }, [=](const Index::Error &error) { SinkWarning() << "Error in index: " << error.message << value; });
+        lookupKey, [&](const QByteArray &value) { keys << value; }, [=](const Index::Error &error) { SinkWarning() << "Lookup error in secondary index: " << error.message << value << lookupKey; });
    return keys;
 }
@@ -284,7 +284,7 @@ QVector<QByteArray> TypeIndex::secondaryLookup<QString>(const QByteArray &leftNa
    Index index(indexName(leftName + rightName), *mTransaction);
    const auto lookupKey = getByteArray(value);
    index.lookup(
-        lookupKey, [&](const QByteArray &value) { keys << value; }, [=](const Index::Error &error) { SinkWarning() << "Error in index: " << error.message << value; });
+        lookupKey, [&](const QByteArray &value) { keys << value; }, [=](const Index::Error &error) { SinkWarning() << "Lookup error in secondary index: " << error.message << value << lookupKey; });
    return keys;
 }
diff --git a/dist/sink.spec b/dist/sink.spec
index ed8822e..bf2df7a 100644
--- a/dist/sink.spec
+++ b/dist/sink.spec
@@ -1,13 +1,13 @@
 Name:           sink
-Version:        0.1.0
+Version:        0.2
-Release:            6%{?dist}
+Release:            2%{?dist}
 Summary:        sink
 Group:          Applications/Desktop
 License:        GPL
 URL:            https://docs.kolab.org/about/sink
-Source0:        sink-%{version}.tar.gz
+Source0:        sink-%{version}.tar.xz
 BuildRequires:  cmake >= 2.8.12
 BuildRequires:  extra-cmake-modules
@@ -16,7 +16,7 @@ BuildRequires:  gcc-c++
 BuildRequires:  kasync-devel
 BuildRequires:  kf5-kcoreaddons-devel
 BuildRequires:  kf5-kcontacts-devel
-BuildRequires:  kmime-devel
+BuildRequires:  kf5-kmime-devel
 BuildRequires:  kimap2-devel
 BuildRequires:  libcurl-devel
 BuildRequires:  libgit2-devel
@@ -69,7 +69,6 @@ rm %{buildroot}%{_prefix}/bin/sink_smtp_test
 %{_bindir}/sink_synchronizer
 %{_bindir}/sinksh
 %{_libdir}/liblibhawd.so
-%{_libdir}/libmaildir.so
 %{_libdir}/libsink.so.*
 %dir %{_libdir}/qt5/plugins/
 %{_libdir}/qt5/plugins/sink/
diff --git a/docs/applicationdomaintypes.md b/docs/applicationdomaintypes.md
index 09fec9f..48fe17c 100644
--- a/docs/applicationdomaintypes.md
+++ b/docs/applicationdomaintypes.md
@@ -56,7 +56,7 @@ Event:
 ```
 ```no-highlight
 Mail:
-    uid [QByteArray]: The message id.
+    messageId [QByteArray]: The message id.
    subject [QString]: The subject of the email.
    folder [MailFolder.id]: The parent folder.
    date [QDateTime]: The date of the email.
@@ -67,6 +67,25 @@ Mail Folder:
    parent [MailFolder.id]: The parent folder.
    name [QString]: The user visible name of the folder.
    icon [QString]: The name of the icon of the folder.
+    lastUpdated [QDateTime]: time of last successful update.
+    count [int]: Number of messages available on the server.
+    fullDataAvailable [bool]: Inidicates whether the local dataset is complete.
+```
+```no-highlight
+Contact:
+    uid [QByteArray]: The contact uid.
+    fn [QString]: The full name.
+    firstName [QString]: The first name.
+    lastName [QString]: The last name.
+    addressbook [Addressbook.id]: The parent addressbook.
+    emails [Email]: The availale email addresses.
+```
+```no-highlight
+Addressbook:
+    parent [Addressbook.id]: The parent addressbook.
+    name [QString]: The user visible name of the addressbook.
+    icon [QString]: The name of the icon of the addressbook.
+    lastUpdated [QDateTime]: time of last successful update.
 ```
 ```no-highlight
 Sink Resource:
diff --git a/examples/davresource/CMakeLists.txt b/examples/davresource/CMakeLists.txt
index c7899eb..28829d5 100644
--- a/examples/davresource/CMakeLists.txt
+++ b/examples/davresource/CMakeLists.txt
@@ -3,16 +3,10 @@ project(sink_resource_dav)
 add_definitions(-DQT_PLUGIN)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
-find_package(KF5 COMPONENTS REQUIRED Mime)
 find_package(KPimKDAV REQUIRED)
-add_library(${PROJECT_NAME} SHARED facade.cpp davresource.cpp domainadaptor.cpp)
+add_library(${PROJECT_NAME} SHARED davresource.cpp)
 qt5_use_modules(${PROJECT_NAME} Core Network)
 target_link_libraries(${PROJECT_NAME} sink KPim::KDAV)
 install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SINK_RESOURCE_PLUGINS_PATH})
-#add_definitions(-DTESTDATAPATH="${CMAKE_CURRENT_SOURCE_DIR}/tests/data")
-#add_subdirectory(libmaildir)
-#add_subdirectory(tests)
diff --git a/examples/davresource/davresource.cpp b/examples/davresource/davresource.cpp
index de4c0b0..50471ed 100644
--- a/examples/davresource/davresource.cpp
+++ b/examples/davresource/davresource.cpp
@@ -21,10 +21,8 @@
 #include "facade.h"
 #include "resourceconfig.h"
-#include "index.h"
 #include "log.h"
 #include "definitions.h"
-#include "inspection.h"
 #include "synchronizer.h"
 #include "inspector.h"
@@ -40,181 +38,14 @@
 #include <KDAV/DavItemFetchJob>
 #include <KDAV/EtagCache>
-#include <QDir>
-#include <QDirIterator>
 //This is the resources entity type, and not the domain type
 #define ENTITY_TYPE_CONTACT "contact"
-#define ENTITY_TYPE_ADDRESSBOOK "folder"
+#define ENTITY_TYPE_ADDRESSBOOK "addressbook"
 SINK_DEBUG_AREA("davresource")
 using namespace Sink;
-/*static QString getFilePathFromMimeMessagePath(const QString &mimeMessagePath)
-{
-    auto parts = mimeMessagePath.split('/');
-    const auto key = parts.takeLast();
-    const auto path = parts.join("/") + "/cur/";
-    QDir dir(path);
-    const QFileInfoList list = dir.entryInfoList(QStringList() << (key+"*"), QDir::Files);
-    if (list.size() != 1) {
-        SinkWarning() << "Failed to find message " << mimeMessagePath;
-        SinkWarning() << "Failed to find message " << path;
-        return QString();
-    }
-    return list.first().filePath();
-}
-class MaildirMailPropertyExtractor : public MailPropertyExtractor
-{
-protected:
-    virtual QString getFilePathFromMimeMessagePath(const QString &mimeMessagePath) const Q_DECL_OVERRIDE
-    {
-        return ::getFilePathFromMimeMessagePath(mimeMessagePath);
-    }
-};
-class MaildirMimeMessageMover : public Sink::Preprocessor
-{
-public:
-    MaildirMimeMessageMover(const QByteArray &resourceInstanceIdentifier, const QString &maildirPath) : mResourceInstanceIdentifier(resourceInstanceIdentifier), mMaildirPath(maildirPath) {}
-    QString getPath(const QByteArray &folderIdentifier)
-    {
-        if (folderIdentifier.isEmpty()) {
-            return mMaildirPath;
-        }
-        QString folderPath;
-        const auto folder = entityStore().readLatest<ApplicationDomain::Folder>(folderIdentifier);
-        if (mMaildirPath.endsWith(folder.getName())) {
-            folderPath = mMaildirPath;
-        } else {
-            auto folderName = folder.getName();
-            //FIXME handle non toplevel folders
-            folderPath = mMaildirPath + "/" + folderName;
-        }
-        return folderPath;
-    }
-    QString moveMessage(const QString &oldPath, const QByteArray &folder)
-    {
-        if (oldPath.startsWith(Sink::temporaryFileLocation())) {
-            const auto path = getPath(folder);
-            KPIM::Contactdir maildir(path, false);
-            if (!maildir.isValid(true)) {
-                SinkWarning() << "Maildir is not existing: " << path;
-            }
-            auto identifier = maildir.addEntryFromPath(oldPath);
-            return path + "/" + identifier;
-        } else {
-            //Handle moves
-            const auto path = getPath(folder);
-            KPIM::Contactdir maildir(path, false);
-            if (!maildir.isValid(true)) {
-                SinkWarning() << "Maildir is not existing: " << path;
-            }
-            auto oldIdentifier = KPIM::Contactdir::getKeyFromFile(oldPath);
-            auto pathParts = oldPath.split('/');
-            pathParts.takeLast();
-            auto oldDirectory = pathParts.join('/');
-            if (oldDirectory == path) {
-                return oldPath;
-            }
-            KPIM::Contactdir oldMaildir(oldDirectory, false);
-            if (!oldMaildir.isValid(false)) {
-                SinkWarning() << "Maildir is not existing: " << path;
-            }
-            auto identifier = oldMaildir.moveEntryTo(oldIdentifier, maildir);
-            return path + "/" + identifier;
-        }
-    }
-    void newEntity(Sink::ApplicationDomain::ApplicationDomainType &newEntity) Q_DECL_OVERRIDE
-    {
-        auto mail = newEntity.cast<ApplicationDomain::Contact>();
-        const auto mimeMessage = mail.getMimeMessagePath();
-        if (!mimeMessage.isNull()) {
-            const auto path = moveMessage(mimeMessage, mail.getFolder());
-            auto blob = ApplicationDomain::BLOB{path};
-            blob.isExternal = false;
-            mail.setProperty(ApplicationDomain::Contact::MimeMessage::name, QVariant::fromValue(blob));
-        }
-    }
-    void modifiedEntity(const Sink::ApplicationDomain::ApplicationDomainType &oldEntity, Sink::ApplicationDomain::ApplicationDomainType &newEntity) Q_DECL_OVERRIDE
-    {
-        auto newMail = newEntity.cast<ApplicationDomain::Contact>();
-        const ApplicationDomain::Contact oldMail{oldEntity};
-        const auto mimeMessage = newMail.getMimeMessagePath();
-        const auto newFolder = newMail.getFolder();
-        const bool mimeMessageChanged = !mimeMessage.isNull() && mimeMessage != oldMail.getMimeMessagePath();
-        const bool folderChanged = !newFolder.isNull() && newFolder != oldMail.getFolder();
-        if (mimeMessageChanged || folderChanged) {
-            SinkTrace() << "Moving mime message: " << mimeMessageChanged << folderChanged;
-            auto newPath = moveMessage(mimeMessage, newMail.getFolder());
-            if (newPath != oldMail.getMimeMessagePath()) {
-                const auto oldPath = getFilePathFromMimeMessagePath(oldMail.getMimeMessagePath());
-                auto blob = ApplicationDomain::BLOB{newPath};
-                blob.isExternal = false;
-                newMail.setProperty(ApplicationDomain::Contact::MimeMessage::name, QVariant::fromValue(blob));
-                //Remove the olde mime message if there is a new one
-                QFile::remove(oldPath);
-            }
-        }
-        auto mimeMessagePath = newMail.getMimeMessagePath();
-        const auto maildirPath = getPath(newMail.getFolder());
-        KPIM::Contactdir maildir(maildirPath, false);
-        const auto file = getFilePathFromMimeMessagePath(mimeMessagePath);
-        QString identifier = KPIM::Contactdir::getKeyFromFile(file);
-        //get flags from
-        KPIM::Contactdir::Flags flags;
-        if (!newMail.getUnread()) {
-            flags |= KPIM::Contactdir::Seen;
-        }
-        if (newMail.getImportant()) {
-            flags |= KPIM::Contactdir::Flagged;
-        }
-        maildir.changeEntryFlags(identifier, flags);
-    }
-    void deletedEntity(const Sink::ApplicationDomain::ApplicationDomainType &oldEntity) Q_DECL_OVERRIDE
-    {
-        const ApplicationDomain::Contact oldMail{oldEntity};
-        const auto filePath = getFilePathFromMimeMessagePath(oldMail.getMimeMessagePath());
-        QFile::remove(filePath);
-    }
-    QByteArray mResourceInstanceIdentifier;
-    QString mMaildirPath;
-};
-class FolderPreprocessor : public Sink::Preprocessor
-{
-public:
-    FolderPreprocessor(const QString maildirPath) : mMaildirPath(maildirPath) {}
-    void newEntity(Sink::ApplicationDomain::ApplicationDomainType &newEntity) Q_DECL_OVERRIDE
-    {
-        auto folderName = Sink::ApplicationDomain::Folder{newEntity}.getName();
-        const auto path = mMaildirPath + "/" + folderName;
-        KPIM::Contactdir maildir(path, false);
-        maildir.create();
-    }
-    void modifiedEntity(const Sink::ApplicationDomain::ApplicationDomainType &oldEntity, Sink::ApplicationDomain::ApplicationDomainType &newEntity) Q_DECL_OVERRIDE
-    {
-    }
-    void deletedEntity(const Sink::ApplicationDomain::ApplicationDomainType &oldEntity) Q_DECL_OVERRIDE
-    {
-    }
-    QString mMaildirPath;
-};*/
 static KAsync::Job<void> runJob(KJob *job)
 {
    return KAsync::start<void>([job](KAsync::Future<void> &future) {
@@ -240,33 +71,33 @@ public:
    }
-        QByteArray createAddressbook(const QString &folderName, const QString &folderPath, const QString &parentFolderRid, const QByteArray &icon)
+    QByteArray createAddressbook(const QString &addressbookName, const QString &addressbookPath, const QString &parentAddressbookRid)
    {
-        SinkTrace() << "Creating addressbook: " << folderName << parentFolderRid;
+        SinkTrace() << "Creating addressbook: " << addressbookName << parentAddressbookRid;
-        const auto remoteId = folderPath.toUtf8();
+        const auto remoteId = addressbookPath.toUtf8();
        const auto bufferType = ENTITY_TYPE_ADDRESSBOOK;
-        Sink::ApplicationDomain::Folder folder;
+        Sink::ApplicationDomain::Addressbook addressbook;
-        folder.setName(folderName);
+        addressbook.setName(addressbookName);
-        folder.setIcon(icon);
        QHash<QByteArray, Query::Comparator> mergeCriteria;
-        if (!parentFolderRid.isEmpty()) {
+        if (!parentAddressbookRid.isEmpty()) {
-            folder.setParent(syncStore().resolveRemoteId(ENTITY_TYPE_ADDRESSBOOK, parentFolderRid.toUtf8()));
+            addressbook.setParent(syncStore().resolveRemoteId(ENTITY_TYPE_ADDRESSBOOK, parentAddressbookRid.toUtf8()));
        }
-        createOrModify(bufferType, remoteId, folder, mergeCriteria);
+        createOrModify(bufferType, remoteId, addressbook, mergeCriteria);
        return remoteId;
    }
-    void synchronizeAddressbooks(const KDAV::DavCollection::List &folderList)
+    void synchronizeAddressbooks(const KDAV::DavCollection::List &addressbookList)
    {
        const QByteArray bufferType = ENTITY_TYPE_ADDRESSBOOK;
-        SinkTrace() << "Found addressbooks " << folderList.size();
+        SinkTrace() << "Found addressbooks " << addressbookList.size();
        QVector<QByteArray> ridList;
-        for(const auto &f : folderList) {
+        for(const auto &f : addressbookList) {
-            const auto &rid = f.url().toDisplayString();
+            const auto &rid = getRid(f);
-            ridList.append(rid.toUtf8());
+            SinkTrace() << "Found addressbook:" << rid;
-            createAddressbook(f.displayName(), rid, "", "addressbook");
+            ridList.append(rid);
+            createAddressbook(f.displayName(), rid, "");
        }
        scanForRemovals(bufferType,
@@ -284,54 +115,73 @@ public:
            list << Synchronizer::SyncRequest{query};
        } else {
            //We want to synchronize everything
+            list << Synchronizer::SyncRequest{Sink::QueryBase(ApplicationDomain::getTypeName<ApplicationDomain::Addressbook>())};
            list << Synchronizer::SyncRequest{Sink::QueryBase(ApplicationDomain::getTypeName<ApplicationDomain::Contact>())};
        }
        return list;
    }
+    static QByteArray getRid(const KDAV::DavItem &item)
+    {
+        return item.url().toDisplayString().toUtf8();
+    }
+    static QByteArray getRid(const KDAV::DavCollection &item)
+    {
+        return item.url().toDisplayString().toUtf8();
+    }
    KAsync::Job<void> synchronizeWithSource(const Sink::QueryBase &query) Q_DECL_OVERRIDE
    {
-        if (query.type() == ApplicationDomain::getTypeName<ApplicationDomain::Folder>()) {
+        if (query.type() == ApplicationDomain::getTypeName<ApplicationDomain::Addressbook>()) {
+            SinkLogCtx(mLogCtx) << "Synchronizing addressbooks:" <<  mResourceUrl.url();
            auto collectionsFetchJob = new KDAV::DavCollectionsFetchJob(mResourceUrl);
-            auto job = runJob(collectionsFetchJob).then<void>([this, collectionsFetchJob] {
+            auto job = runJob(collectionsFetchJob).then([this, collectionsFetchJob] (const KAsync::Error &error) {
-                synchronizeAddressbooks(collectionsFetchJob ->collections());
+                if (error) {
+                    SinkWarningCtx(mLogCtx) << "Failed to synchronize addressbooks." << collectionsFetchJob->errorString();
+                } else {
+                    synchronizeAddressbooks(collectionsFetchJob ->collections());
+                }
            });
            return job;
        } else if (query.type() == ApplicationDomain::getTypeName<ApplicationDomain::Contact>()) {
+            SinkLogCtx(mLogCtx) << "Synchronizing contacts.";
            auto ridList = QSharedPointer<QByteArrayList>::create();
            auto collectionsFetchJob = new KDAV::DavCollectionsFetchJob(mResourceUrl);
-            auto job = runJob(collectionsFetchJob).then<KDAV::DavCollection::List>([this, collectionsFetchJob] {
+            auto job = runJob(collectionsFetchJob).then([this, collectionsFetchJob] {
                synchronizeAddressbooks(collectionsFetchJob ->collections());
                return collectionsFetchJob->collections();
            })
-            .serialEach<void>([this, ridList](const KDAV::DavCollection &collection) {
+            .serialEach([this, ridList](const KDAV::DavCollection &collection) {
-                auto collId = collection.url().toDisplayString().toLatin1();
+                auto collId = getRid(collection);
+                const auto addressbookLocalId = syncStore().resolveRemoteId(ENTITY_TYPE_ADDRESSBOOK, collId);
                auto ctag = collection.CTag().toLatin1();
                if (ctag != syncStore().readValue(collId + "_ctagXX")) {
-                    SinkTrace() << "Syncing " << collId;
+                    SinkTraceCtx(mLogCtx) << "Syncing " << collId;
                    auto cache = std::shared_ptr<KDAV::EtagCache>(new KDAV::EtagCache());
                    auto davItemsListJob = new KDAV::DavItemsListJob(collection.url(), cache);
                    const QByteArray bufferType = ENTITY_TYPE_CONTACT;
                    QHash<QByteArray, Query::Comparator> mergeCriteria;
-                    auto colljob = runJob(davItemsListJob).then<KDAV::DavItem::List>([davItemsListJob] {
+                    auto colljob = runJob(davItemsListJob).then([davItemsListJob] {
                        return KAsync::value(davItemsListJob->items());
                    })
-                    .serialEach<QByteArray>([this, ridList, bufferType, mergeCriteria] (const KDAV::DavItem &item) {
+                    .serialEach([=] (const KDAV::DavItem &item) {
-                        QByteArray rid = item.url().toDisplayString().toUtf8();
+                        QByteArray rid = getRid(item);
                        if (item.etag().toLatin1() != syncStore().readValue(rid + "_etag")){
                            SinkTrace() << "Updating " << rid;
                            auto davItemFetchJob = new KDAV::DavItemFetchJob(item);
                            auto itemjob = runJob(davItemFetchJob)
-                            .then<KDAV::DavItem>([this, davItemFetchJob, bufferType, mergeCriteria] {
+                            .then([=] {
                                const auto item = davItemFetchJob->item();
-                                const auto rid = item.url().toDisplayString().toUtf8();
+                                const auto rid = getRid(item);
                                Sink::ApplicationDomain::Contact contact;
                                contact.setVcard(item.data());
+                                contact.setAddressbook(addressbookLocalId);
                                createOrModify(bufferType, rid, contact, mergeCriteria);
                                return item;
                            })
-                            .then<QByteArray>([this, ridList] (const KDAV::DavItem &item) {
+                            .then([this, ridList] (const KDAV::DavItem &item) {
-                                const auto rid = item.url().toDisplayString().toUtf8();
+                                const auto rid = getRid(item);
                                syncStore().writeValue(rid + "_etag", item.etag().toLatin1());
                                ridList->append(rid);
                                return rid;
@@ -342,11 +192,12 @@ public:
                            return KAsync::value(rid);
                        }
                    })
-                    .then<void>([this, collId, ctag] () {
+                    .then([this, collId, ctag] () {
                        syncStore().writeValue(collId + "_ctag", ctag);
                    });
                    return colljob;
                } else {
+                    SinkTraceCtx(mLogCtx) << "Collection unchanged: " << ctag;
                    // for(const auto &item : addressbook) {
                    //      ridList->append(rid);
                    // }
@@ -367,43 +218,11 @@ public:
 KAsync::Job<QByteArray> replay(const ApplicationDomain::Contact &contact, Sink::Operation operation, const QByteArray &oldRemoteId, const QList<QByteArray> &changedProperties) Q_DECL_OVERRIDE
    {
-        /*
-        if (operation == Sink::Operation_Creation) {
-            const auto remoteId = getFilePathFromMimeMessagePath(mail.getMimeMessagePath());
-            SinkTrace() << "Contact created: " << remoteId;
-            return KAsync::value(remoteId.toUtf8());
-        } else if (operation == Sink::Operation_Removal) {
-            SinkTrace() << "Removing a contact " << oldRemoteId;
-            return KAsync::null<QByteArray>();
-        } else if (operation == Sink::Operation_Modification) {
-            SinkTrace() << "Modifying a contact: " << oldRemoteId;
-            const auto remoteId = getFilePathFromMimeMessagePath(mail.getMimeMessagePath());
-            return KAsync::value(remoteId.toUtf8());
-        }*/
        return KAsync::null<QByteArray>();
    }
-    KAsync::Job<QByteArray> replay(const ApplicationDomain::Folder &folder, Sink::Operation operation, const QByteArray &oldRemoteId, const QList<QByteArray> &changedProperties) Q_DECL_OVERRIDE
+    KAsync::Job<QByteArray> replay(const ApplicationDomain::Addressbook &addressbook, Sink::Operation operation, const QByteArray &oldRemoteId, const QList<QByteArray> &changedProperties) Q_DECL_OVERRIDE
    {
-        /*
-        if (operation == Sink::Operation_Creation) {
-            auto folderName = folder.getName();
-            //FIXME handle non toplevel folders
-            auto path = mMaildirPath + "/" + folderName;
-            SinkTrace() << "Creating a new folder: " << path;
-            KPIM::Contactdir maildir(path, false);
-            maildir.create();
-            return KAsync::value(path.toUtf8());
-        } else if (operation == Sink::Operation_Removal) {
-            const auto path = oldRemoteId;
-            SinkTrace() << "Removing a folder: " << path;
-            KPIM::Contactdir maildir(path, false);
-            maildir.remove();
-            return KAsync::null<QByteArray>();
-        } else if (operation == Sink::Operation_Modification) {
-            SinkWarning() << "Folder modifications are not implemented";
-            return KAsync::value(oldRemoteId);
-        }*/
        return KAsync::null<QByteArray>();
    }
@@ -411,109 +230,17 @@ public:
    KDAV::DavUrl mResourceUrl;
 };
-/*
-class MaildirInspector : public Sink::Inspector {
-public:
-    MaildirInspector(const Sink::ResourceContext &resourceContext)
-        : Sink::Inspector(resourceContext)
-    {
-    }
-protected:
-    KAsync::Job<void> inspect(int inspectionType, const QByteArray &inspectionId, const QByteArray &domainType, const QByteArray &entityId, const QByteArray &property, const QVariant &expectedValue) Q_DECL_OVERRIDE {
-        auto synchronizationStore = QSharedPointer<Sink::Storage::DataStore>::create(Sink::storageLocation(), mResourceContext.instanceId() + ".synchronization", Sink::Storage::DataStore::ReadOnly);
-        auto synchronizationTransaction = synchronizationStore->createTransaction(Sink::Storage::DataStore::ReadOnly);
-        auto mainStore = QSharedPointer<Sink::Storage::DataStore>::create(Sink::storageLocation(), mResourceContext.instanceId(), Sink::Storage::DataStore::ReadOnly);
-        auto transaction = mainStore->createTransaction(Sink::Storage::DataStore::ReadOnly);
-        Sink::Storage::EntityStore entityStore(mResourceContext, {"maildirresource"});
-        auto syncStore = QSharedPointer<SynchronizerStore>::create(synchronizationTransaction);
-        SinkTrace() << "Inspecting " << inspectionType << domainType << entityId << property << expectedValue;
-        if (domainType == ENTITY_TYPE_MAIL) {
-            auto mail = entityStore.readLatest<Sink::ApplicationDomain::Contact>(entityId);
-            const auto filePath = getFilePathFromMimeMessagePath(mail.getMimeMessagePath());
-            if (inspectionType == Sink::ResourceControl::Inspection::PropertyInspectionType) {
-                if (property == "unread") {
-                    const auto flags = KPIM::Contactdir::readEntryFlags(filePath.split('/').last());
-                    if (expectedValue.toBool() && (flags & KPIM::Contactdir::Seen)) {
-                        return KAsync::error<void>(1, "Expected unread but couldn't find it.");
-                    }
-                    if (!expectedValue.toBool() && !(flags & KPIM::Contactdir::Seen)) {
-                        return KAsync::error<void>(1, "Expected read but couldn't find it.");
-                    }
-                    return KAsync::null<void>();
-                }
-                if (property == "subject") {
-                    KMime::Message *msg = new KMime::Message;
-                    msg->setHead(KMime::CRLFtoLF(KPIM::Contactdir::readEntryHeadersFromFile(filePath)));
-                    msg->parse();
-                    if (msg->subject(true)->asUnicodeString() != expectedValue.toString()) {
-                        return KAsync::error<void>(1, "Subject not as expected: " + msg->subject(true)->asUnicodeString());
-                    }
-                    return KAsync::null<void>();
-                }
-            }
-            if (inspectionType == Sink::ResourceControl::Inspection::ExistenceInspectionType) {
-                if (QFileInfo(filePath).exists() != expectedValue.toBool()) {
-                    return KAsync::error<void>(1, "Wrong file existence: " + filePath);
-                }
-            }
-        }
-        if (domainType == ENTITY_TYPE_FOLDER) {
-            const auto remoteId = syncStore->resolveLocalId(ENTITY_TYPE_FOLDER, entityId);
-            auto folder = entityStore.readLatest<Sink::ApplicationDomain::Folder>(entityId);
-            if (inspectionType == Sink::ResourceControl::Inspection::CacheIntegrityInspectionType) {
-                SinkTrace() << "Inspecting cache integrity" << remoteId;
-                if (!QDir(remoteId).exists()) {
-                    return KAsync::error<void>(1, "The directory is not existing: " + remoteId);
-                }
-                int expectedCount = 0;
-                Index index("mail.index.folder", transaction);
-                index.lookup(entityId, [&](const QByteArray &sinkId) {
-                        expectedCount++;
-                },
-                [&](const Index::Error &error) {
-                    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) {
-                        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));
-                }
-            }
-            if (inspectionType == Sink::ResourceControl::Inspection::ExistenceInspectionType) {
-                if (!remoteId.endsWith(folder.getName().toUtf8())) {
-                    return KAsync::error<void>(1, "Wrong folder name: " + remoteId);
-                }
-                //TODO we shouldn't use the remoteId here to figure out the path, it could be gone/changed already
-                if (QDir(remoteId).exists() != expectedValue.toBool()) {
-                    return KAsync::error<void>(1, "Wrong folder existence: " + remoteId);
-                }
-            }
-        }
-        return KAsync::null<void>();
-    }
-};*/
 DavResource::DavResource(const Sink::ResourceContext &resourceContext)
    : Sink::GenericResource(resourceContext)
 {
+    /*
+     * Fork KIO slaves (used in kdav), instead of starting them via klauncher.
+     * Otherwise we have yet another runtime dependency that will i.e. not work in the docker container.
+     */
+    qputenv("KDE_FORK_SLAVES", "TRUE");
    auto config = ResourceConfig::getConfiguration(resourceContext.instanceId());
-    auto resourceUrl = QUrl::fromUserInput(config.value("resourceUrl").toString());
+    auto resourceUrl = QUrl::fromUserInput(config.value("server").toString());
    resourceUrl.setUserName(config.value("username").toString());
    resourceUrl.setPassword(config.value("password").toString());
@@ -522,7 +249,6 @@ DavResource::DavResource(const Sink::ResourceContext &resourceContext)
    auto synchronizer = QSharedPointer<ContactSynchronizer>::create(resourceContext);
    synchronizer->mResourceUrl = mResourceUrl;
    setupSynchronizer(synchronizer);
-    //setupInspector(QSharedPointer<MaildirInspector>::create(resourceContext));
    setupPreprocessors(ENTITY_TYPE_CONTACT, QVector<Sink::Preprocessor*>() << new ContactPropertyExtractor);
 }
@@ -530,7 +256,9 @@ DavResource::DavResource(const Sink::ResourceContext &resourceContext)
 DavResourceFactory::DavResourceFactory(QObject *parent)
    : Sink::ResourceFactory(parent,
-            {"-folder.rename"}
+            {Sink::ApplicationDomain::ResourceCapabilities::Contact::contact,
+            Sink::ApplicationDomain::ResourceCapabilities::Contact::addressbook,
+            }
            )
 {
 }
@@ -542,14 +270,14 @@ Sink::Resource *DavResourceFactory::createResource(const ResourceContext &contex
 void DavResourceFactory::registerFacades(const QByteArray &name, Sink::FacadeFactory &factory)
 {
-    factory.registerFacade<Sink::ApplicationDomain::Contact, DavResourceContactFacade>(name);
+    factory.registerFacade<ApplicationDomain::Contact, DefaultFacade<ApplicationDomain::Contact>>(name);
-    factory.registerFacade<Sink::ApplicationDomain::Folder, DavResourceFolderFacade>(name);
+    factory.registerFacade<ApplicationDomain::Addressbook, DefaultFacade<ApplicationDomain::Contact>>(name);
 }
 void DavResourceFactory::registerAdaptorFactories(const QByteArray &name, Sink::AdaptorFactoryRegistry &registry)
 {
-    registry.registerFactory<Sink::ApplicationDomain::Contact, ContactAdaptorFactory>(name);
+    registry.registerFactory<ApplicationDomain::Contact, DefaultAdaptorFactory<ApplicationDomain::Contact>>(name);
-    registry.registerFactory<Sink::ApplicationDomain::Folder, AddressbookAdaptorFactory>(name);
+    registry.registerFactory<ApplicationDomain::Addressbook, DefaultAdaptorFactory<ApplicationDomain::Addressbook>>(name);
 }
 void DavResourceFactory::removeDataFromDisk(const QByteArray &instanceIdentifier)
diff --git a/examples/davresource/davresource.h b/examples/davresource/davresource.h
index 415527a..1ce66ea 100644
--- a/examples/davresource/davresource.h
+++ b/examples/davresource/davresource.h
@@ -54,7 +54,7 @@ private:
 class DavResourceFactory : public Sink::ResourceFactory
 {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "sink.davresource")
+    Q_PLUGIN_METADATA(IID "sink.dav")
    Q_INTERFACES(Sink::ResourceFactory)
 public:
diff --git a/examples/davresource/domainadaptor.cpp b/examples/davresource/domainadaptor.cpp
deleted file mode 100644
index 861a10e..0000000
--- a/examples/davresource/domainadaptor.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *   Copyright (C) 2015 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 "domainadaptor.h"
-using namespace flatbuffers;
-ContactAdaptorFactory::ContactAdaptorFactory()
-    : DomainTypeAdaptorFactory()
-{
-}
-AddressbookAdaptorFactory::AddressbookAdaptorFactory()
-    : DomainTypeAdaptorFactory()
-{
-}
diff --git a/examples/davresource/domainadaptor.h b/examples/davresource/domainadaptor.h
deleted file mode 100644
index 7e3c723..0000000
--- a/examples/davresource/domainadaptor.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2015 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.
- */
-#pragma once
-#include <common/domainadaptor.h>
-#include "contact_generated.h"
-#include "folder_generated.h"
-#include "dummy_generated.h"
-class ContactAdaptorFactory : public DomainTypeAdaptorFactory<Sink::ApplicationDomain::Contact, Sink::ApplicationDomain::Buffer::Dummy, Sink::ApplicationDomain::Buffer::DummyBuilder>
-{
-public:
-    ContactAdaptorFactory();
-    virtual ~ContactAdaptorFactory() {};
-};
-class AddressbookAdaptorFactory : public DomainTypeAdaptorFactory<Sink::ApplicationDomain::Folder, Sink::ApplicationDomain::Buffer::Dummy, Sink::ApplicationDomain::Buffer::DummyBuilder>
-{
-public:
-    AddressbookAdaptorFactory();
-    virtual ~AddressbookAdaptorFactory() {};
-};
diff --git a/examples/davresource/facade.cpp b/examples/davresource/facade.cpp
deleted file mode 100644
index b56815a..0000000
--- a/examples/davresource/facade.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2014 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 "facade.h"
-#include <QDir>
-#include <QFileInfo>
-#include "query.h"
-DavResourceContactFacade::DavResourceContactFacade(const Sink::ResourceContext &context)
-    : Sink::GenericFacade<Sink::ApplicationDomain::Contact>(context)
-{
-}
-DavResourceContactFacade::~DavResourceContactFacade()
-{
-}
-DavResourceFolderFacade::DavResourceFolderFacade(const Sink::ResourceContext &context)
-    : Sink::GenericFacade<Sink::ApplicationDomain::Folder>(context)
-{
-}
-DavResourceFolderFacade::~DavResourceFolderFacade()
-{
-}
diff --git a/examples/davresource/facade.h b/examples/davresource/facade.h
deleted file mode 100644
index 02bd5dc..0000000
--- a/examples/davresource/facade.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2014 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.
- */
-#pragma once
-#include "common/facade.h"
-class DavResourceContactFacade : public Sink::GenericFacade<Sink::ApplicationDomain::Contact>
-{
-public:
-    DavResourceContactFacade(const Sink::ResourceContext &context);
-    virtual ~DavResourceContactFacade();
-};
-class DavResourceFolderFacade : public Sink::GenericFacade<Sink::ApplicationDomain::Folder>
-{
-public:
-    DavResourceFolderFacade(const Sink::ResourceContext &context);
-    virtual ~DavResourceFolderFacade();
-};
diff --git a/examples/dummyresource/CMakeLists.txt b/examples/dummyresource/CMakeLists.txt
index 6400f0c..2bbaa47 100644
--- a/examples/dummyresource/CMakeLists.txt
+++ b/examples/dummyresource/CMakeLists.txt
@@ -4,7 +4,7 @@ add_definitions(-DQT_PLUGIN)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
-add_library(${PROJECT_NAME} SHARED facade.cpp resourcefactory.cpp domainadaptor.cpp dummystore.cpp)
+add_library(${PROJECT_NAME} SHARED resourcefactory.cpp domainadaptor.cpp dummystore.cpp)
 generate_flatbuffers(${PROJECT_NAME} dummycalendar)
 qt5_use_modules(${PROJECT_NAME} Core Network)
 target_link_libraries(${PROJECT_NAME} sink)
diff --git a/examples/dummyresource/facade.cpp b/examples/dummyresource/facade.cpp
deleted file mode 100644
index 4343eba..0000000
--- a/examples/dummyresource/facade.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2014 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 "facade.h"
-#include "domainadaptor.h"
-DummyResourceFacade::DummyResourceFacade(const Sink::ResourceContext &context)
-    : Sink::GenericFacade<Sink::ApplicationDomain::Event>(context)
-{
-}
-DummyResourceFacade::~DummyResourceFacade()
-{
-}
-DummyResourceMailFacade::DummyResourceMailFacade(const Sink::ResourceContext &context)
-    : Sink::GenericFacade<Sink::ApplicationDomain::Mail>(context)
-{
-}
-DummyResourceMailFacade::~DummyResourceMailFacade()
-{
-}
-DummyResourceFolderFacade::DummyResourceFolderFacade(const Sink::ResourceContext &context)
-    : Sink::GenericFacade<Sink::ApplicationDomain::Folder>(context)
-{
-}
-DummyResourceFolderFacade::~DummyResourceFolderFacade()
-{
-}
diff --git a/examples/dummyresource/facade.h b/examples/dummyresource/facade.h
deleted file mode 100644
index 1bb45fd..0000000
--- a/examples/dummyresource/facade.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2014 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.
- */
-#pragma once
-#include "common/facade.h"
-#include "common/domain/event.h"
-class DummyResourceFacade : public Sink::GenericFacade<Sink::ApplicationDomain::Event>
-{
-public:
-    DummyResourceFacade(const Sink::ResourceContext &context);
-    virtual ~DummyResourceFacade();
-};
-class DummyResourceMailFacade : public Sink::GenericFacade<Sink::ApplicationDomain::Mail>
-{
-public:
-    DummyResourceMailFacade(const Sink::ResourceContext &context);
-    virtual ~DummyResourceMailFacade();
-};
-class DummyResourceFolderFacade : public Sink::GenericFacade<Sink::ApplicationDomain::Folder>
-{
-public:
-    DummyResourceFolderFacade(const Sink::ResourceContext &context);
-    virtual ~DummyResourceFolderFacade();
-};
diff --git a/examples/dummyresource/resourcefactory.cpp b/examples/dummyresource/resourcefactory.cpp
index e915710..c1f536e 100644
--- a/examples/dummyresource/resourcefactory.cpp
+++ b/examples/dummyresource/resourcefactory.cpp
@@ -26,8 +26,6 @@
 #include "mail_generated.h"
 #include "domainadaptor.h"
 #include "log.h"
-#include "domain/event.h"
-#include "domain/mail.h"
 #include "dummystore.h"
 #include "definitions.h"
 #include "facadefactory.h"
@@ -46,6 +44,8 @@
 SINK_DEBUG_AREA("dummyresource")
+using namespace Sink;
 class DummySynchronizer : public Sink::Synchronizer {
    public:
@@ -69,6 +69,7 @@ class DummySynchronizer : public Sink::Synchronizer {
    Sink::ApplicationDomain::Mail::Ptr createMail(const QByteArray &ridBuffer, const QMap<QString, QVariant> &data)
    {
        auto mail = Sink::ApplicationDomain::Mail::Ptr::create();
+        mail->setExtractedMessageId(ridBuffer);
        mail->setExtractedSubject(data.value("subject").toString());
        mail->setExtractedSender(Sink::ApplicationDomain::Mail::Contact{data.value("senderName").toString(), data.value("senderEmail").toString()});
        mail->setExtractedDate(data.value("date").toDateTime());
@@ -163,7 +164,7 @@ DummyResource::DummyResource(const Sink::ResourceContext &resourceContext, const
    setupSynchronizer(QSharedPointer<DummySynchronizer>::create(resourceContext));
    setupInspector(QSharedPointer<DummyInspector>::create(resourceContext));
    setupPreprocessors(ENTITY_TYPE_MAIL,
-            QVector<Sink::Preprocessor*>() << new MailPropertyExtractor << new SpecialPurposeProcessor{resourceContext.resourceType, resourceContext.instanceId()});
+            QVector<Sink::Preprocessor*>() << new MailPropertyExtractor << new SpecialPurposeProcessor);
    setupPreprocessors(ENTITY_TYPE_FOLDER,
            QVector<Sink::Preprocessor*>());
    setupPreprocessors(ENTITY_TYPE_EVENT,
@@ -194,9 +195,9 @@ Sink::Resource *DummyResourceFactory::createResource(const Sink::ResourceContext
 void DummyResourceFactory::registerFacades(const QByteArray &resourceName, Sink::FacadeFactory &factory)
 {
-    factory.registerFacade<Sink::ApplicationDomain::Event, DummyResourceFacade>(resourceName);
+    factory.registerFacade<ApplicationDomain::Event, DefaultFacade<ApplicationDomain::Event>>(resourceName);
-    factory.registerFacade<Sink::ApplicationDomain::Mail, DummyResourceMailFacade>(resourceName);
+    factory.registerFacade<ApplicationDomain::Mail, DefaultFacade<ApplicationDomain::Mail>>(resourceName);
-    factory.registerFacade<Sink::ApplicationDomain::Folder, DummyResourceFolderFacade>(resourceName);
+    factory.registerFacade<ApplicationDomain::Folder, DefaultFacade<ApplicationDomain::Folder>>(resourceName);
 }
 void DummyResourceFactory::registerAdaptorFactories(const QByteArray &resourceName, Sink::AdaptorFactoryRegistry &registry)
diff --git a/examples/imapresource/CMakeLists.txt b/examples/imapresource/CMakeLists.txt
index 15a720d..46a8b08 100644
--- a/examples/imapresource/CMakeLists.txt
+++ b/examples/imapresource/CMakeLists.txt
@@ -8,7 +8,7 @@ find_package(KIMAP2 0.0.1 REQUIRED)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
-add_library(${PROJECT_NAME} SHARED facade.cpp imapresource.cpp domainadaptor.cpp imapserverproxy.cpp)
+add_library(${PROJECT_NAME} SHARED imapresource.cpp imapserverproxy.cpp)
 qt5_use_modules(${PROJECT_NAME} Core Network)
 target_link_libraries(${PROJECT_NAME} sink KF5::Mime KIMAP2)
diff --git a/examples/imapresource/domainadaptor.cpp b/examples/imapresource/domainadaptor.cpp
deleted file mode 100644
index 4e74ad2..0000000
--- a/examples/imapresource/domainadaptor.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *   Copyright (C) 2015 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 "domainadaptor.h"
-using namespace flatbuffers;
-ImapMailAdaptorFactory::ImapMailAdaptorFactory()
-    : DomainTypeAdaptorFactory()
-{
-}
-ImapFolderAdaptorFactory::ImapFolderAdaptorFactory()
-    : DomainTypeAdaptorFactory()
-{
-}
diff --git a/examples/imapresource/domainadaptor.h b/examples/imapresource/domainadaptor.h
deleted file mode 100644
index 06a513c..0000000
--- a/examples/imapresource/domainadaptor.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2015 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.
- */
-#pragma once
-#include <common/domainadaptor.h>
-#include "mail_generated.h"
-#include "folder_generated.h"
-#include "dummy_generated.h"
-class ImapMailAdaptorFactory : public DomainTypeAdaptorFactory<Sink::ApplicationDomain::Mail, Sink::ApplicationDomain::Buffer::Dummy, Sink::ApplicationDomain::Buffer::DummyBuilder>
-{
-public:
-    ImapMailAdaptorFactory();
-    virtual ~ImapMailAdaptorFactory() {};
-};
-class ImapFolderAdaptorFactory : public DomainTypeAdaptorFactory<Sink::ApplicationDomain::Folder, Sink::ApplicationDomain::Buffer::Dummy, Sink::ApplicationDomain::Buffer::DummyBuilder>
-{
-public:
-    ImapFolderAdaptorFactory();
-    virtual ~ImapFolderAdaptorFactory() {};
-};
diff --git a/examples/imapresource/facade.cpp b/examples/imapresource/facade.cpp
deleted file mode 100644
index 2829bb1..0000000
--- a/examples/imapresource/facade.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2014 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 "facade.h"
-#include <QDir>
-#include <QFileInfo>
-#include "domainadaptor.h"
-#include "queryrunner.h"
-ImapResourceMailFacade::ImapResourceMailFacade(const Sink::ResourceContext &context)
-    : Sink::GenericFacade<Sink::ApplicationDomain::Mail>(context)
-{
-}
-ImapResourceMailFacade::~ImapResourceMailFacade()
-{
-}
-ImapResourceFolderFacade::ImapResourceFolderFacade(const Sink::ResourceContext &context)
-    : Sink::GenericFacade<Sink::ApplicationDomain::Folder>(context)
-{
-}
-ImapResourceFolderFacade::~ImapResourceFolderFacade()
-{
-}
diff --git a/examples/imapresource/facade.h b/examples/imapresource/facade.h
deleted file mode 100644
index 1d24856..0000000
--- a/examples/imapresource/facade.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2014 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.
- */
-#pragma once
-#include "common/facade.h"
-class ImapResourceMailFacade : public Sink::GenericFacade<Sink::ApplicationDomain::Mail>
-{
-public:
-    ImapResourceMailFacade(const Sink::ResourceContext &context);
-    virtual ~ImapResourceMailFacade();
-};
-class ImapResourceFolderFacade : public Sink::GenericFacade<Sink::ApplicationDomain::Folder>
-{
-public:
-    ImapResourceFolderFacade(const Sink::ResourceContext &context);
-    virtual ~ImapResourceFolderFacade();
-};
diff --git a/examples/imapresource/imapresource.cpp b/examples/imapresource/imapresource.cpp
index 09f57d5..0579dae 100644
--- a/examples/imapresource/imapresource.cpp
+++ b/examples/imapresource/imapresource.cpp
@@ -100,7 +100,7 @@ public:
    QByteArray createFolder(const Imap::Folder &f)
    {
        const auto parentFolderRid = parentRid(f);
-        SinkTrace() << "Creating folder: " << f.name() << parentFolderRid;
+        SinkTraceCtx(mLogCtx) << "Creating folder: " << f.name() << parentFolderRid;
        const auto remoteId = folderRid(f);
        Sink::ApplicationDomain::Folder folder;
@@ -123,7 +123,7 @@ public:
    void synchronizeFolders(const QVector<Folder> &folderList)
    {
-        SinkTrace() << "Found folders " << folderList.size();
+        SinkTraceCtx(mLogCtx) << "Found folders " << folderList.size();
        scanForRemovals(ENTITY_TYPE_FOLDER,
            [&folderList](const QByteArray &remoteId) -> bool {
@@ -164,14 +164,14 @@ public:
    {
        auto time = QSharedPointer<QTime>::create();
        time->start();
-        SinkTrace() << "Importing new mail." << folderRid;
+        SinkTraceCtx(mLogCtx) << "Importing new mail." << folderRid;
        const auto folderLocalId = syncStore().resolveRemoteId(ENTITY_TYPE_FOLDER, folderRid);
        const auto remoteId = assembleMailRid(folderLocalId, message.uid);
        Q_ASSERT(message.msg);
-        SinkTrace() << "Found a mail " << remoteId << message.msg->subject(true)->asUnicodeString() << message.flags;
+        SinkTraceCtx(mLogCtx) << "Found a mail " << remoteId << message.msg->subject(true)->asUnicodeString() << message.flags;
        auto mail = Sink::ApplicationDomain::Mail::create(mResourceInstanceIdentifier);
        mail.setFolder(folderLocalId);
@@ -181,7 +181,7 @@ public:
        createOrModify(ENTITY_TYPE_MAIL, remoteId, mail);
        // const auto elapsed = time->elapsed();
-        // SinkTrace() << "Synchronized " << count << " mails in " << folderRid << Sink::Log::TraceTime(elapsed) << " " << elapsed/qMax(count, 1) << " [ms/mail]";
+        // SinkTraceCtx(mLogCtx) << "Synchronized " << count << " mails in " << folderRid << Sink::Log::TraceTime(elapsed) << " " << elapsed/qMax(count, 1) << " [ms/mail]";
    }
    void synchronizeRemovals(const QByteArray &folderRid, const QSet<qint64> &messages)
@@ -194,7 +194,7 @@ public:
            return;
        }
-        SinkTrace() << "Finding removed mail: " << folderLocalId << " remoteId: " << folderRid;
+        SinkTraceCtx(mLogCtx) << "Finding removed mail: " << folderLocalId << " remoteId: " << folderRid;
        int count = 0;
@@ -370,7 +370,7 @@ public:
    Sink::QueryBase applyMailDefaults(const Sink::QueryBase &query)
    {
-        auto defaultDateFilter = QDate::currentDate().addDays(-14);
+        auto defaultDateFilter = QDate::currentDate().addDays(0 - mDaysToSync);
        auto queryWithDefaults = query;
        if (!queryWithDefaults.hasFilter<ApplicationDomain::Mail::Date>()) {
            queryWithDefaults.filter(ApplicationDomain::Mail::Date::name, QVariant::fromValue(defaultDateFilter));
@@ -382,7 +382,11 @@ public:
    {
        QList<Synchronizer::SyncRequest> list;
        if (query.type() == ApplicationDomain::getTypeName<ApplicationDomain::Mail>()) {
-            list << Synchronizer::SyncRequest{applyMailDefaults(query)};
+            auto request = Synchronizer::SyncRequest{applyMailDefaults(query)};
+            if (query.hasFilter(ApplicationDomain::Mail::Folder::name)) {
+                request.applicableEntities << query.getFilter(ApplicationDomain::Mail::Folder::name).value.toByteArray();
+            }
+            list << request;
        } else if (query.type() == ApplicationDomain::getTypeName<ApplicationDomain::Folder>()) {
            list << Synchronizer::SyncRequest{query};
        } else {
@@ -393,15 +397,57 @@ public:
        return list;
    }
+    QByteArray getFolderFromLocalId(const QByteArray &id)
+    {
+        auto mailRemoteId = syncStore().resolveLocalId(ApplicationDomain::getTypeName<ApplicationDomain::Mail>(), id);
+        if (mailRemoteId.isEmpty()) {
+            return {};
+        }
+        return folderIdFromMailRid(mailRemoteId);
+    }
+    void mergeIntoQueue(const Synchronizer::SyncRequest &request, QList<Synchronizer::SyncRequest> &queue)  Q_DECL_OVERRIDE
+    {
+        auto isIndividualMailSync = [](const Synchronizer::SyncRequest &request) {
+            if (request.requestType == SyncRequest::Synchronization) {
+                const auto query = request.query;
+                if (query.type() == ApplicationDomain::getTypeName<ApplicationDomain::Mail>()) {
+                    return !query.ids().isEmpty();
+                }
+            }
+            return false;
+        };
+        if (isIndividualMailSync(request)) {
+            auto newId = request.query.ids().first();
+            auto requestFolder = getFolderFromLocalId(newId);
+            if (requestFolder.isEmpty()) {
+                SinkWarningCtx(mLogCtx) << "Failed to find folder for local id. Ignoring request: " << request.query;
+                return;
+            }
+            for (auto &r : queue) {
+                if (isIndividualMailSync(r)) {
+                    auto queueFolder = getFolderFromLocalId(r.query.ids().first());
+                    if (requestFolder == queueFolder) {
+                        //Merge
+                        r.query.filter(newId);
+                        SinkTrace() << "Merging request " << request.query;
+                        SinkTrace() << " to " << r.query;
+                        return;
+                    }
+                }
+            }
+        }
+        queue << request;
+    }
    KAsync::Job<void> login(QSharedPointer<ImapServerProxy> imap)
    {
        SinkTrace() << "Connecting to:" << mServer << mPort;
        SinkTrace() << "as:" << mUser;
        return imap->login(mUser, mPassword)
-        .addToContext(imap)
+        .addToContext(imap);
-        .onError([](const KAsync::Error &error) {
-            SinkWarning() << "Login failed.";
-        });
    }
    KAsync::Job<QVector<Folder>> getFolderList(QSharedPointer<ImapServerProxy> imap, const Sink::QueryBase &query)
@@ -431,6 +477,19 @@ public:
        }
    }
+    KAsync::Error getError(const KAsync::Error &error)
+    {
+        if (error) {
+            if (error.errorCode == Imap::CouldNotConnectError) {
+                return {ApplicationDomain::ConnectionError, error.errorMessage};
+            } else if (error.errorCode == Imap::SslHandshakeError) {
+                return {ApplicationDomain::LoginError, error.errorMessage};
+            }
+            return {ApplicationDomain::UnknownError, error.errorMessage};
+        }
+        return {};
+    }
    KAsync::Job<void> synchronizeWithSource(const Sink::QueryBase &query) Q_DECL_OVERRIDE
    {
        auto imap = QSharedPointer<ImapServerProxy>::create(mServer, mPort, &mSessionCache);
@@ -446,11 +505,8 @@ public:
                });
            })
            .then([=] (const KAsync::Error &error) {
-                if (error) {
-                    SinkWarning() << "Error during folder sync: " << error.errorMessage;
-                }
                return imap->logout()
-                    .then(KAsync::error(error));
+                    .then(KAsync::error(getError(error)));
            });
        } else if (query.type() == ApplicationDomain::getTypeName<ApplicationDomain::Mail>()) {
            //TODO
@@ -487,7 +543,7 @@ public:
                        synchronizeMails(folderRemoteId, m);
                    },
                    [=](int progress, int total) {
-                        SinkLogCtx(mLogCtx) << "Progress: " << progress << " out of " << total;
+                        reportProgress(progress, total);
                        //commit every 100 messages
                        if ((progress % 100) == 0) {
                            commit();
@@ -503,6 +559,8 @@ public:
                        return KAsync::value(folders)
                        .serialEach<void>([=](const Folder &folder) {
                            SinkLog() << "Syncing folder " << folder.path();
+                            //Emit notification that the folder is being synced.
+                            //The synchronizer can't do that because it has no concept of the folder filter on a mail sync scope meaning that the folder is being synchronized.
                            QDate dateFilter;
                            auto filter = query.getFilter<ApplicationDomain::Mail::Date>();
                            if (filter.value.canConvert<QDate>()) {
@@ -510,7 +568,7 @@ public:
                                SinkLog() << " with date-range " << dateFilter;
                            }
                            return synchronizeFolder(imap, folder, dateFilter, syncHeaders)
-                                .onError([folder](const KAsync::Error &error) {
+                                .onError([=](const KAsync::Error &error) {
                                    SinkWarning() << "Failed to sync folder: " << folder.path() << "Error: " << error.errorMessage;
                                });
                        });
@@ -518,11 +576,8 @@ public:
                }
            })
            .then([=] (const KAsync::Error &error) {
-                if (error) {
-                    SinkWarning() << "Error during sync: " << error.errorMessage;
-                }
                return imap->logout()
-                    .then(KAsync::error(error));
+                    .then(KAsync::error(getError(error)));
            });
        }
        return KAsync::error<void>("Nothing to do");
@@ -616,11 +671,11 @@ public:
            if (!folder.getParent().isEmpty()) {
                parentFolder = syncStore().resolveLocalId(ENTITY_TYPE_FOLDER, folder.getParent());
            }
-            SinkTrace() << "Creating a new folder: " << parentFolder << folder.getName();
+            SinkTraceCtx(mLogCtx) << "Creating a new folder: " << parentFolder << folder.getName();
            auto rid = QSharedPointer<QByteArray>::create();
            auto createFolder = login.then(imap->createSubfolder(parentFolder, folder.getName()))
-                .then([imap, rid](const QString &createdFolder) {
+                .then([this, imap, rid](const QString &createdFolder) {
-                    SinkTrace() << "Finished creating a new folder: " << createdFolder;
+                    SinkTraceCtx(mLogCtx) << "Finished creating a new folder: " << createdFolder;
                    *rid = createdFolder.toUtf8();
                });
            if (folder.getSpecialPurpose().isEmpty()) {
@@ -636,19 +691,19 @@ public:
                            specialPurposeFolders->insert(SpecialPurpose::getSpecialPurposeType(folder.name()), folder.path());
                        };
                    }))
-                    .then([specialPurposeFolders, folder, imap, parentFolder, rid]() -> KAsync::Job<void> {
+                    .then([this, specialPurposeFolders, folder, imap, parentFolder, rid]() -> KAsync::Job<void> {
                        for (const auto &purpose : folder.getSpecialPurpose()) {
                            if (specialPurposeFolders->contains(purpose)) {
                                auto f = specialPurposeFolders->value(purpose);
-                                SinkTrace() << "Merging specialpurpose folder with: " << f << " with purpose: " << purpose;
+                                SinkTraceCtx(mLogCtx) << "Merging specialpurpose folder with: " << f << " with purpose: " << purpose;
                                *rid = f.toUtf8();
                                return KAsync::null<void>();
                            }
                        }
-                        SinkTrace() << "No match found for merging, creating a new folder";
+                        SinkTraceCtx(mLogCtx) << "No match found for merging, creating a new folder";
                        return imap->createSubfolder(parentFolder, folder.getName())
-                            .then([imap, rid](const QString &createdFolder) {
+                            .then([this, imap, rid](const QString &createdFolder) {
-                                SinkTrace() << "Finished creating a new folder: " << createdFolder;
+                                SinkTraceCtx(mLogCtx) << "Finished creating a new folder: " << createdFolder;
                                *rid = createdFolder.toUtf8();
                            });
@@ -659,18 +714,18 @@ public:
                return mergeJob;
            }
        } else if (operation == Sink::Operation_Removal) {
-            SinkTrace() << "Removing a folder: " << oldRemoteId;
+            SinkTraceCtx(mLogCtx) << "Removing a folder: " << oldRemoteId;
            return login.then(imap->remove(oldRemoteId))
-                .then([oldRemoteId, imap] {
+                .then([this, oldRemoteId, imap] {
-                    SinkTrace() << "Finished removing a folder: " << oldRemoteId;
+                    SinkTraceCtx(mLogCtx) << "Finished removing a folder: " << oldRemoteId;
                    return QByteArray();
                });
        } else if (operation == Sink::Operation_Modification) {
-            SinkTrace() << "Renaming a folder: " << oldRemoteId << folder.getName();
+            SinkTraceCtx(mLogCtx) << "Renaming a folder: " << oldRemoteId << folder.getName();
            auto rid = QSharedPointer<QByteArray>::create();
            return login.then(imap->renameSubfolder(oldRemoteId, folder.getName()))
-                .then([imap, rid](const QString &createdFolder) {
+                .then([this, imap, rid](const QString &createdFolder) {
-                    SinkTrace() << "Finished renaming a folder: " << createdFolder;
+                    SinkTraceCtx(mLogCtx) << "Finished renaming a folder: " << createdFolder;
                    *rid = createdFolder.toUtf8();
                })
                .then([rid] {
@@ -685,6 +740,7 @@ public:
    int mPort;
    QString mUser;
    QString mPassword;
+    int mDaysToSync = 0;
    QByteArray mResourceInstanceIdentifier;
    Imap::SessionCache mSessionCache;
 };
@@ -864,6 +920,7 @@ ImapResource::ImapResource(const ResourceContext &resourceContext)
    synchronizer->mPort = port;
    synchronizer->mUser = user;
    synchronizer->mPassword = password;
+    synchronizer->mDaysToSync = 14;
    setupSynchronizer(synchronizer);
    auto inspector = QSharedPointer<ImapInspector>::create(resourceContext);
@@ -873,7 +930,7 @@ ImapResource::ImapResource(const ResourceContext &resourceContext)
    inspector->mPassword = password;
    setupInspector(inspector);
-    setupPreprocessors(ENTITY_TYPE_MAIL, QVector<Sink::Preprocessor*>() << new SpecialPurposeProcessor(resourceContext.resourceType, resourceContext.instanceId()) << new MailPropertyExtractor);
+    setupPreprocessors(ENTITY_TYPE_MAIL, QVector<Sink::Preprocessor*>() << new SpecialPurposeProcessor << new MailPropertyExtractor);
    setupPreprocessors(ENTITY_TYPE_FOLDER, QVector<Sink::Preprocessor*>());
 }
@@ -898,14 +955,14 @@ Sink::Resource *ImapResourceFactory::createResource(const ResourceContext &conte
 void ImapResourceFactory::registerFacades(const QByteArray &name, Sink::FacadeFactory &factory)
 {
-    factory.registerFacade<Sink::ApplicationDomain::Mail, ImapResourceMailFacade>(name);
+    factory.registerFacade<ApplicationDomain::Mail, DefaultFacade<ApplicationDomain::Mail>>(name);
-    factory.registerFacade<Sink::ApplicationDomain::Folder, ImapResourceFolderFacade>(name);
+    factory.registerFacade<ApplicationDomain::Folder, DefaultFacade<ApplicationDomain::Folder>>(name);
 }
 void ImapResourceFactory::registerAdaptorFactories(const QByteArray &name, Sink::AdaptorFactoryRegistry &registry)
 {
-    registry.registerFactory<Sink::ApplicationDomain::Mail, ImapMailAdaptorFactory>(name);
+    registry.registerFactory<ApplicationDomain::Mail, DefaultAdaptorFactory<ApplicationDomain::Mail>>(name);
-    registry.registerFactory<Sink::ApplicationDomain::Folder, ImapFolderAdaptorFactory>(name);
+    registry.registerFactory<ApplicationDomain::Folder, DefaultAdaptorFactory<ApplicationDomain::Folder>>(name);
 }
 void ImapResourceFactory::removeDataFromDisk(const QByteArray &instanceIdentifier)
diff --git a/examples/imapresource/imapserverproxy.cpp b/examples/imapresource/imapserverproxy.cpp
index dabdd8e..0cc43b8 100644
--- a/examples/imapresource/imapserverproxy.cpp
+++ b/examples/imapresource/imapserverproxy.cpp
@@ -69,7 +69,7 @@ static KAsync::Job<T> runJob(KJob *job, const std::function<T(KJob*)> &f)
        QObject::connect(job, &KJob::result, [&future, f](KJob *job) {
            SinkTrace() << "Job done: " << job->metaObject()->className();
            if (job->error()) {
-                SinkWarning() << "Job failed: " << job->errorString();
+                SinkWarning() << "Job failed: " << job->errorString() << job->metaObject()->className();
                future.setError(job->error(), job->errorString());
            } else {
                future.setValue(f(job));
@@ -87,7 +87,7 @@ static KAsync::Job<void> runJob(KJob *job)
        QObject::connect(job, &KJob::result, [&future](KJob *job) {
            SinkTrace() << "Job done: " << job->metaObject()->className();
            if (job->error()) {
-                SinkWarning() << "Job failed: " << job->errorString();
+                SinkWarning() << "Job failed: " << job->errorString() << job->metaObject()->className();
                future.setError(job->error(), job->errorString());
            } else {
                future.setFinished();
@@ -159,6 +159,16 @@ KAsync::Job<void> ImapServerProxy::login(const QString &username, const QString
        // SinkTrace() << "Found personal namespaces: " << mNamespaces.personal;
        // SinkTrace() << "Found shared namespaces: " << mNamespaces.shared;
        // SinkTrace() << "Found user namespaces: " << mNamespaces.user;
+    }).then([=] (const KAsync::Error &error) {
+        if (error) {
+            if (error.errorCode == KIMAP2::LoginJob::ErrorCode::ERR_COULD_NOT_CONNECT) {
+                return KAsync::error(CouldNotConnectError, "Failed to connect: " + error.errorMessage);
+            } else if (error.errorCode == KIMAP2::LoginJob::ErrorCode::ERR_SSL_HANDSHAKE_FAILED) {
+                return KAsync::error(SslHandshakeError, "Ssl handshake failed: " + error.errorMessage);
+            }
+            return KAsync::error(error);
+        }
+        return KAsync::null();
    });
 }
diff --git a/examples/imapresource/imapserverproxy.h b/examples/imapresource/imapserverproxy.h
index 6eb47ee..872f032 100644
--- a/examples/imapresource/imapserverproxy.h
+++ b/examples/imapresource/imapserverproxy.h
@@ -29,6 +29,12 @@
 namespace Imap {
+enum ErrorCode {
+    NoError,
+    CouldNotConnectError,
+    SslHandshakeError
+};
 namespace Flags
 {
    /// The flag for a message being seen (i.e. opened by user).
diff --git a/examples/maildirresource/CMakeLists.txt b/examples/maildirresource/CMakeLists.txt
index e4d113c..a8f0359 100644
--- a/examples/maildirresource/CMakeLists.txt
+++ b/examples/maildirresource/CMakeLists.txt
@@ -5,13 +5,12 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 find_package(KF5 COMPONENTS REQUIRED Mime)
-add_library(${PROJECT_NAME} SHARED facade.cpp maildirresource.cpp domainadaptor.cpp)
+add_library(${PROJECT_NAME} SHARED facade.cpp maildirresource.cpp libmaildir/maildir.cpp libmaildir/keycache.cpp)
 qt5_use_modules(${PROJECT_NAME} Core Network)
-target_link_libraries(${PROJECT_NAME} sink maildir KF5::Mime)
+target_link_libraries(${PROJECT_NAME} sink KF5::Mime)
 install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SINK_RESOURCE_PLUGINS_PATH})
 add_definitions(-DTESTDATAPATH="${CMAKE_CURRENT_SOURCE_DIR}/tests/data")
-add_subdirectory(libmaildir)
 add_subdirectory(tests)
diff --git a/examples/maildirresource/domainadaptor.cpp b/examples/maildirresource/domainadaptor.cpp
deleted file mode 100644
index 71b2354..0000000
--- a/examples/maildirresource/domainadaptor.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *   Copyright (C) 2015 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 "domainadaptor.h"
-using namespace flatbuffers;
-MaildirMailAdaptorFactory::MaildirMailAdaptorFactory()
-    : DomainTypeAdaptorFactory()
-{
-}
-MaildirFolderAdaptorFactory::MaildirFolderAdaptorFactory()
-    : DomainTypeAdaptorFactory()
-{
-}
diff --git a/examples/maildirresource/domainadaptor.h b/examples/maildirresource/domainadaptor.h
deleted file mode 100644
index 700d2e5..0000000
--- a/examples/maildirresource/domainadaptor.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2015 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.
- */
-#pragma once
-#include <common/domainadaptor.h>
-#include "mail_generated.h"
-#include "folder_generated.h"
-#include "dummy_generated.h"
-class MaildirMailAdaptorFactory : public DomainTypeAdaptorFactory<Sink::ApplicationDomain::Mail, Sink::ApplicationDomain::Buffer::Dummy, Sink::ApplicationDomain::Buffer::DummyBuilder>
-{
-public:
-    MaildirMailAdaptorFactory();
-    virtual ~MaildirMailAdaptorFactory() {};
-};
-class MaildirFolderAdaptorFactory : public DomainTypeAdaptorFactory<Sink::ApplicationDomain::Folder, Sink::ApplicationDomain::Buffer::Dummy, Sink::ApplicationDomain::Buffer::DummyBuilder>
-{
-public:
-    MaildirFolderAdaptorFactory();
-    virtual ~MaildirFolderAdaptorFactory() {};
-};
diff --git a/examples/maildirresource/libmaildir/CMakeLists.txt b/examples/maildirresource/libmaildir/CMakeLists.txt
deleted file mode 100644
index e7803f5..0000000
--- a/examples/maildirresource/libmaildir/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# add_subdirectory( tests )
-set(maildir_LIB_SRCS keycache.cpp maildir.cpp)
-add_library(maildir ${LIBRARY_TYPE} ${maildir_LIB_SRCS})
-qt5_use_modules(maildir Core Network)
-# set_target_properties(maildir PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
-install(TARGETS maildir ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/examples/maildirresource/libmaildir/maildir.cpp b/examples/maildirresource/libmaildir/maildir.cpp
index a889ea2..203f6a6 100644
--- a/examples/maildirresource/libmaildir/maildir.cpp
+++ b/examples/maildirresource/libmaildir/maildir.cpp
@@ -1,5 +1,6 @@
 /*
    Copyright (c) 2007 Till Adam <adam@kde.org>
+    Copyright (c) 2017 Christian Mollekopf <mollekopf@kolabsys.com>
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published by
@@ -24,7 +25,6 @@
 #include <QDirIterator>
 #include <QFileInfo>
 #include <QHostInfo>
-#include <QUuid>
 #include <QLoggingCategory>
 Q_LOGGING_CATEGORY(log, "maildir");
diff --git a/examples/maildirresource/libmaildir/maildir.h b/examples/maildirresource/libmaildir/maildir.h
index c10b046..a72f2bc 100644
--- a/examples/maildirresource/libmaildir/maildir.h
+++ b/examples/maildirresource/libmaildir/maildir.h
@@ -1,5 +1,6 @@
 /*
    Copyright (c) 2007 Till Adam <adam@kde.org>
+    Copyright (c) 2017 Christian Mollekopf <mollekopf@kolabsys.com>
    This library is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published by
@@ -20,9 +21,6 @@
 #ifndef MAILDIR_H
 #define MAILDIR_H
-#include "maildir_export.h"
 #include <QString>
 #include <QStringList>
@@ -30,7 +28,7 @@ class QDateTime;
 namespace KPIM {
-class MAILDIR_EXPORT Maildir
+class Maildir
 {
 public:
    /**
diff --git a/examples/maildirresource/libmaildir/maildir_export.h b/examples/maildirresource/libmaildir/maildir_export.h
deleted file mode 100644
index b330fd0..0000000
--- a/examples/maildirresource/libmaildir/maildir_export.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  This file is part of the KDE project
-    Copyright (C) 2007 David Faure <faure@kde.org>
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-    This library 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
-    Library General Public License for more details.
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-#ifndef MAILDIR_EXPORT_H
-#define MAILDIR_EXPORT_H
-/* needed for KDE_EXPORT and KDE_IMPORT macros */
-// #include <kdemacros.h>
-#ifndef MAILDIR_EXPORT
-// # if defined(KDEPIM_STATIC_LIBS)
-//    #<{(| No export/import for static libraries |)}>#
-#  define MAILDIR_EXPORT
-// # elif defined(MAKE_MAILDIR_LIB)
-//    #<{(| We are building this library |)}># 
-// #  define MAILDIR_EXPORT KDE_EXPORT
-// # else
-//    #<{(| We are using this library |)}># 
-// #  define MAILDIR_EXPORT KDE_IMPORT
-// # endif
-#endif
-//
-// # ifndef MAILDIR_EXPORT_DEPRECATED
-// #  define MAILDIR_EXPORT_DEPRECATED KDE_DEPRECATED MAILDIR_EXPORT
-// # endif
-#endif
diff --git a/examples/maildirresource/maildirresource.cpp b/examples/maildirresource/maildirresource.cpp
index 813d84f..40bab37 100644
--- a/examples/maildirresource/maildirresource.cpp
+++ b/examples/maildirresource/maildirresource.cpp
@@ -37,7 +37,7 @@
 #include <QDir>
 #include <QDirIterator>
-#include <KMime/KMime/KMimeMessage>
+#include <KMime/KMimeMessage>
 //This is the resources entity type, and not the domain type
 #define ENTITY_TYPE_MAIL "mail"
@@ -360,12 +360,12 @@ public:
    KAsync::Job<void> synchronizeWithSource(const Sink::QueryBase &query) Q_DECL_OVERRIDE
    {
-        auto job = KAsync::start<void>([this] {
+        auto job = KAsync::start([this] {
            KPIM::Maildir maildir(mMaildirPath, true);
            if (!maildir.isValid(false)) {
-                return KAsync::error<void>(1, "Maildir path doesn't point to a valid maildir: " + mMaildirPath);
+                return KAsync::error(ApplicationDomain::ConfigurationError, "Maildir path doesn't point to a valid maildir: " + mMaildirPath);
            }
-            return KAsync::null<void>();
+            return KAsync::null();
        });
        if (query.type() == ApplicationDomain::getTypeName<ApplicationDomain::Folder>()) {
@@ -551,7 +551,7 @@ MaildirResource::MaildirResource(const Sink::ResourceContext &resourceContext)
    setupSynchronizer(synchronizer);
    setupInspector(QSharedPointer<MaildirInspector>::create(resourceContext));
-    setupPreprocessors(ENTITY_TYPE_MAIL, QVector<Sink::Preprocessor*>() << new SpecialPurposeProcessor(resourceContext.resourceType, resourceContext.instanceId()) << new MaildirMimeMessageMover(resourceContext.instanceId(), mMaildirPath) << new MaildirMailPropertyExtractor);
+    setupPreprocessors(ENTITY_TYPE_MAIL, QVector<Sink::Preprocessor*>() << new SpecialPurposeProcessor << new MaildirMimeMessageMover(resourceContext.instanceId(), mMaildirPath) << new MaildirMailPropertyExtractor);
    setupPreprocessors(ENTITY_TYPE_FOLDER, QVector<Sink::Preprocessor*>() << new FolderPreprocessor(mMaildirPath));
    KPIM::Maildir dir(mMaildirPath, true);
@@ -596,8 +596,8 @@ void MaildirResourceFactory::registerFacades(const QByteArray &name, Sink::Facad
 void MaildirResourceFactory::registerAdaptorFactories(const QByteArray &name, Sink::AdaptorFactoryRegistry &registry)
 {
-    registry.registerFactory<Sink::ApplicationDomain::Mail, MaildirMailAdaptorFactory>(name);
+    registry.registerFactory<ApplicationDomain::Mail, DefaultAdaptorFactory<ApplicationDomain::Mail>>(name);
-    registry.registerFactory<Sink::ApplicationDomain::Folder, MaildirFolderAdaptorFactory>(name);
+    registry.registerFactory<ApplicationDomain::Folder, DefaultAdaptorFactory<ApplicationDomain::Folder>>(name);
 }
 void MaildirResourceFactory::removeDataFromDisk(const QByteArray &instanceIdentifier)
diff --git a/examples/mailtransportresource/mailtransport.cpp b/examples/mailtransportresource/mailtransport.cpp
index 3d56af9..84c1556 100644
--- a/examples/mailtransportresource/mailtransport.cpp
+++ b/examples/mailtransportresource/mailtransport.cpp
@@ -41,17 +41,17 @@ static size_t payload_source(void *ptr, size_t size, size_t nmemb, void *userp)
    struct upload_status *upload_ctx = (struct upload_status *)userp;
    const char *data;
-    if((size == 0) || (nmemb == 0) || ((size*nmemb) < 1)) {
+    if ((size == 0) || (nmemb == 0) || ((size*nmemb) < 1)) {
        return 0;
    }
    data = &upload_ctx->data[upload_ctx->offset];
-    if(data) {
+    if (data) {
        size_t len = strlen(data);
        if (len > size * nmemb) {
            len = size * nmemb;
        }
-        fprintf(stderr, "read n bytes: %d\n", int(len));
+        fprintf(stdout, "read n bytes: %d\n", int(len));
        memcpy(ptr, data, len);
        upload_ctx->offset += len;
        return len;
@@ -69,8 +69,17 @@ static int progress_callback(void *clientp, curl_off_t dltotal, curl_off_t dlnow
    return 0;
 }
+static int debug_callback(CURL *handle,
+                   curl_infotype type,
+                   char *data,
+                   size_t size,
+                   void *userptr)
+{
+    fprintf(stdout, "CURL_DEBUG: %s", data);
+    return 0;
+}
-bool sendMessageCurl(const char *to[], int numTos, const char *cc[], int numCcs, const char *msg, bool useTls, const char* from, const char *username, const char *password, const char *server, bool verifyPeer, const QByteArray &cacert)
+bool sendMessageCurl(const char *to[], int numTos, const char *cc[], int numCcs, const char *msg, bool useTls, const char* from, const char *username, const char *password, const char *server, bool verifyPeer, const QByteArray &cacert, QByteArray &errorMessage)
 {
    CURL *curl;
    CURLcode res = CURLE_OK;
@@ -88,7 +97,7 @@ bool sendMessageCurl(const char *to[], int numTos, const char *cc[], int numCcs,
        curl_easy_setopt(curl, CURLOPT_URL, server);
        if (useTls) {
-            curl_easy_setopt(curl, CURLOPT_USE_SSL, (long)CURLUSESSL_TRY);
+            curl_easy_setopt(curl, CURLOPT_USE_SSL, (long)CURLUSESSL_ALL);
        }
        if (!verifyPeer) {
@@ -121,19 +130,29 @@ bool sendMessageCurl(const char *to[], int numTos, const char *cc[], int numCcs,
        /* Since the traffic will be encrypted, it is very useful to turn on debug
        * information within libcurl to see what is happening during the transfer.
        */
-        curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
+        // curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
+        curl_easy_setopt(curl, CURLOPT_DEBUGFUNCTION, debug_callback);
        // curl_easy_setopt(curl, CURLOPT_TIMEOUT, 1L);
-        //Connection timeout of 10s
+        //Connection timeout of 40s
-        curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 10L);
+        curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 40L);
        curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0);
        curl_easy_setopt(curl, CURLOPT_XFERINFOFUNCTION, progress_callback);
+        char errorBuffer[CURL_ERROR_SIZE];
+        curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errorBuffer);
        res = curl_easy_perform(curl);
        if(res != CURLE_OK) {
-            fprintf(stderr, "curl_easy_perform() failed: %s\n",
+            errorMessage += curl_easy_strerror(res);
-                    curl_easy_strerror(res));
+            errorMessage += "; ";
+        }
+        long http_code = 0;
+        curl_easy_getinfo (curl, CURLINFO_RESPONSE_CODE, &http_code);
+        if (http_code == 200 && res != CURLE_ABORTED_BY_CALLBACK) {
+                //Succeeded
+        } else {
+            errorMessage += errorBuffer;
        }
        curl_slist_free_all(recipients);
        curl_easy_cleanup(curl);
@@ -147,8 +166,6 @@ bool sendMessageCurl(const char *to[], int numTos, const char *cc[], int numCcs,
 bool MailTransport::sendMessage(const KMime::Message::Ptr &message, const QByteArray &server, const QByteArray &username, const QByteArray &password, const QByteArray &cacert, MailTransport::Options options)
 {
    QByteArray msg = message->encodedContent();
-    SinkLog() << "Sending message " << server << username << password << cacert;
-    SinkTrace() << "Sending message " << msg;
    QByteArray from(message->from(true)->mailboxes().isEmpty() ? QByteArray() : message->from(true)->mailboxes().first().address());
    QList<QByteArray> toList;
@@ -159,8 +176,11 @@ bool MailTransport::sendMessage(const KMime::Message::Ptr &message, const QByteA
    for (const auto &mb : message->cc(true)->mailboxes()) {
        ccList << mb.address();
    }
-    bool verifyPeer = options & VerifyPeers;
+    const bool verifyPeer = options.testFlag(VerifyPeers);
-    bool useTls = options & UseTls;
+    const bool useTls = options.testFlag(UseTls);
+    SinkLog() << "Sending message " << server << username << password << "CaCert: " << cacert  << "Use tls: " << useTls << " Verify peer: " << verifyPeer;
+    SinkTrace() << "Sending message " << msg;
    const int numTos = toList.size();
    const char* to[numTos];
@@ -173,6 +193,14 @@ bool MailTransport::sendMessage(const KMime::Message::Ptr &message, const QByteA
    for (int i = 0; i < numCcs; i++) {
        cc[i] = ccList.at(i);
    }
+    //Because curl will fail with smtps, but it won't tell you why.
-    return sendMessageCurl(to, numTos, cc, numCcs, msg, useTls, from.isEmpty() ? nullptr : from, username, password, server, verifyPeer, cacert);
+    auto serverAddress = server;
+    serverAddress.replace("smtps://", "smtp://");
+    QByteArray errorMessage;
+    auto ret =  sendMessageCurl(to, numTos, cc, numCcs, msg, useTls, from.isEmpty() ? nullptr : from, username, password, serverAddress, verifyPeer, cacert, errorMessage);
+    if (!ret) {
+        SinkWarning() << "Failed to send message: " << errorMessage;
+    }
+    return ret;
 }
diff --git a/examples/mailtransportresource/mailtransport.h b/examples/mailtransportresource/mailtransport.h
index 3ef4a6d..662fdc9 100644
--- a/examples/mailtransportresource/mailtransport.h
+++ b/examples/mailtransportresource/mailtransport.h
@@ -26,8 +26,8 @@
 namespace MailTransport
 {
    enum Option {
-        UseTls,
+        UseTls = 1,
-        VerifyPeers
+        VerifyPeers = 2
    };
    Q_DECLARE_FLAGS(Options, Option);
diff --git a/examples/mailtransportresource/mailtransportresource.cpp b/examples/mailtransportresource/mailtransportresource.cpp
index 88a90c6..8a4ef92 100644
--- a/examples/mailtransportresource/mailtransportresource.cpp
+++ b/examples/mailtransportresource/mailtransportresource.cpp
@@ -30,7 +30,6 @@
 #include <KMime/Message>
 #include "mailtransport.h"
-#include "mail_generated.h"
 #include "inspection.h"
 #include <synchronizer.h>
 #include <log.h>
@@ -44,6 +43,47 @@ SINK_DEBUG_AREA("mailtransportresource")
 using namespace Sink;
+class MailtransportPreprocessor : public Sink::Preprocessor
+{
+public:
+    MailtransportPreprocessor() : Sink::Preprocessor() {}
+    QByteArray getTargetResource()
+    {
+        using namespace Sink::ApplicationDomain;
+        auto resource = Store::readOne<ApplicationDomain::SinkResource>(Query{}.filter(resourceInstanceIdentifier()).request<ApplicationDomain::SinkResource::Account>());
+        if (resource.identifier().isEmpty()) {
+            SinkWarning() << "Failed to retrieve this resource: " << resourceInstanceIdentifier();
+        }
+        Query query;
+        query.containsFilter<ApplicationDomain::SinkResource::Capabilities>(ApplicationDomain::ResourceCapabilities::Mail::sent);
+        query.filter<ApplicationDomain::SinkResource::Account>(resource.getAccount());
+        auto targetResource = Store::readOne<ApplicationDomain::SinkResource>(query);
+        if (targetResource.identifier().isEmpty()) {
+            SinkWarning() << "Failed to find target resource: " << targetResource.identifier();
+        }
+        return targetResource.identifier();
+    }
+    virtual Result processModification(Type type, const ApplicationDomain::ApplicationDomainType &current, ApplicationDomain::ApplicationDomainType &diff) Q_DECL_OVERRIDE
+    {
+        if (type == Preprocessor::Modification) {
+            using namespace Sink::ApplicationDomain;
+            if (diff.changedProperties().contains(Mail::Trash::name)) {
+                //Move back to regular resource
+                diff.setResource(getTargetResource());
+                return {MoveToResource};
+            } else if (diff.changedProperties().contains(Mail::Draft::name)) {
+                //Move back to regular resource
+                diff.setResource(getTargetResource());
+                return {MoveToResource};
+            }
+        }
+        return {NoAction};
+    }
+};
 class MailtransportSynchronizer : public Sink::Synchronizer {
 public:
    MailtransportSynchronizer(const Sink::ResourceContext &resourceContext)
@@ -55,17 +95,22 @@ public:
    KAsync::Job<void> send(const ApplicationDomain::Mail &mail, const MailtransportResource::Settings &settings)
    {
-        return KAsync::start<void>([=] {
+        return KAsync::start([=] {
            if (!syncStore().readValue(mail.identifier()).isEmpty()) {
                SinkLog() << "Mail is already sent: " << mail.identifier();
                return KAsync::null();
            }
+            emitNotification(Notification::Info, ApplicationDomain::SyncInProgress, "Sending message.", {}, {mail.identifier()});
            const auto data = mail.getMimeMessage();
            auto msg = KMime::Message::Ptr::create();
            msg->setHead(KMime::CRLFtoLF(data));
            msg->parse();
            if (settings.testMode) {
-                SinkLog() << "I would totally send that mail, but I'm in test mode." << mail.identifier();
+                auto subject = msg->subject(true)->asUnicodeString();
+                SinkLog() << "I would totally send that mail, but I'm in test mode." << mail.identifier() << subject;
+                if (!subject.contains("send")) {
+                    return KAsync::error("Failed to send the message.");
+                }
                auto path = resourceStorageLocation(mResourceInstanceIdentifier) + "/test/";
                SinkTrace() << path;
                QDir dir;
@@ -77,11 +122,16 @@ public:
            } else {
                MailTransport::Options options;
                if (settings.server.contains("smtps")) {
-                    options &= MailTransport::UseTls;
+                    options |= MailTransport::UseTls;
                }
                if (!MailTransport::sendMessage(msg, settings.server.toUtf8(), settings.username.toUtf8(), settings.password.toUtf8(), settings.cacert.toUtf8(), options)) {
                    SinkWarning() << "Failed to send message: " << mail;
+                    emitNotification(Notification::Warning, ApplicationDomain::SyncError, "Failed to send message.", {}, {mail.identifier()});
+                    emitNotification(Notification::Warning, ApplicationDomain::TransmissionError, "Failed to send message.", {}, {mail.identifier()});
                    return KAsync::error("Failed to send the message.");
+                } else {
+                    emitNotification(Notification::Info, ApplicationDomain::SyncSuccess, "Message successfully sent.", {}, {mail.identifier()});
+                    emitNotification(Notification::Info, ApplicationDomain::TransmissionSuccess, "Message successfully sent.", {}, {mail.identifier()});
                }
            }
            syncStore().writeValue(mail.identifier(), "sent");
@@ -100,9 +150,8 @@ public:
            query.filter<ApplicationDomain::SinkResource::Account>(resource.getAccount());
            return Store::fetchOne<ApplicationDomain::SinkResource>(query)
                .then([this, modifiedMail](const ApplicationDomain::SinkResource &resource) {
-                    //First modify the mail to have the sent property set to true
+                    //Modify the mail to have the sent property set to true, and move it to the new resource.
                    modify(modifiedMail, resource.identifier(), true);
-                    return KAsync::null<void>();
                });
        });
    }
@@ -112,12 +161,10 @@ public:
        return KAsync::start<void>([this]() {
            QList<ApplicationDomain::Mail> toSend;
            SinkLog() << "Looking for mails to send.";
-            store().readAll<ApplicationDomain::Mail>([&](const ApplicationDomain::Mail &mail) -> bool {
+            store().readAll<ApplicationDomain::Mail>([&](const ApplicationDomain::Mail &mail) {
-                SinkTrace() << "Found mail: " << mail.identifier();
                if (!mail.getSent()) {
                    toSend << mail;
                }
-                return true;
            });
            SinkLog() << "Found " << toSend.size() << " mails to send";
            auto job = KAsync::null<void>();
@@ -192,7 +239,7 @@ MailtransportResource::MailtransportResource(const Sink::ResourceContext &resour
    setupSynchronizer(synchronizer);
    setupInspector(QSharedPointer<MailtransportInspector>::create(resourceContext));
-    setupPreprocessors(ENTITY_TYPE_MAIL, QVector<Sink::Preprocessor*>() << new MailPropertyExtractor);
+    setupPreprocessors(ENTITY_TYPE_MAIL, QVector<Sink::Preprocessor*>() << new MailPropertyExtractor << new MailtransportPreprocessor);
 }
 MailtransportResourceFactory::MailtransportResourceFactory(QObject *parent)
diff --git a/examples/mailtransportresource/tests/mailtransporttest.cpp b/examples/mailtransportresource/tests/mailtransporttest.cpp
index 3b848b3..e4cc447 100644
--- a/examples/mailtransportresource/tests/mailtransporttest.cpp
+++ b/examples/mailtransportresource/tests/mailtransporttest.cpp
@@ -47,7 +47,8 @@ private slots:
    void cleanup()
    {
-        VERIFYEXEC(ResourceControl::shutdown(mResourceInstanceIdentifier));
+        VERIFYEXEC(Store::removeDataFromDisk(mResourceInstanceIdentifier));
+        VERIFYEXEC(Store::removeDataFromDisk(mStorageResource));
    }
    void init()
@@ -58,7 +59,8 @@ private slots:
    void testSendMail()
    {
        auto message = KMime::Message::Ptr::create();
-        message->subject(true)->fromUnicodeString(QString::fromLatin1("Foobar"), "utf8");
+        message->messageID(true)->generate("foo.com");
+        message->subject(true)->fromUnicodeString(QString::fromLatin1("send: Foobar"), "utf8");
        message->assemble();
        auto mail = ApplicationDomain::Mail::create(mResourceInstanceIdentifier);
@@ -67,9 +69,10 @@ private slots:
        VERIFYEXEC(Store::create(mail));
        VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
+        //FIXME the email is sent already because changereplay kicks of automatically
        //Ensure the mail is queryable in the outbox
-        auto mailInOutbox = Store::readOne<ApplicationDomain::Mail>(Query().resourceFilter(mResourceInstanceIdentifier).filter<Mail::Sent>(false).request<Mail::Subject>().request<Mail::Folder>().request<Mail::MimeMessage>().request<Mail::Sent>());
+        // auto mailInOutbox = Store::readOne<ApplicationDomain::Mail>(Query().resourceFilter(mResourceInstanceIdentifier).filter<Mail::Sent>(false).request<Mail::Subject>().request<Mail::Folder>().request<Mail::MimeMessage>().request<Mail::Sent>());
-        QVERIFY(!mailInOutbox.identifier().isEmpty());
+        // QVERIFY(!mailInOutbox.identifier().isEmpty());
        //Ensure the mail is sent and moved to the sent mail folder on sync
        VERIFYEXEC(Store::synchronize(Query().resourceFilter(mResourceInstanceIdentifier)));
@@ -81,7 +84,37 @@ private slots:
        QVERIFY(!mailInSentMailFolder.getSubject().isEmpty());
    }
-    //TODO test mail that fails to be sent. add a special header to the mail and have the resource fail sending. Ensure we can modify the mail to fix sending of the message.
+    void testSendFailure()
+    {
+        auto message = KMime::Message::Ptr::create();
+        message->messageID(true)->generate("foo.com");
+        message->subject(true)->fromUnicodeString(QString::fromLatin1("error: Foobar"), "utf8");
+        message->assemble();
+        auto mail = ApplicationDomain::Mail::create(mResourceInstanceIdentifier);
+        mail.setMimeMessage(message->encodedContent());
+        VERIFYEXEC(Store::create(mail));
+        VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
+        //Ensure the mail is queryable in the outbox
+        auto mailInOutbox = Store::readOne<ApplicationDomain::Mail>(Query().resourceFilter(mResourceInstanceIdentifier).filter<Mail::Sent>(false));
+        QVERIFY(!mailInOutbox.identifier().isEmpty());
+        //Modify back to drafts
+        auto modifiedMail = mailInOutbox;
+        modifiedMail.setDraft(true);
+        VERIFYEXEC(Store::modify(modifiedMail));
+        VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
+        QTest::qWait(100);
+        auto mailsInOutbox = Store::read<ApplicationDomain::Mail>(Query().resourceFilter(mResourceInstanceIdentifier));
+        QCOMPARE(mailsInOutbox.size(), 0);
+        auto mailsInDrafts = Store::read<ApplicationDomain::Mail>(Query().resourceFilter(mStorageResource));
+        QCOMPARE(mailsInDrafts.size(), 1);
+    }
 };
diff --git a/sinksh/sinksh_utils.cpp b/sinksh/sinksh_utils.cpp
index 3bbffef..3a3484a 100644
--- a/sinksh/sinksh_utils.cpp
+++ b/sinksh/sinksh_utils.cpp
@@ -62,6 +62,10 @@ QList<QByteArray> requestedProperties(const QString &type)
                                  << Mail::Date::name;
    } else if (type == getTypeName<Event>()) {
        return QList<QByteArray>() << Event::Summary::name;
+    } else if (type == getTypeName<Contact>()) {
+        return QList<QByteArray>() << Contact::Fn::name << Contact::Emails::name << Contact::Addressbook::name;
+    } else if (type == getTypeName<Addressbook>()) {
+        return QList<QByteArray>() << Addressbook::Name::name << Addressbook::Parent::name;
    } else if (type == getTypeName<SinkResource>()) {
        return QList<QByteArray>() << SinkResource::ResourceType::name << SinkResource::Account::name << SinkResource::Capabilities::name;
    } else if (type == getTypeName<SinkAccount>()) {
diff --git a/sinksh/syntax_modules/sink_clear.cpp b/sinksh/syntax_modules/sink_clear.cpp
index 1537ecd..0f0f296 100644
--- a/sinksh/syntax_modules/sink_clear.cpp
+++ b/sinksh/syntax_modules/sink_clear.cpp
@@ -23,8 +23,6 @@
 #include "common/resource.h"
 #include "common/storage.h"
-#include "common/domain/event.h"
-#include "common/domain/folder.h"
 #include "common/resourceconfig.h"
 #include "common/log.h"
 #include "common/storage.h"
diff --git a/sinksh/syntax_modules/sink_count.cpp b/sinksh/syntax_modules/sink_count.cpp
index 5ab9ca5..9b6aa1e 100644
--- a/sinksh/syntax_modules/sink_count.cpp
+++ b/sinksh/syntax_modules/sink_count.cpp
@@ -25,8 +25,6 @@
 #include "common/resource.h"
 #include "common/storage.h"
-#include "common/domain/event.h"
-#include "common/domain/folder.h"
 #include "common/resourceconfig.h"
 #include "common/log.h"
 #include "common/storage.h"
diff --git a/sinksh/syntax_modules/sink_inspect.cpp b/sinksh/syntax_modules/sink_inspect.cpp
index 0d2ea00..a8a3805 100644
--- a/sinksh/syntax_modules/sink_inspect.cpp
+++ b/sinksh/syntax_modules/sink_inspect.cpp
@@ -24,8 +24,6 @@
 #include "common/resource.h"
 #include "common/storage.h"
-#include "common/domain/event.h"
-#include "common/domain/folder.h"
 #include "common/resourceconfig.h"
 #include "common/log.h"
 #include "common/storage.h"
diff --git a/sinksh/syntax_modules/sink_remove.cpp b/sinksh/syntax_modules/sink_remove.cpp
index 7e66ece..bbc1752 100644
--- a/sinksh/syntax_modules/sink_remove.cpp
+++ b/sinksh/syntax_modules/sink_remove.cpp
@@ -25,8 +25,6 @@
 #include "common/resource.h"
 #include "common/storage.h"
-#include "common/domain/event.h"
-#include "common/domain/folder.h"
 #include "common/resourceconfig.h"
 #include "common/log.h"
 #include "common/storage.h"
diff --git a/sinksh/syntax_modules/sink_show.cpp b/sinksh/syntax_modules/sink_show.cpp
index 8e3f715..391505a 100644
--- a/sinksh/syntax_modules/sink_show.cpp
+++ b/sinksh/syntax_modules/sink_show.cpp
@@ -26,8 +26,6 @@
 #include "common/resource.h"
 #include "common/storage.h"
-#include "common/domain/event.h"
-#include "common/domain/folder.h"
 #include "common/resourceconfig.h"
 #include "common/log.h"
 #include "common/storage.h"
diff --git a/sinksh/syntax_modules/sink_stat.cpp b/sinksh/syntax_modules/sink_stat.cpp
index 982d4cf..73b6ac4 100644
--- a/sinksh/syntax_modules/sink_stat.cpp
+++ b/sinksh/syntax_modules/sink_stat.cpp
@@ -24,8 +24,6 @@
 #include "common/resource.h"
 #include "common/storage.h"
-#include "common/domain/event.h"
-#include "common/domain/folder.h"
 #include "common/resourceconfig.h"
 #include "common/log.h"
 #include "common/storage.h"
diff --git a/sinksh/syntax_modules/sink_sync.cpp b/sinksh/syntax_modules/sink_sync.cpp
index 250cd75..ef84734 100644
--- a/sinksh/syntax_modules/sink_sync.cpp
+++ b/sinksh/syntax_modules/sink_sync.cpp
@@ -24,8 +24,6 @@
 #include "common/resource.h"
 #include "common/storage.h"
 #include "common/resourcecontrol.h"
-#include "common/domain/event.h"
-#include "common/domain/folder.h"
 #include "common/resourceconfig.h"
 #include "common/log.h"
 #include "common/storage.h"
@@ -51,7 +49,6 @@ bool sync(const QStringList &args, State &state)
        }
    }
-    QTimer::singleShot(0, [query, state]() {
    Sink::Store::synchronize(query)
        .then(Sink::ResourceControl::flushMessageQueue(query.getResourceFilter().ids))
        .then([state](const KAsync::Error &error) {
@@ -62,7 +59,6 @@ bool sync(const QStringList &args, State &state)
            }
            state.commandFinished();
        }).exec();
-    });
    return true;
 }
diff --git a/synchronizer/main.cpp b/synchronizer/main.cpp
index e6a4d56..c66a2fb 100644
--- a/synchronizer/main.cpp
+++ b/synchronizer/main.cpp
@@ -201,7 +201,7 @@ int main(int argc, char *argv[])
    SinkLog() << "Starting: " << instanceIdentifier << resourceType;
    QDir{}.mkpath(Sink::resourceStorageLocation(instanceIdentifier));
-    QLockFile lockfile(Sink::resourceStorageLocation(instanceIdentifier) + "/resource.lock");
+    QLockFile lockfile(Sink::storageLocation() + QString("/%1.lock").arg(QString(instanceIdentifier)));
    lockfile.setStaleLockTime(500);
    if (!lockfile.tryLock(0)) {
        const auto error = lockfile.error();
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index a69fcb3..c77a736 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -21,10 +21,8 @@ include(SinkTest)
 manual_tests (
    storagebenchmark
    dummyresourcebenchmark
-#     genericresourcebenchmark
    mailquerybenchmark
    pipelinebenchmark
-#     genericfacadebenchmark
 )
 auto_tests (
@@ -35,8 +33,6 @@ auto_tests (
    domainadaptortest
    messagequeuetest
    indextest
-    # genericresourcetest
-    # genericfacadetest
    resourcecommunicationtest
    pipelinetest
    querytest
@@ -48,6 +44,8 @@ auto_tests (
    testaccounttest
    dummyresourcemailtest
    interresourcemovetest
+    notificationtest
+    entitystoretest
 )
 generate_flatbuffers(dummyresourcetest calendar)
 target_link_libraries(dummyresourcetest sink_resource_dummy)
@@ -56,3 +54,4 @@ target_link_libraries(dummyresourcewritebenchmark sink_resource_dummy)
 target_link_libraries(querytest sink_resource_dummy)
 target_link_libraries(modelinteractivitytest sink_resource_dummy)
 target_link_libraries(inspectiontest sink_resource_dummy)
+target_link_libraries(notificationtest sink_resource_dummy)
diff --git a/tests/clientapitest.cpp b/tests/clientapitest.cpp
index da52afb..3955ebd 100644
--- a/tests/clientapitest.cpp
+++ b/tests/clientapitest.cpp
@@ -12,6 +12,12 @@
 #include "asyncutils.h"
 template <typename T>
+struct Result {
+    QSharedPointer<T> parent;
+    bool fetchedAll;
+};
+template <typename T>
 class TestDummyResourceFacade : public Sink::StoreFacade<T>
 {
 public:
@@ -68,7 +74,7 @@ public:
        auto emitter = resultProvider->emitter();
        resultProvider->setFetcher([query, resultProvider, this, ctx](const typename T::Ptr &parent) {
-            async::run<int>([=] {
+            async::run<Result<T>>([=] {
                if (parent) {
                    SinkTraceCtx(ctx) << "Running the fetcher " << parent->identifier();
                } else {
@@ -90,14 +96,16 @@ public:
                            SinkTraceCtx(ctx) << "Aborting early after " << count << "results.";
                            offset = i + 1;
                            bool fetchedAll = (i + 1 >= results.size());
-                            resultProvider->initialResultSetComplete(parent, fetchedAll);
+                            return Result<T>{parent, fetchedAll};
-                            return 0;
                        }
                    }
                }
-                resultProvider->initialResultSetComplete(parent, true);
+                return Result<T>{parent, true};
-                return 0;
+            }, runAsync)
-            }, runAsync).exec();
+            .then([=] (const Result<T> &r) {
+                resultProvider->initialResultSetComplete(r.parent, r.fetchedAll);
+            })
+            .exec();
        });
        auto job = KAsync::start([query, resultProvider]() {});
        mResultProvider = resultProvider.data();
diff --git a/tests/dummyresourcetest.cpp b/tests/dummyresourcetest.cpp
index eea63c0..17df160 100644
--- a/tests/dummyresourcetest.cpp
+++ b/tests/dummyresourcetest.cpp
@@ -136,12 +136,7 @@ private slots:
    void testResourceSync()
    {
        ::DummyResource resource(getContext());
-        auto job = resource.synchronizeWithSource(Sink::QueryBase());
+        VERIFYEXEC(resource.synchronizeWithSource(Sink::QueryBase()));
-        // TODO pass in optional timeout?
-        auto future = job.exec();
-        future.waitForFinished();
-        QVERIFY(!future.errorCode());
-        QVERIFY(future.isFinished());
        QVERIFY(!resource.error());
        auto processAllMessagesFuture = resource.processAllMessages().exec();
        processAllMessagesFuture.waitForFinished();
@@ -152,7 +147,7 @@ private slots:
        const auto query = Query().resourceFilter("sink.dummy.instance1");
        // Ensure all local data is processed
-        Sink::Store::synchronize(query).exec().waitForFinished();
+        VERIFYEXEC(Sink::Store::synchronize(query));
        VERIFYEXEC(Sink::ResourceControl::flushMessageQueue(QByteArrayList() << "sink.dummy.instance1"));
        auto model = Sink::Store::loadModel<Event>(query);
diff --git a/tests/entitystoretest.cpp b/tests/entitystoretest.cpp
new file mode 100644
index 0000000..90575a5
--- /dev/null
+++ b/tests/entitystoretest.cpp
@@ -0,0 +1,89 @@
+#include <QtTest>
+#include <QDebug>
+#include <QString>
+#include "common/storage/entitystore.h"
+#include "common/adaptorfactoryregistry.h"
+#include "common/definitions.h"
+#include "testimplementations.h"
+class EntityStoreTest : public QObject
+{
+    Q_OBJECT
+private:
+    QString resourceInstanceIdentifier{"resourceId"};
+private slots:
+    void initTestCase()
+    {
+        Sink::AdaptorFactoryRegistry::instance().registerFactory<Sink::ApplicationDomain::Mail, TestMailAdaptorFactory>("test");
+    }
+    void cleanup()
+    {
+        Sink::Storage::DataStore storage(Sink::storageLocation(), resourceInstanceIdentifier);
+        storage.removeFromDisk();
+    }
+    void testCleanup()
+    {
+    }
+    void readAll()
+    {
+        using namespace Sink;
+        ResourceContext resourceContext{resourceInstanceIdentifier.toUtf8(), "dummy", AdaptorFactoryRegistry::instance().getFactories("test")};
+        Storage::EntityStore store(resourceContext, {});
+        auto mail = ApplicationDomain::ApplicationDomainType::createEntity<ApplicationDomain::Mail>("res1");
+        mail.setExtractedMessageId("messageid");
+        mail.setExtractedSubject("boo");
+        auto mail2 = ApplicationDomain::ApplicationDomainType::createEntity<ApplicationDomain::Mail>("res1");
+        mail2.setExtractedMessageId("messageid2");
+        mail2.setExtractedSubject("foo");
+        auto mail3 = ApplicationDomain::ApplicationDomainType::createEntity<ApplicationDomain::Mail>("res1");
+        mail3.setExtractedMessageId("messageid2");
+        mail3.setExtractedSubject("foo");
+        store.startTransaction(Storage::DataStore::ReadWrite);
+        store.add("mail", mail, false);
+        store.add("mail", mail2, false);
+        store.add("mail", mail3, false);
+        mail.setExtractedSubject("foo");
+        store.modify("mail", mail, QByteArrayList{}, false);
+        store.remove("mail", mail3, false);
+        store.commitTransaction();
+        store.startTransaction(Storage::DataStore::ReadOnly);
+        {
+            //We get every uid once
+            QList<QByteArray> uids;
+            store.readAllUids("mail", [&] (const QByteArray &uid) {
+                uids << uid;
+            });
+            QCOMPARE(uids.size(), 2);
+        }
+        {
+            //We get the latest version of every entity once
+            QList<QByteArray> uids;
+            store.readAll("mail", [&] (const ApplicationDomain::ApplicationDomainType &entity) {
+                //The first revision should be superseeded by the modification
+                QCOMPARE(entity.getProperty(ApplicationDomain::Mail::Subject::name).toString(), QString::fromLatin1("foo"));
+                uids << entity.identifier();
+            });
+            QCOMPARE(uids.size(), 2);
+        }
+        store.abortTransaction();
+    }
+};
+QTEST_MAIN(EntityStoreTest)
+#include "entitystoretest.moc"
diff --git a/tests/genericfacadetest.cpp b/tests/genericfacadetest.cpp
deleted file mode 100644
index 0267dac..0000000
--- a/tests/genericfacadetest.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-#include <QtTest>
-#include <QString>
-#include "testimplementations.h"
-#include <common/facade.h>
-#include <common/domainadaptor.h>
-#include <common/resultprovider.h>
-#include <common/synclistresult.h>
-#include <common/test.h>
-// Replace with something different
-#include "event_generated.h"
-/**
- * Test for the generic facade implementation.
- *
- * This test doesn't use the actual storage and thus only tests the update logic of the facade.
- * //FIXME this now uses the actual storage
- */
-class GenericFacadeTest : public QObject
-{
-    Q_OBJECT
-private slots:
-    void initTestCase()
-    {
-        Sink::Test::initTest();
-    }
-    void testLoad()
-    {
-        Sink::Query query;
-        query.liveQuery = false;
-        auto resultSet = QSharedPointer<Sink::ResultProvider<Sink::ApplicationDomain::Event::Ptr>>::create();
-        auto resourceAccess = QSharedPointer<TestResourceAccess>::create();
-        // storage->mResults << Sink::ApplicationDomain::Event::Ptr::create();
-        TestResourceFacade facade("identifier", resourceAccess);
-        async::SyncListResult<Sink::ApplicationDomain::Event::Ptr> result(resultSet->emitter());
-        facade.load(query, *resultSet).exec().waitForFinished();
-        resultSet->initialResultSetComplete();
-        // We have to wait for the events that deliver the results to be processed by the eventloop
-        result.exec();
-        QCOMPARE(result.size(), 1);
-    }
-    void testLiveQuery()
-    {
-        Sink::Query query;
-        query.liveQuery = true;
-        auto resultSet = QSharedPointer<Sink::ResultProvider<Sink::ApplicationDomain::Event::Ptr>>::create();
-        auto resourceAccess = QSharedPointer<TestResourceAccess>::create();
-        // storage->mResults << Sink::ApplicationDomain::Event::Ptr::create();
-        TestResourceFacade facade("identifier", resourceAccess);
-        async::SyncListResult<Sink::ApplicationDomain::Event::Ptr> result(resultSet->emitter());
-        facade.load(query, *resultSet).exec().waitForFinished();
-        resultSet->initialResultSetComplete();
-        result.exec();
-        QCOMPARE(result.size(), 1);
-        // Enter a second result
-        // storage->mResults.clear();
-        // storage->mResults << QSharedPointer<Sink::ApplicationDomain::Event>::create("resource", "id2", 0, QSharedPointer<Sink::ApplicationDomain::BufferAdaptor>());
-        // storage->mLatestRevision = 2;
-        resourceAccess->emit revisionChanged(2);
-        // Hack to get event loop in synclistresult to abort again
-        resultSet->initialResultSetComplete();
-        result.exec();
-        QCOMPARE(result.size(), 2);
-    }
-    void testLiveQueryModify()
-    {
-        Sink::Query query;
-        query.liveQuery = true;
-        auto resultSet = QSharedPointer<Sink::ResultProvider<Sink::ApplicationDomain::Event::Ptr>>::create();
-        auto resourceAccess = QSharedPointer<TestResourceAccess>::create();
-        auto entity = QSharedPointer<Sink::ApplicationDomain::Event>::create("resource", "id2", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
-        entity->setProperty("test", "test1");
-        // storage->mResults << entity;
-        TestResourceFacade facade("identifier", resourceAccess);
-        async::SyncListResult<Sink::ApplicationDomain::Event::Ptr> result(resultSet->emitter());
-        facade.load(query, *resultSet).exec().waitForFinished();
-        resultSet->initialResultSetComplete();
-        result.exec();
-        QCOMPARE(result.size(), 1);
-        // Modify the entity again
-        // storage->mResults.clear();
-        entity = QSharedPointer<Sink::ApplicationDomain::Event>::create("resource", "id2", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
-        entity->setProperty("test", "test2");
-        // storage->mModifications << entity;
-        // storage->mLatestRevision = 2;
-        resourceAccess->emit revisionChanged(2);
-        // Hack to get event loop in synclistresult to abort again
-        resultSet->initialResultSetComplete();
-        result.exec();
-        QCOMPARE(result.size(), 1);
-        QCOMPARE(result.first()->getProperty("test").toByteArray(), QByteArray("test2"));
-    }
-    void testLiveQueryRemove()
-    {
-        Sink::Query query;
-        query.liveQuery = true;
-        auto resultSet = QSharedPointer<Sink::ResultProvider<Sink::ApplicationDomain::Event::Ptr>>::create();
-        auto resourceAccess = QSharedPointer<TestResourceAccess>::create();
-        auto entity = QSharedPointer<Sink::ApplicationDomain::Event>::create("resource", "id2", 0, QSharedPointer<Sink::ApplicationDomain::BufferAdaptor>());
-        // storage->mResults << entity;
-        TestResourceFacade facade("identifier", resourceAccess);
-        async::SyncListResult<Sink::ApplicationDomain::Event::Ptr> result(resultSet->emitter());
-        facade.load(query, *resultSet).exec().waitForFinished();
-        resultSet->initialResultSetComplete();
-        result.exec();
-        QCOMPARE(result.size(), 1);
-        // Remove the entity again
-        // storage->mResults.clear();
-        // storage->mRemovals << entity;
-        // storage->mLatestRevision = 2;
-        resourceAccess->emit revisionChanged(2);
-        // Hack to get event loop in synclistresult to abort again
-        resultSet->initialResultSetComplete();
-        result.exec();
-        QCOMPARE(result.size(), 0);
-    }
-};
-QTEST_MAIN(GenericFacadeTest)
-#include "genericfacadetest.moc"
diff --git a/tests/genericresourcebenchmark.cpp b/tests/genericresourcebenchmark.cpp
deleted file mode 100644
index 2315d0b..0000000
--- a/tests/genericresourcebenchmark.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-#include <QtTest>
-#include <QString>
-#include "testimplementations.h"
-#include "event_generated.h"
-#include "createentity_generated.h"
-#include "commands.h"
-#include "entitybuffer.h"
-#include "pipeline.h"
-#include "genericresource.h"
-#include "definitions.h"
-#include "domainadaptor.h"
-#include "index.h"
-#include "hawd/dataset.h"
-#include "hawd/formatter.h"
-static void removeFromDisk(const QString &name)
-{
-    Sink::Storage store(Sink::storageLocation(), name, Sink::Storage::ReadWrite);
-    store.removeFromDisk();
-}
-static QByteArray createEntityBuffer()
-{
-    flatbuffers::FlatBufferBuilder eventFbb;
-    eventFbb.Clear();
-    {
-        auto summary = eventFbb.CreateString("summary");
-        Sink::ApplicationDomain::Buffer::EventBuilder eventBuilder(eventFbb);
-        eventBuilder.add_summary(summary);
-        auto eventLocation = eventBuilder.Finish();
-        Sink::ApplicationDomain::Buffer::FinishEventBuffer(eventFbb, eventLocation);
-    }
-    flatbuffers::FlatBufferBuilder localFbb;
-    {
-        auto uid = localFbb.CreateString("testuid");
-        auto localBuilder = Sink::ApplicationDomain::Buffer::EventBuilder(localFbb);
-        localBuilder.add_uid(uid);
-        auto location = localBuilder.Finish();
-        Sink::ApplicationDomain::Buffer::FinishEventBuffer(localFbb, location);
-    }
-    flatbuffers::FlatBufferBuilder entityFbb;
-    Sink::EntityBuffer::assembleEntityBuffer(entityFbb, 0, 0, eventFbb.GetBufferPointer(), eventFbb.GetSize(), localFbb.GetBufferPointer(), localFbb.GetSize());
-    flatbuffers::FlatBufferBuilder fbb;
-    auto type = fbb.CreateString(Sink::ApplicationDomain::getTypeName<Sink::ApplicationDomain::Event>().toStdString().data());
-    auto delta = fbb.CreateVector<uint8_t>(entityFbb.GetBufferPointer(), entityFbb.GetSize());
-    Sink::Commands::CreateEntityBuilder builder(fbb);
-    builder.add_domainType(type);
-    builder.add_delta(delta);
-    auto location = builder.Finish();
-    Sink::Commands::FinishCreateEntityBuffer(fbb, location);
-    return QByteArray(reinterpret_cast<const char *>(fbb.GetBufferPointer()), fbb.GetSize());
-}
-class IndexUpdater : public Sink::Preprocessor
-{
-public:
-    void newEntity(const QByteArray &uid, qint64 revision, const Sink::ApplicationDomain::BufferAdaptor &newEntity, Sink::Storage::Transaction &transaction) Q_DECL_OVERRIDE
-    {
-        for (int i = 0; i < 10; i++) {
-            Index ridIndex(QString("index.index%1").arg(i).toLatin1(), transaction);
-            ridIndex.add("foo", uid);
-        }
-    }
-    void modifiedEntity(const QByteArray &key, qint64 revision, const Sink::ApplicationDomain::BufferAdaptor &oldEntity, const Sink::ApplicationDomain::BufferAdaptor &newEntity,
-        Sink::Storage::Transaction &transaction) Q_DECL_OVERRIDE
-    {
-    }
-    void deletedEntity(const QByteArray &key, qint64 revision, const Sink::ApplicationDomain::BufferAdaptor &oldEntity, Sink::Storage::Transaction &transaction) Q_DECL_OVERRIDE
-    {
-    }
-};
-/**
- * Benchmark write performance of generic resource implementation including queues and pipeline.
- */
-class GenericResourceBenchmark : public QObject
-{
-    Q_OBJECT
-private slots:
-    void init()
-    {
-        Sink::Log::setDebugOutputLevel(Sink::Log::Warning);
-    }
-    void initTestCase()
-    {
-        removeFromDisk("sink.test.instance1");
-        removeFromDisk("sink.test.instance1.userqueue");
-        removeFromDisk("sink.test.instance1.synchronizerqueue");
-    }
-    void testWriteInProcess()
-    {
-        int num = 10000;
-        auto pipeline = QSharedPointer<Sink::Pipeline>::create("sink.test.instance1");
-        TestResource resource("sink.test.instance1", pipeline);
-        auto command = createEntityBuffer();
-        QTime time;
-        time.start();
-        for (int i = 0; i < num; i++) {
-            resource.processCommand(Sink::Commands::CreateEntityCommand, command);
-        }
-        auto appendTime = time.elapsed();
-        // Wait until all messages have been processed
-        resource.processAllMessages().exec().waitForFinished();
-        auto allProcessedTime = time.elapsed();
-        // Print memory layout, RSS is what is in memory
-        // std::system("exec pmap -x \"$PPID\"");
-        HAWD::Dataset dataset("generic_write_in_process", m_hawdState);
-        HAWD::Dataset::Row row = dataset.row();
-        row.setValue("rows", num);
-        row.setValue("append", (qreal)num / appendTime);
-        row.setValue("total", (qreal)num / allProcessedTime);
-        dataset.insertRow(row);
-        HAWD::Formatter::print(dataset);
-    }
-    void testWriteInProcessWithIndex()
-    {
-        int num = 50000;
-        auto pipeline = QSharedPointer<Sink::Pipeline>::create("sink.test.instance1");
-        auto eventFactory = QSharedPointer<TestEventAdaptorFactory>::create();
-        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("sink.test.instance1", pipeline);
-        auto command = createEntityBuffer();
-        QTime time;
-        time.start();
-        for (int i = 0; i < num; i++) {
-            resource.processCommand(Sink::Commands::CreateEntityCommand, command);
-        }
-        auto appendTime = time.elapsed();
-        // Wait until all messages have been processed
-        resource.processAllMessages().exec().waitForFinished();
-        auto allProcessedTime = time.elapsed();
-        // Print memory layout, RSS is what is in memory
-        // std::system("exec pmap -x \"$PPID\"");
-        HAWD::Dataset dataset("generic_write_in_process_with_indexes", m_hawdState);
-        HAWD::Dataset::Row row = dataset.row();
-        row.setValue("rows", num);
-        row.setValue("append", (qreal)num / appendTime);
-        row.setValue("total", (qreal)num / allProcessedTime);
-        dataset.insertRow(row);
-        HAWD::Formatter::print(dataset);
-    }
-    void testCreateCommand()
-    {
-        Sink::ApplicationDomain::Event event;
-        QBENCHMARK {
-            auto mFactory = new TestEventAdaptorFactory;
-            static flatbuffers::FlatBufferBuilder entityFbb;
-            entityFbb.Clear();
-            mFactory->createBuffer(event, entityFbb);
-            static flatbuffers::FlatBufferBuilder fbb;
-            fbb.Clear();
-            // This is the resource buffer type and not the domain type
-            auto type = fbb.CreateString("event");
-            // auto delta = fbb.CreateVector<uint8_t>(entityFbb.GetBufferPointer(), entityFbb.GetSize());
-            auto delta = Sink::EntityBuffer::appendAsVector(fbb, entityFbb.GetBufferPointer(), entityFbb.GetSize());
-            auto location = Sink::Commands::CreateCreateEntity(fbb, type, delta);
-            Sink::Commands::FinishCreateEntityBuffer(fbb, location);
-        }
-    }
-private:
-    HAWD::State m_hawdState;
-};
-QTEST_MAIN(GenericResourceBenchmark)
-#include "genericresourcebenchmark.moc"
diff --git a/tests/genericresourcetest.cpp b/tests/genericresourcetest.cpp
deleted file mode 100644
index 77a901d..0000000
--- a/tests/genericresourcetest.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-#include <QtTest>
-#include <QString>
-#include "testimplementations.h"
-#include "event_generated.h"
-#include "entity_generated.h"
-#include "metadata_generated.h"
-#include "createentity_generated.h"
-#include "commands.h"
-#include "entitybuffer.h"
-#include "pipeline.h"
-#include "genericresource.h"
-#include "definitions.h"
-/**
- * Test of the generic resource implementation.
- *
- * This test relies on a working pipeline implementation, and writes to storage.
- */
-class GenericResourceTest : public QObject
-{
-    Q_OBJECT
-private slots:
-    void init()
-    {
-        Sink::GenericResource::removeFromDisk("sink.test.instance1");
-    }
-    /// Ensure the resource can process messages
-    void testProcessCommand()
-    {
-        flatbuffers::FlatBufferBuilder eventFbb;
-        eventFbb.Clear();
-        {
-            auto summary = eventFbb.CreateString("summary");
-            Sink::ApplicationDomain::Buffer::EventBuilder eventBuilder(eventFbb);
-            eventBuilder.add_summary(summary);
-            auto eventLocation = eventBuilder.Finish();
-            Sink::ApplicationDomain::Buffer::FinishEventBuffer(eventFbb, eventLocation);
-        }
-        flatbuffers::FlatBufferBuilder localFbb;
-        {
-            auto uid = localFbb.CreateString("testuid");
-            auto localBuilder = Sink::ApplicationDomain::Buffer::EventBuilder(localFbb);
-            localBuilder.add_uid(uid);
-            auto location = localBuilder.Finish();
-            Sink::ApplicationDomain::Buffer::FinishEventBuffer(localFbb, location);
-        }
-        flatbuffers::FlatBufferBuilder entityFbb;
-        Sink::EntityBuffer::assembleEntityBuffer(entityFbb, 0, 0, eventFbb.GetBufferPointer(), eventFbb.GetSize(), localFbb.GetBufferPointer(), localFbb.GetSize());
-        flatbuffers::FlatBufferBuilder fbb;
-        auto type = fbb.CreateString(Sink::ApplicationDomain::getTypeName<Sink::ApplicationDomain::Event>().toStdString().data());
-        auto delta = fbb.CreateVector<uint8_t>(entityFbb.GetBufferPointer(), entityFbb.GetSize());
-        Sink::Commands::CreateEntityBuilder builder(fbb);
-        builder.add_domainType(type);
-        builder.add_delta(delta);
-        auto location = builder.Finish();
-        Sink::Commands::FinishCreateEntityBuffer(fbb, location);
-        const QByteArray command(reinterpret_cast<const char *>(fbb.GetBufferPointer()), fbb.GetSize());
-        {
-            flatbuffers::Verifier verifyer(reinterpret_cast<const uint8_t *>(command.data()), command.size());
-            QVERIFY(Sink::Commands::VerifyCreateEntityBuffer(verifyer));
-        }
-        // Actual test
-        auto pipeline = QSharedPointer<Sink::Pipeline>::create("sink.test.instance1");
-        QSignalSpy revisionSpy(pipeline.data(), SIGNAL(revisionUpdated(qint64)));
-        QVERIFY(revisionSpy.isValid());
-        TestResource resource("sink.test.instance1", pipeline);
-        resource.processCommand(Sink::Commands::CreateEntityCommand, command);
-        resource.processCommand(Sink::Commands::CreateEntityCommand, command);
-        resource.processAllMessages().exec().waitForFinished();
-        QCOMPARE(revisionSpy.last().at(0).toInt(), 2);
-    }
-};
-QTEST_MAIN(GenericResourceTest)
-#include "genericresourcetest.moc"
diff --git a/tests/hawd/CMakeLists.txt b/tests/hawd/CMakeLists.txt
index b3de83e..6ae5f13 100644
--- a/tests/hawd/CMakeLists.txt
+++ b/tests/hawd/CMakeLists.txt
@@ -1,6 +1,7 @@
 project(hawd)
-find_package(Libgit2)
+#We require git_buf_free function
+find_package(Libgit2 0.20.0)
 if (LIBGIT2_FOUND)
    add_definitions(-DHAVE_LIBGIT2)
diff --git a/tests/hawd/state.cpp b/tests/hawd/state.cpp
index dbfe019..dfeef41 100644
--- a/tests/hawd/state.cpp
+++ b/tests/hawd/state.cpp
@@ -116,6 +116,7 @@ const char *State::commitHash() const
 void State::findGitHash()
 {
 #ifdef HAVE_LIBGIT2
+    git_libgit2_init();
    git_buf root = {0};
    int error = git_repository_discover(&root, projectPath().toStdString().data(), 0, NULL);
    if (!error) {
@@ -133,6 +134,7 @@ void State::findGitHash()
        git_repository_free(repo);
    }
    git_buf_free(&root);
+    git_libgit2_shutdown();
 #endif
 }
diff --git a/tests/interresourcemovetest.cpp b/tests/interresourcemovetest.cpp
index 7561c5b..3ac6ad4 100644
--- a/tests/interresourcemovetest.cpp
+++ b/tests/interresourcemovetest.cpp
@@ -28,6 +28,7 @@
 #include "log.h"
 #include "test.h"
 #include "testutils.h"
+#include <KMime/Message>
 using namespace Sink;
 using namespace Sink::ApplicationDomain;
@@ -41,6 +42,15 @@ class InterResourceMoveTest : public QObject
 {
    Q_OBJECT
+    QByteArray message(const QByteArray &uid, const QString &subject)
+    {
+        KMime::Message m;
+        m.subject(true)->fromUnicodeString(subject, "utf8");
+        m.messageID(true)->setIdentifier(uid);
+        m.assemble();
+        return m.encodedContent();
+    }
 private slots:
    void initTestCase()
    {
@@ -65,24 +75,25 @@ private slots:
    void testMove()
    {
-        Event event("instance1");
+        QByteArray testuid = "testuid@test.test";
-        event.setProperty("uid", "testuid");
+        QString subject = "summaryValue";
-        QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid"));
+        auto mimeMessage = message(testuid, subject);
-        event.setProperty("summary", "summaryValue");
-        VERIFYEXEC(Sink::Store::create<Event>(event));
+        Mail mail("instance1");
+        mail.setMimeMessage(mimeMessage);
+        VERIFYEXEC(Sink::Store::create<Mail>(mail));
-        Event createdEvent;
+        Mail createdmail;
        // Ensure all local data is processed
        VERIFYEXEC(Sink::ResourceControl::flushMessageQueue(QByteArrayList() << "instance1"));
        {
            auto query = Query().resourceFilter("instance1") ;
-            auto list = Sink::Store::read<Event>(query.filter<Event::Uid>("testuid"));
+            auto list = Sink::Store::read<Mail>(query.filter<Mail::MessageId>(testuid));
            QCOMPARE(list.size(), 1);
-            createdEvent = list.first();
+            createdmail = list.first();
        }
-        VERIFYEXEC(Sink::Store::move<Event>(createdEvent, "instance2"));
+        VERIFYEXEC(Sink::Store::move<Mail>(createdmail, "instance2"));
        //FIXME we can't guarantee that that the create command arrives at instance2 before the flush command, so we'll just wait for a little bit.
        QTest::qWait(1000);
@@ -92,14 +103,18 @@ private slots:
        VERIFYEXEC(Sink::ResourceControl::flushMessageQueue(QByteArrayList() << "instance2"));
        {
            auto query = Query().resourceFilter("instance2") ;
-            auto list = Sink::Store::read<Event>(query.filter<Event::Uid>("testuid"));
+            auto list = Sink::Store::read<Mail>(query.filter<Mail::MessageId>(testuid));
            QCOMPARE(list.size(), 1);
+            const auto mail = list.first();
+            QVERIFY(!mail.getMimeMessagePath().isEmpty());
+            QCOMPARE(mail.getSubject(), subject);
+            QCOMPARE(mail.getMimeMessage(), mimeMessage);
        }
        VERIFYEXEC(Sink::ResourceControl::flushMessageQueue(QByteArrayList() << "instance1"));
        {
            auto query = Query().resourceFilter("instance1") ;
-            auto list = Sink::Store::read<Event>(query.filter<Event::Uid>("testuid"));
+            auto list = Sink::Store::read<Mail>(query.filter<Mail::MessageId>(testuid));
            QCOMPARE(list.size(), 0);
        }
    }
diff --git a/tests/mailquerybenchmark.cpp b/tests/mailquerybenchmark.cpp
index d68151a..b15c8d6 100644
--- a/tests/mailquerybenchmark.cpp
+++ b/tests/mailquerybenchmark.cpp
@@ -23,16 +23,10 @@
 #include "testimplementations.h"
-#include <common/facade.h>
-#include <common/domainadaptor.h>
 #include <common/resultprovider.h>
-#include <common/synclistresult.h>
 #include <common/definitions.h>
 #include <common/query.h>
-#include <common/store.h>
+#include <common/storage/entitystore.h>
-#include <common/pipeline.h>
-#include <common/index.h>
-#include <common/adaptorfactoryregistry.h>
 #include "hawd/dataset.h"
 #include "hawd/formatter.h"
@@ -57,30 +51,34 @@ class MailQueryBenchmark : public QObject
    QByteArray resourceIdentifier;
    HAWD::State mHawdState;
-    void populateDatabase(int count)
+    void populateDatabase(int count, int folderSpreadFactor = 0)
    {
        TestResource::removeFromDisk(resourceIdentifier);
-        auto pipeline = QSharedPointer<Sink::Pipeline>::create(Sink::ResourceContext{resourceIdentifier, "test"}, "test");
+        Sink::ResourceContext resourceContext{resourceIdentifier, "test", {{"mail", QSharedPointer<TestMailAdaptorFactory>::create()}}};
+        Sink::Storage::EntityStore entityStore{resourceContext, {}};
+        entityStore.startTransaction(Sink::Storage::DataStore::ReadWrite);
-        auto domainTypeAdaptorFactory = QSharedPointer<TestMailAdaptorFactory>::create();
-        pipeline->startTransaction();
        const auto date = QDateTime::currentDateTimeUtc();
        for (int i = 0; i < count; i++) {
-            auto domainObject = Mail::Ptr::create();
+            auto domainObject = Mail::createEntity<Mail>(resourceIdentifier);
-            domainObject->setExtractedMessageId("uid");
+            domainObject.setExtractedMessageId("uid");
-            domainObject->setExtractedSubject(QString("subject%1").arg(i));
+            domainObject.setExtractedParentMessageId("parentuid");
-            domainObject->setExtractedDate(date.addSecs(count));
+            domainObject.setExtractedSubject(QString("subject%1").arg(i));
-            domainObject->setFolder("folder1");
+            domainObject.setExtractedDate(date.addSecs(count));
-            // domainObject->setAttachment(attachment);
+            if (folderSpreadFactor == 0) {
-            const auto command = createCommand<Mail>(*domainObject, *domainTypeAdaptorFactory);
+                domainObject.setFolder("folder1");
-            pipeline->newEntity(command.data(), command.size());
+            } else {
+                domainObject.setFolder(QByteArray("folder") + QByteArray::number(i - (i % folderSpreadFactor)));
+            }
+            entityStore.add("mail", domainObject, false);
        }
-        pipeline->commit();
+        entityStore.commitTransaction();
    }
-    void testLoad(const Sink::Query &query, int count)
+    void testLoad(const Sink::Query &query, int count, int expectedSize)
    {
        const auto startingRss = getCurrentRSS();
@@ -88,7 +86,10 @@ class MailQueryBenchmark : public QObject
        QTime time;
        time.start();
        auto resultSet = QSharedPointer<Sink::ResultProvider<Mail::Ptr>>::create();
-        Sink::ResourceContext context{resourceIdentifier, "test"};
+        //FIXME why do we need this here?
+        auto domainTypeAdaptorFactory = QSharedPointer<TestMailAdaptorFactory>::create();
+        Sink::ResourceContext context{resourceIdentifier, "test", {{"mail", domainTypeAdaptorFactory}}};
        context.mResourceAccess = QSharedPointer<TestResourceAccess>::create();
        TestMailResourceFacade facade(context);
@@ -101,7 +102,7 @@ class MailQueryBenchmark : public QObject
        emitter->onInitialResultSetComplete([&done](const Mail::Ptr &mail, bool) { done = true; });
        emitter->fetch(Mail::Ptr());
        QTRY_VERIFY(done);
-        QCOMPARE(list.size(), query.limit());
+        QCOMPARE(list.size(), expectedSize);
        const auto elapsed = time.elapsed();
@@ -145,7 +146,6 @@ private slots:
    void init()
    {
        resourceIdentifier = "sink.test.instance1";
-        Sink::AdaptorFactoryRegistry::instance().registerFactory<Mail, TestMailAdaptorFactory>("test");
    }
    void test50k()
@@ -159,7 +159,24 @@ private slots:
        query.limit(1000);
        populateDatabase(50000);
-        testLoad(query, 50000);
+        testLoad(query, 50000, query.limit());
+    }
+    void test50kThreadleader()
+    {
+        Sink::Query query;
+        query.request<Mail::MessageId>()
+             .request<Mail::Subject>()
+             .request<Mail::Date>();
+        // query.filter<ApplicationDomain::Mail::Trash>(false);
+        query.reduce<ApplicationDomain::Mail::Folder>(Query::Reduce::Selector::max<ApplicationDomain::Mail::Date>());
+        query.limit(1000);
+        int mailsPerFolder = 10;
+        int count = 50000;
+        populateDatabase(count, mailsPerFolder);
+        testLoad(query, count, query.limit());
    }
 };
diff --git a/tests/mailsynctest.cpp b/tests/mailsynctest.cpp
index 3e5a928..c8ba9f1 100644
--- a/tests/mailsynctest.cpp
+++ b/tests/mailsynctest.cpp
@@ -411,6 +411,43 @@ void MailSyncTest::testSyncSingleFolder()
 }
+void MailSyncTest::testSyncSingleMail()
+{
+    VERIFYEXEC(Store::synchronize(Sink::SyncScope{}.resourceFilter(mResourceInstanceIdentifier)));
+    VERIFYEXEC(ResourceControl::flushMessageQueue(mResourceInstanceIdentifier));
+    Mail::Ptr mail;
+    {
+        auto job = Store::fetchAll<Mail>(Sink::Query{}.resourceFilter(mResourceInstanceIdentifier)).template then([&](const QList<Mail::Ptr> &mails) {
+            QVERIFY(mails.size() >= 1);
+            mail = mails.first();
+        });
+        VERIFYEXEC(job);
+    }
+    auto syncScope = Sink::SyncScope{ApplicationDomain::getTypeName<Mail>()};
+    syncScope.resourceFilter(mResourceInstanceIdentifier);
+    syncScope.filter(mail->identifier());
+    // Ensure all local data is processed
+    VERIFYEXEC(Store::synchronize(syncScope));
+    VERIFYEXEC(ResourceControl::flushMessageQueue(mResourceInstanceIdentifier));
+}
+void MailSyncTest::testSyncSingleMailWithBogusId()
+{
+    VERIFYEXEC(Store::synchronize(Sink::SyncScope{}.resourceFilter(mResourceInstanceIdentifier)));
+    VERIFYEXEC(ResourceControl::flushMessageQueue(mResourceInstanceIdentifier));
+    auto syncScope = Sink::SyncScope{ApplicationDomain::getTypeName<Mail>()};
+    syncScope.resourceFilter(mResourceInstanceIdentifier);
+    syncScope.filter("WTFisThisEven?");
+    // Ensure all local data is processed
+    VERIFYEXEC(Store::synchronize(syncScope));
+    VERIFYEXEC(ResourceControl::flushMessageQueue(mResourceInstanceIdentifier));
+}
 void MailSyncTest::testFailingSync()
 {
    auto resource = createFaultyResource();
diff --git a/tests/mailsynctest.h b/tests/mailsynctest.h
index 8ad3bb3..0decf00 100644
--- a/tests/mailsynctest.h
+++ b/tests/mailsynctest.h
@@ -70,6 +70,8 @@ private slots:
    void testFlagChange();
    void testSyncSingleFolder();
+    void testSyncSingleMail();
+    void testSyncSingleMailWithBogusId();
    void testFailingSync();
 };
diff --git a/tests/modelinteractivitytest.cpp b/tests/modelinteractivitytest.cpp
index 5231c1a..caa9ca2 100644
--- a/tests/modelinteractivitytest.cpp
+++ b/tests/modelinteractivitytest.cpp
@@ -70,9 +70,9 @@ private slots:
    {
        // Setup
        {
-            Sink::ApplicationDomain::Mail mail("sink.dummy.instance1");
+            Sink::ApplicationDomain::Event event("sink.dummy.instance1");
            for (int i = 0; i < 1000; i++) {
-                Sink::Store::create<Sink::ApplicationDomain::Mail>(mail).exec().waitForFinished();
+                Sink::Store::create<Sink::ApplicationDomain::Event>(event).exec().waitForFinished();
            }
        }
@@ -85,7 +85,7 @@ private slots:
        // Test
        QTime time;
        time.start();
-        auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Mail>(query);
+        auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Event>(query);
        blockingTime += time.elapsed();
        QTRY_VERIFY(model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
        // Never block longer than 10 ms
diff --git a/tests/notificationtest.cpp b/tests/notificationtest.cpp
new file mode 100644
index 0000000..a34d325
--- /dev/null
+++ b/tests/notificationtest.cpp
@@ -0,0 +1,132 @@
+#include <QtTest>
+#include <QString>
+#include <QSignalSpy>
+#include "store.h"
+#include "resourceconfig.h"
+#include "resourcecontrol.h"
+#include "modelresult.h"
+#include "log.h"
+#include "test.h"
+#include "testutils.h"
+#include "notifier.h"
+#include "notification.h"
+using namespace Sink;
+using namespace Sink::ApplicationDomain;
+/**
+ * Test of complete system using the dummy resource.
+ *
+ * This test requires the dummy resource installed.
+ */
+class NotificationTest : public QObject
+{
+    Q_OBJECT
+private slots:
+    void initTestCase()
+    {
+        Sink::Test::initTest();
+        ResourceConfig::addResource("sink.dummy.instance1", "sink.dummy");
+    }
+    void cleanup()
+    {
+        VERIFYEXEC(Sink::Store::removeDataFromDisk("sink.dummy.instance1"));
+    }
+    void testSyncNotifications()
+    {
+        auto query = Query().resourceFilter("sink.dummy.instance1");
+        query.setType<ApplicationDomain::Mail>();
+        query.filter("id1");
+        query.filter("id2");
+        QList<Sink::Notification> statusNotifications;
+        QList<Sink::Notification> infoNotifications;
+        Sink::Notifier notifier("sink.dummy.instance1");
+        notifier.registerHandler([&] (const Sink::Notification &n){
+            SinkLogCtx(Sink::Log::Context{"dummyresourcetest"}) << "Received notification " << n;
+            if (n.type == Notification::Status) {
+                if (n.id == "changereplay") {
+                    //We filter all changereplay notifications.
+                    //Not the best way but otherwise the test becomes unstable and we currently
+                    //only have the id to detect changereplay notifications.
+                    return;
+                }
+                statusNotifications << n;
+            }
+            if (n.type == Notification::Info) {
+                infoNotifications << n;
+            }
+        });
+        // Ensure all local data is processed
+        VERIFYEXEC(Sink::Store::synchronize(query));
+        VERIFYEXEC(Sink::ResourceControl::flushMessageQueue(QByteArrayList() << "sink.dummy.instance1"));
+        QVERIFY(statusNotifications.size() <= 3);
+        QTRY_COMPARE(statusNotifications.size(), 3);
+        //Sync
+        QCOMPARE(statusNotifications.at(0).code, static_cast<int>(ApplicationDomain::Status::ConnectedStatus));
+        QCOMPARE(statusNotifications.at(1).code, static_cast<int>(ApplicationDomain::Status::BusyStatus));
+        QCOMPARE(statusNotifications.at(2).code, static_cast<int>(ApplicationDomain::Status::ConnectedStatus));
+        //Changereplay
+        // It can happen that we get a changereplay notification pair first and then a second one at the end,
+        // we therefore currently filter all changereplay notifications (see above).
+        // QCOMPARE(statusNotifications.at(3).code, static_cast<int>(Sink::ApplicationDomain::Status::BusyStatus));
+        // QCOMPARE(statusNotifications.at(4).code, static_cast<int>(Sink::ApplicationDomain::Status::ConnectedStatus));
+        QTRY_COMPARE(infoNotifications.size(), 2);
+        QCOMPARE(infoNotifications.at(0).code, static_cast<int>(ApplicationDomain::SyncStatus::SyncInProgress));
+        QCOMPARE(infoNotifications.at(0).entities, QList<QByteArray>{} << "id1" << "id2");
+        QCOMPARE(infoNotifications.at(1).code, static_cast<int>(ApplicationDomain::SyncStatus::SyncSuccess));
+        QCOMPARE(infoNotifications.at(1).entities, QList<QByteArray>{} << "id1" << "id2");
+        QCOMPARE(infoNotifications.at(1).code, static_cast<int>(ApplicationDomain::SyncStatus::SyncSuccess));
+    }
+    void testModelNotifications()
+    {
+        auto query = Query().resourceFilter("sink.dummy.instance1");
+        query.setType<ApplicationDomain::Mail>();
+        query.setFlags(Query::LiveQuery | Query::UpdateStatus);
+        VERIFYEXEC(Sink::Store::synchronize(query));
+        VERIFYEXEC(Sink::ResourceControl::flushMessageQueue(QByteArrayList() << "sink.dummy.instance1"));
+        auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Mail>(query);
+        QTRY_VERIFY(model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
+        QVERIFY(model->rowCount() >= 1);
+        QSignalSpy changedSpy(model.data(), &QAbstractItemModel::dataChanged);
+        auto mail = model->index(0, 0, QModelIndex()).data(Sink::Store::DomainObjectRole).value<Mail::Ptr>();
+        auto newQuery = query;
+        newQuery.filter(mail->identifier());
+        QList<int> status;
+        QObject::connect(model.data(), &QAbstractItemModel::dataChanged, [&] (const QModelIndex &begin, const QModelIndex &end, const QVector<int> &roles) {
+            QVERIFY(begin.row() == end.row());
+            if (begin.row() == 0) {
+                status << model->data(begin, Store::StatusRole).value<int>();
+                // qWarning() << "New status: " << status.last() << roles;
+            }
+        });
+        //This will trigger a modification of all previous items as well.
+        VERIFYEXEC(Sink::Store::synchronize(newQuery));
+        VERIFYEXEC(Sink::ResourceControl::flushMessageQueue(QByteArrayList() << "sink.dummy.instance1"));
+        QCOMPARE(status.size(), 3);
+        //Sync progress of item
+        QCOMPARE(status.at(0), static_cast<int>(ApplicationDomain::SyncStatus::SyncInProgress));
+        QCOMPARE(status.at(1), static_cast<int>(ApplicationDomain::SyncStatus::SyncSuccess));
+        //Modification triggered during sync
+        QCOMPARE(status.at(2), static_cast<int>(ApplicationDomain::SyncStatus::SyncSuccess));
+    }
+};
+QTEST_MAIN(NotificationTest)
+#include "notificationtest.moc"
diff --git a/tests/querytest.cpp b/tests/querytest.cpp
index bd3b927..f639d94 100644
--- a/tests/querytest.cpp
+++ b/tests/querytest.cpp
@@ -1042,6 +1042,71 @@ private slots:
        QCOMPARE(layoutChangedSpy.size(), 0);
        QCOMPARE(resetSpy.size(), 0);
    }
+    /*
+     * Ensure that we handle the situation properly if the thread-leader doesn't match a property filter.
+     */
+    void testFilteredThreadLeader()
+    {
+        // Setup
+        auto folder1 = Folder::createEntity<Folder>("sink.dummy.instance1");
+        VERIFYEXEC(Sink::Store::create<Folder>(folder1));
+        auto folder2 = Folder::createEntity<Folder>("sink.dummy.instance1");
+        VERIFYEXEC(Sink::Store::create<Folder>(folder2));
+        QDateTime earlier{QDate{2017, 2, 3}, QTime{9, 0, 0}};
+        QDateTime now{QDate{2017, 2, 3}, QTime{10, 0, 0}};
+        QDateTime later{QDate{2017, 2, 3}, QTime{11, 0, 0}};
+        {
+            auto mail1 = Mail::createEntity<Mail>("sink.dummy.instance1");
+            mail1.setExtractedMessageId("mail1");
+            mail1.setFolder(folder1);
+            mail1.setExtractedDate(now);
+            mail1.setImportant(false);
+            VERIFYEXEC(Sink::Store::create(mail1));
+        }
+        {
+            auto mail2 = Mail::createEntity<Mail>("sink.dummy.instance1");
+            mail2.setExtractedMessageId("mail2");
+            mail2.setFolder(folder1);
+            mail2.setExtractedDate(earlier);
+            mail2.setImportant(false);
+            VERIFYEXEC(Sink::Store::create(mail2));
+        }
+        {
+            auto mail3 = Mail::createEntity<Mail>("sink.dummy.instance1");
+            mail3.setExtractedMessageId("mail3");
+            mail3.setFolder(folder1);
+            mail3.setExtractedDate(later);
+            mail3.setImportant(true);
+            VERIFYEXEC(Sink::Store::create(mail3));
+        }
+        // Ensure all local data is processed
+        VERIFYEXEC(Sink::ResourceControl::flushMessageQueue("sink.dummy.instance1"));
+        Query query;
+        query.setId("testLivequeryThreadleaderChange");
+        query.setFlags(Query::LiveQuery);
+        query.reduce<Mail::Folder>(Query::Reduce::Selector::max<Mail::Date>()).count("count").collect<Mail::Folder>("folders");
+        query.sort<Mail::Date>();
+        query.request<Mail::MessageId>();
+        query.filter<Mail::Important>(false);
+        auto model = Sink::Store::loadModel<Mail>(query);
+        QTRY_VERIFY(model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
+        QCOMPARE(model->rowCount(), 1);
+        {
+            auto mail = model->data(model->index(0, 0, QModelIndex{}), Sink::Store::DomainObjectRole).value<Mail::Ptr>();
+            QCOMPARE(mail->getMessageId(), QByteArray{"mail1"});
+            QCOMPARE(mail->getProperty("count").toInt(), 2);
+            QCOMPARE(mail->getProperty("folders").toList().size(), 2);
+        }
+    }
 };
 QTEST_MAIN(QueryTest)