diff --git a/src/accountview/qml/accounts.qml b/src/accountview/qml/accounts.qml
index d97d82b1..5f956493 100644
--- a/src/accountview/qml/accounts.qml
+++ b/src/accountview/qml/accounts.qml
@@ -1,178 +1,178 @@
 /***************************************************************************
 *   Copyright (C) 2017 by Bluesystems                                     *
 *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 3 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, see <http://www.gnu.org/licenses/>. *
 **************************************************************************/
 import QtQuick 2.8
 import org.kde.kirigami 2.5 as Kirigami
 import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.0
 import Ring 1.0
 import org.kde.playground.kquickitemviews 1.0 as KQuickItemViews
 import net.lvindustries.ringqtquick 1.0 as RingQtQuick
 
 ListView {
     id: accountList
 
     property QtObject selectedAccount: null
 
     spacing : 10
-    model: ProfileModel
+    model: RingSession.profileModel
     delegate: codecDelegate
 
     Component {
         id: codecDelegate
         Kirigami.Card {
             id: card
             x: 5
             width: accountList.width - 10
             height: content.height + 20
             implicitHeight: content.height + 20
 
-            property var pModel : ProfileModel.profilesForPerson(model.object)
+            property var pModel : RingSession.profileModel.profilesForPerson(model.object)
 
             ColumnLayout {
                 id: content
                 height: implicitHeight
                 width: parent.width
                 Kirigami.Heading {
                     text: model.display
                     level:4
                 }
 
                 ListView {
                     id: profileList
                     interactive: false
                     model: pModel
                     implicitHeight: contentHeight
                     height: contentHeight
                     width: parent.width
 
                     delegate: Kirigami.SwipeListItem {
                         id: listItem
                         width: card.width
                         background: Rectangle {
                             id: background
                             property var listItem: parent
 
                             color: listItem.checked ||
                                 listItem.highlighted || (
                                     listItem.supportsMouseEvents
                                     && listItem.pressed
                                     && !listItem.checked
                                     && !listItem.sectionDelegate
                                 ) ? listItem.activeBackgroundColor : listItem.backgroundColor
 
                             visible: listItem.ListView.view ? listItem.ListView.view.highlight === null : true
 
                             Rectangle {
                                 id: internal
                                 property bool indicateActiveFocus: listItem.pressed || listItem.activeFocus || (listItem.ListView.view ? listItem.ListView.view.activeFocus : false)
                                 anchors.fill: parent
                                 visible: !listItem.supportsMouseEvents
                                 color: listItem.activeBackgroundColor
                                 opacity: (listItem.hovered || listItem.highlighted || listItem.activeFocus) && !listItem.pressed ? 0.5 : 0
                                 Behavior on opacity { NumberAnimation { duration: Kirigami.Units.longDuration } }
                             }
 
                             Rectangle {
                                 opacity: 0.9
                                 anchors.fill: parent
                                 color: object == accountList.selectedAccount ? activePalette.highlight : registrationStateColor
                             }
 
                             KQuickItemViews.DecorationAdapter {
                                 width: check.implicitHeight
                                 height: check.implicitHeight
                                 anchors.right: parent.right
                                 anchors.verticalCenter: parent.verticalCenter
                                 pixmap: securityLevelIcon
                             }
 
                             readonly property bool __separatorVisible: listItem.separatorVisible
 
                             on__SeparatorVisibleChanged: {
                                 if (__separatorVisible) {
                                     var newObject = Qt.createQmlObject('import QtQuick 2.0; import org.kde.kirigami 2.4; Separator {anchors {left: parent.left; right: parent.right; bottom: parent.top} visible: listItem.separatorVisible}',
                                                         background);
                                     newObject = Qt.createQmlObject('import QtQuick 2.0; import org.kde.kirigami 2.4; Separator {anchors {left: parent.left; right: parent.right; bottom: parent.bottom} visible: listItem.separatorVisible}',
                                                         background);
                                 }
                             }
                         }
                         RowLayout {
                             width: parent.width
                             height: check.implicitHeight*2
                             CheckBox {
                                 id: check
                                 width: height
                                 checked: model.enabled
                             }
 
                             KQuickItemViews.DecorationAdapter {
                                 height: check.implicitHeight
                                 width: check.implicitHeight
                                 pixmap: decoration
                             }
 
                             Label {
                                 text: alias
                                 Layout.fillWidth: true
                             }
                         }
                         actions: [
                             Kirigami.Action {
                                 text: i18n("Remove")
                                 iconName: "list-remove"
                                 onTriggered: {}
                             }
                         ]
 
                         onPressedChanged: {
                             //TODO add a popup
                             if (accountList.selectedAccount) {
                                 accountList.selectedAccount.performAction(
                                     RingQtQuick.Account.CANCEL
                                 )
                             }
 
                             accountList.selectedAccount = object
                         }
                     }
                 }
             }
         }
     }
 
     RingQtQuick.AccountBuilder {
         id: accountBuilder
     }
 
     footer: OutlineButtons {
         function callback(index) {
             selectedAccount = accountBuilder.buildFor(index)
         }
 
         width: accountList.width
         rows: 2
         padding: 5
         model: accountBuilder
         action: callback
     }
 
     Component.onCompleted: {
         accountList.selectedAccount = RingSession.availableAccountModel.currentDefaultAccount()
     }
 }
diff --git a/src/accountview/qml/pages/basic.qml b/src/accountview/qml/pages/basic.qml
index 2335fda5..1d7b22a2 100644
--- a/src/accountview/qml/pages/basic.qml
+++ b/src/accountview/qml/pages/basic.qml
@@ -1,121 +1,121 @@
 /***************************************************************************
 *   Copyright (C) 2018 by Bluesystems                                     *
 *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 3 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, see <http://www.gnu.org/licenses/>. *
 **************************************************************************/
 import QtQuick 2.8
 import org.kde.kirigami 2.5 as Kirigami
 import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.0
 import net.lvindustries.ringqtquick 1.0 as RingQtQuick
 import org.kde.playground.kquickitemviews 1.0 as KQuickItemViews
 
 /**
  * This page contains the most basic elements necessary to create a SIP or
  * Ring/Jami account.
  */
 Page {
     Kirigami.FormLayout {
         anchors.fill: parent
 
         TextField {
             id: alias
             KQuickItemViews.RoleBinder.modelRole: "alias"
             KQuickItemViews.RoleBinder.objectProperty: "text"
             RingQtQuick.FieldStatus.name: "alias"
             visible: RingQtQuick.FieldStatus.available
             Kirigami.FormData.label: i18n("Alias")
             readOnly: RingQtQuick.FieldStatus.readOnly
         }
 
         KQuickItemViews.ComboBoxView {
 //             KQuickItemViews.RoleBinder.modelRole: "profile"
 //             KQuickItemViews.RoleBinder.objectProperty: "text"
             id: profile
-//             model: ProfileModel
+//             model: RingSession.profileModel
             Kirigami.FormData.label: i18n("Profile")
 //             textRole: "display"
-            selectionModel: ProfileModel.getAccountSelectionModel(object)
+            selectionModel: RingSession.profileModel.getAccountSelectionModel(object)
         }
 
         KQuickItemViews.ComboBoxView {
             id: protocol
 //             KQuickItemViews.RoleBinder.modelRole: "protocol"
 //             KQuickItemViews.RoleBinder.objectProperty: "text"
 //             model: object.protocolModel
             Kirigami.FormData.label: i18n("Protocol")
 //             editable: RingQtQuick.FieldStatus.readOnly
             selectionModel: protocolModel.selectionModel
         }
 
         TextField {
             id: registeredname
             KQuickItemViews.RoleBinder.modelRole: "registeredName"
             KQuickItemViews.RoleBinder.objectProperty: "text"
             RingQtQuick.FieldStatus.name: "registeredName"
             visible: RingQtQuick.FieldStatus.available
             Kirigami.FormData.label: i18n("Registered name")
             readOnly: RingQtQuick.FieldStatus.readOnly
         }
 
         TextField {
             id: displayname
             KQuickItemViews.RoleBinder.modelRole: "displayName"
             KQuickItemViews.RoleBinder.objectProperty: "text"
             RingQtQuick.FieldStatus.name: "displayName"
             visible: RingQtQuick.FieldStatus.available
             Kirigami.FormData.label: i18n("Display name")
             readOnly: RingQtQuick.FieldStatus.readOnly
         }
 
         TextField {
             id: name
             Kirigami.FormData.label: i18n("Username")
             RingQtQuick.FieldStatus.name: "username"
             visible: RingQtQuick.FieldStatus.available
             KQuickItemViews.RoleBinder.modelRole: "username"
             KQuickItemViews.RoleBinder.objectProperty: "text"
             readOnly: RingQtQuick.FieldStatus.readOnly
         }
 
         TextField {
             Kirigami.FormData.label: i18n("Password")
             id: password
             RingQtQuick.FieldStatus.name: "password"
             visible: RingQtQuick.FieldStatus.available
             KQuickItemViews.RoleBinder.modelRole: "password"
             KQuickItemViews.RoleBinder.objectProperty: "text"
             readOnly: RingQtQuick.FieldStatus.readOnly
         }
 
         TextField {
             Kirigami.FormData.label: i18n("Hostname")
             id: server
             RingQtQuick.FieldStatus.name: "hostname"
             visible: RingQtQuick.FieldStatus.available
             KQuickItemViews.RoleBinder.modelRole: "hostname"
             KQuickItemViews.RoleBinder.objectProperty: "text"
             readOnly: RingQtQuick.FieldStatus.readOnly
         }
 //         }
 
 //         server
 //         name
 //         password
 //         autoAnswer
 
 
     }
 }
diff --git a/src/actioncollection.cpp b/src/actioncollection.cpp
index 5d618e8d..a516d452 100644
--- a/src/actioncollection.cpp
+++ b/src/actioncollection.cpp
@@ -1,500 +1,500 @@
 /***************************************************************************
  *   Copyright (C) 2009-2015 by Savoir-Faire Linux                         *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 3 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, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 #include "actioncollection.h"
 
 //Qt
 #include <QtWidgets/QAction>
 #include <QtCore/QPointer>
 #include <QtCore/QTimer>
 #include <QtGui/QKeySequence>
 #include <QQuickWindow>
 
 //KDE
 #include <KLocalizedString>
 #include <KStandardAction>
 #include <KShortcutsDialog>
 #include <KActionCollection>
 #include <KSharedConfig>
 #include <KNotifyConfigWidget>
 #include <KGlobalAccel>
 #include <KXmlGuiWindow>
 
 //Ring
 #include "globalinstances.h"
 #include "ringapplication.h"
 #include "icons/icons.h"
 #include "klib/kcfg_settings.h"
 #include <call.h>
 #include <callmodel.h>
 #include <session.h>
 #include <implementation.h>
 #include <useractionmodel.h>
 #include <audio/settings.h>
-#include <personmodel.h>
+#include <persondirectory.h>
 #include <delegates/kdepixmapmanipulation.h>
 
 #ifdef HAVE_SPEECH
  #include "accessibility.h"
 #endif
 
 #define INIT_ACTION(name, icon, text) name = new QAction(icon, text, this);name->setObjectName(QStringLiteral(#name));
 
 ActionCollection* ActionCollection::instance()
 {
    static auto i = new ActionCollection();
    return i;
 }
 
 // Return the default icon
 static QIcon getIcon(const UserActionModel::Action a)
 {
    return qvariant_cast<QIcon>(GlobalInstances::pixmapManipulator().userActionIcon({a, {}, Qt::Unchecked}));
 }
 
 // Return the translated default name
 static QString getName(const UserActionModel::Action a)
 {
    Q_UNUSED(a)
    return QStringLiteral("FOO");
 }
 
 ActionCollection::ActionCollection(QObject* parent) : QObject(parent)
 {
    // It is important to init the actions correctly for the menu and KDE global shortcuts
    INIT_ACTION(action_close         , QIcon::fromTheme("window-close"), i18n( "Close"   ));
 
    INIT_ACTION(action_accept        , QIcon(QStringLiteral(":/sharedassets/phone_light/accept.svg"   )), i18n( "Accept"   ));
    INIT_ACTION(action_hold          , QIcon(QStringLiteral(":/sharedassets/phone_light/hold.svg"     )), i18n( "Hold"     ));
    INIT_ACTION(action_transfer      , QIcon(QStringLiteral(":/sharedassets/phone_light/transfert.svg")), i18n( "Transfer" ));
    INIT_ACTION(action_record        , QIcon(QStringLiteral(":/sharedassets/phone_light/record_call.svg" )), i18n( "Record"   ));
    INIT_ACTION(action_hangup        , QIcon(QStringLiteral(":/sharedassets/phone_light/refuse.svg"  )), i18n( "Hang up"  ));
 
    INIT_ACTION(action_mute_video         , getIcon(UserActionModel::Action::MUTE_VIDEO         ) , getName(UserActionModel::Action::MUTE_VIDEO         ));
    INIT_ACTION(action_join               , getIcon(UserActionModel::Action::JOIN               ) , getName(UserActionModel::Action::JOIN               ));
    INIT_ACTION(action_toggle_video       , getIcon(UserActionModel::Action::TOGGLE_VIDEO       ) , getName(UserActionModel::Action::TOGGLE_VIDEO       ));
    INIT_ACTION(action_add_contact        , getIcon(UserActionModel::Action::ADD_CONTACT        ) , getName(UserActionModel::Action::ADD_CONTACT        ));
    INIT_ACTION(action_add_to_contact     , getIcon(UserActionModel::Action::ADD_TO_CONTACT     ) , getName(UserActionModel::Action::ADD_TO_CONTACT     ));
    INIT_ACTION(action_delete_contact     , getIcon(UserActionModel::Action::DELETE_CONTACT     ) , getName(UserActionModel::Action::DELETE_CONTACT     ));
    INIT_ACTION(action_email_contact      , getIcon(UserActionModel::Action::EMAIL_CONTACT      ) , getName(UserActionModel::Action::EMAIL_CONTACT      ));
    INIT_ACTION(action_copy_contact       , getIcon(UserActionModel::Action::COPY_CONTACT       ) , getName(UserActionModel::Action::COPY_CONTACT       ));
    INIT_ACTION(action_bookmark           , getIcon(UserActionModel::Action::BOOKMARK           ) , getName(UserActionModel::Action::BOOKMARK           ));
    INIT_ACTION(action_view_chat_history  , getIcon(UserActionModel::Action::VIEW_CHAT_HISTORY  ) , getName(UserActionModel::Action::VIEW_CHAT_HISTORY  ));
    INIT_ACTION(action_add_contact_method , getIcon(UserActionModel::Action::ADD_CONTACT_METHOD ) , getName(UserActionModel::Action::ADD_CONTACT_METHOD ));
    INIT_ACTION(action_call_contact       , getIcon(UserActionModel::Action::CALL_CONTACT       ) , getName(UserActionModel::Action::CALL_CONTACT       ));
    INIT_ACTION(action_edit_contact       , getIcon(UserActionModel::Action::EDIT_CONTACT       ) , getName(UserActionModel::Action::EDIT_CONTACT       ));
    INIT_ACTION(action_new_call           , getIcon(UserActionModel::Action::ADD_NEW            ) , getName(UserActionModel::Action::ADD_NEW            ));
    INIT_ACTION(action_remove_history     , getIcon(UserActionModel::Action::REMOVE_HISTORY     ) , getName(UserActionModel::Action::REMOVE_HISTORY     ));
 
    INIT_ACTION(action_mute_capture  , QIcon::fromTheme(QStringLiteral("player-volume-muted")), i18nc("Mute the current audio capture device" , "Mute"     ));
    INIT_ACTION(action_mute_playback , QIcon::fromTheme(QStringLiteral("player-volume-muted")), i18nc("Mute the current audio playback device", "Mute Playback"     ));
 
 #ifdef ENABLE_VIDEO
    INIT_ACTION(action_video_rotate_left     , QIcon::fromTheme(QStringLiteral("object-rotate-left"    )), i18n( "Rotate left"       ));
    INIT_ACTION(action_video_rotate_right    , QIcon::fromTheme(QStringLiteral("object-rotate-right"   )), i18n( "Rotate right"      ));
    INIT_ACTION(action_video_flip_horizontal , QIcon::fromTheme(QStringLiteral("object-flip-horizontal")), i18n( "Flip"              ));
    INIT_ACTION(action_video_flip_vertical   , QIcon::fromTheme(QStringLiteral("object-flip-vertical"  )), i18n( "Flip"              ));
    INIT_ACTION(action_video_mute            , QIcon::fromTheme(QStringLiteral("camera-web"            )), i18n( "Mute"              ));
    INIT_ACTION(action_video_preview         , QIcon::fromTheme(QStringLiteral("view-preview"          )), i18n( "Preview"           ));
    INIT_ACTION(action_video_scale           , QIcon::fromTheme(QStringLiteral("transform-scale"       )), i18n( "Keep aspect ratio" ));
    INIT_ACTION(action_video_fullscreen      , QIcon::fromTheme(QStringLiteral("view-fullscreen"       )), i18n( "Fullscreen"        ));
 #endif
 }
 
 ActionCollection::~ActionCollection()
 {}
 
 QObject* ActionCollection::fakeMainWindow() const
 {
    static auto mw = new KXmlGuiWindow();
 
    static bool init = false;
    if (!init) {
       // Use a QTimer since it can enter in a recursion if there is a shortcut
       // collision creating a warning popup parented on the main window.
       #ifdef Q_OS_MAC
          QDir dir(QApplication::applicationDirPath());
          dir.cdUp();
          dir.cd("Resources/");
          QTimer::singleShot(0, [dir]() {mw->createGUI(dir.path()+"/ring-kdeui.rc");});
       #else
          QTimer::singleShot(0, []() {mw->createGUI();});
       #endif
       init = true;
    }
 
    return mw;
 }
 
 QObject* ActionCollection::kactionCollection() const
 {
    return qobject_cast<KXmlGuiWindow*>(fakeMainWindow())->actionCollection();
 }
 
 void ActionCollection::setupAction()
 {
    auto mw  = qobject_cast<KXmlGuiWindow*>(fakeMainWindow());
    auto col = mw->actionCollection();
 
    // Import standard actions
    action_quit = KStandardAction::quit       ( RingApplication::instance(), SLOT(quit())   , this);
 
    action_quit ->setObjectName( QStringLiteral("action_quit")          );
    action_close->setObjectName( QStringLiteral("action_close")          );
 
    action_quit->setText(i18n("Quit"));
 
    INIT_ACTION(action_displayDialpad        , QIcon(RingIcons::DISPLAY_DIALPAD), i18n("Display dialpad"         ));
    INIT_ACTION(action_displayVolumeControls , {}                               , i18n("Display volume controls" ));
    INIT_ACTION(action_displayAccountCbb     , {}                               , i18n("Display account selector"));
    INIT_ACTION(action_raise_client          , {}                               , i18n("Raise Ring-KDE window"   ));
    INIT_ACTION(action_focus_history         , {}                               , i18n("Search history"          ));
    INIT_ACTION(action_focus_call            , {}                               , i18n("Search call"             ));
    INIT_ACTION(action_focus_contact         , {}                               , i18n("Search contact"          ));
    INIT_ACTION(action_focus_bookmark        , {}                               , i18n("Search bookmark"         ));
 
    INIT_ACTION(action_show_wizard           , QIcon::fromTheme(QStringLiteral("tools-wizard"                    )), i18n("New account wizard"      ));
    INIT_ACTION(action_show_menu             , QIcon::fromTheme(QStringLiteral("application-menu"                )), i18n("Show the menu"           ));
    INIT_ACTION(action_new_contact           , QIcon::fromTheme(QStringLiteral("contact-new"                     )), i18n("New contact"             ));
    INIT_ACTION(action_pastenumber           , QIcon::fromTheme(QStringLiteral("edit-paste"                      )), i18n("Paste"                   ));
    INIT_ACTION(action_showContactDock       , QIcon::fromTheme(QStringLiteral("edit-find-user"                  )), i18n("Display Person"          ));
    INIT_ACTION(action_showHistoryDock       , QIcon::fromTheme(QStringLiteral("view-history"                    )), i18n("Display history"         ));
    INIT_ACTION(action_showBookmarkDock      , QIcon::fromTheme(QStringLiteral("bookmark-new-list"               )), i18n("Display bookmark"        ));
    INIT_ACTION(action_showTimelineDock      , QIcon::fromTheme(QStringLiteral("bookmark-new-list"               )), i18n("Display timeline"        ));
    INIT_ACTION(action_showDialDock          , QIcon::fromTheme(QStringLiteral("bookmark-new-list"               )), i18n("Display call manager"    ));
    INIT_ACTION(action_addPerson             , QIcon::fromTheme(QStringLiteral("contact-new"                     )), i18n("Add new contact"         ));
    INIT_ACTION(action_configureShortcut     , QIcon::fromTheme(QStringLiteral("configure-shortcuts"             )), i18n("Configure Shortcuts"     ));
    INIT_ACTION(action_configureNotifications, QIcon::fromTheme(QStringLiteral("preferences-desktop-notification")), i18n("Configure Notifications" ));
    INIT_ACTION(action_configureAccount      , QIcon::fromTheme(QStringLiteral("configure"                       )), i18n("Configure Accounts"      ));
 
 #define COL(a,b) col->setDefaultShortcut(a,b)
    // Assign default shortcuts
    COL(action_accept      , Qt::CTRL + Qt::Key_A );
    COL(action_new_call    , Qt::CTRL + Qt::Key_N );
    COL(action_hold        , Qt::CTRL + Qt::Key_H );
    COL(action_transfer    , Qt::CTRL + Qt::Key_T );
    COL(action_record      , Qt::CTRL + Qt::Key_R );
    COL(action_pastenumber , Qt::CTRL + Qt::Key_V );
    COL(action_show_menu   , Qt::CTRL + Qt::Key_M );
 #undef COL
 
 
    // Declare checkable actions
    for (QAction* a : {
       action_video_preview        , action_video_scale          , action_video_fullscreen  ,
       action_video_mute           , action_displayDialpad       , action_displayAccountCbb ,
       action_mute_playback        , action_displayVolumeControls, action_showContactDock   ,
       action_showHistoryDock      , action_showBookmarkDock     , action_mute_capture      ,
       action_show_menu            , action_showTimelineDock     , action_showDialDock      ,
    }) {
       a->setCheckable( true );
    }
 
    // Load the saved check state from KConfig
    action_video_scale           ->setChecked( ConfigurationSkeleton::keepVideoAspectRatio() );
    action_video_preview         ->setChecked( ConfigurationSkeleton::displayVideoPreview () );
    action_displayDialpad        ->setChecked( ConfigurationSkeleton::displayDialpad      () );
    action_displayAccountCbb     ->setChecked( ConfigurationSkeleton::displayAccountBox   () );
    action_displayVolumeControls ->setChecked( ConfigurationSkeleton::displayVolume       () );
    action_showContactDock       ->setChecked( ConfigurationSkeleton::displayContactDock  () );
    action_showHistoryDock       ->setChecked( ConfigurationSkeleton::displayHistoryDock  () );
    action_showBookmarkDock      ->setChecked( ConfigurationSkeleton::displayBookmarkDock () );
    action_showTimelineDock      ->setChecked( ConfigurationSkeleton::displayRecentDock   () );
    action_showDialDock          ->setChecked( ConfigurationSkeleton::displayDialDock     () );
    action_show_menu             ->setChecked( ConfigurationSkeleton::displayMenu         () );
 
 #define BIND_KCFG(action, setter) connect(action, &QAction::triggered,[](bool v) {\
    ConfigurationSkeleton:: setter(v);\
 });
 
    BIND_KCFG(action_showHistoryDock , setDisplayHistoryDock )
    BIND_KCFG(action_showContactDock , setDisplayContactDock )
    BIND_KCFG(action_showBookmarkDock, setDisplayBookmarkDock)
    BIND_KCFG(action_showDialDock    , setDisplayDialDock    )
    BIND_KCFG(action_showTimelineDock, setDisplayRecentDock  )
 
 #undef BIND_KCFG
 
    //Bind actions to the useractionmodel
    UserActionModel* uam = Session::instance()->callModel()->userActionModel();
    QHash<int, QAction*> actionHash;
    actionHash[ (int)UserActionModel::Action::ACCEPT              ] = action_accept             ;
    actionHash[ (int)UserActionModel::Action::ADD_NEW             ] = action_new_call           ;
    actionHash[ (int)UserActionModel::Action::HOLD                ] = action_hold               ;
    actionHash[ (int)UserActionModel::Action::MUTE_AUDIO          ] = action_mute_capture       ;
    actionHash[ (int)UserActionModel::Action::SERVER_TRANSFER     ] = action_transfer           ;
    actionHash[ (int)UserActionModel::Action::RECORD              ] = action_record             ;
    actionHash[ (int)UserActionModel::Action::HANGUP              ] = action_hangup             ;
    actionHash[ (int)UserActionModel::Action::MUTE_VIDEO          ] = action_mute_video         ;
    actionHash[ (int)UserActionModel::Action::JOIN                ] = action_join               ;
    actionHash[ (int)UserActionModel::Action::TOGGLE_VIDEO        ] = action_toggle_video       ;
    actionHash[ (int)UserActionModel::Action::ADD_CONTACT         ] = action_add_contact        ;
    actionHash[ (int)UserActionModel::Action::ADD_TO_CONTACT      ] = action_add_to_contact     ;
    actionHash[ (int)UserActionModel::Action::DELETE_CONTACT      ] = action_delete_contact     ;
    actionHash[ (int)UserActionModel::Action::EMAIL_CONTACT       ] = action_email_contact      ;
    actionHash[ (int)UserActionModel::Action::COPY_CONTACT        ] = action_copy_contact       ;
    actionHash[ (int)UserActionModel::Action::BOOKMARK            ] = action_bookmark           ;
    actionHash[ (int)UserActionModel::Action::VIEW_CHAT_HISTORY   ] = action_view_chat_history  ;
    actionHash[ (int)UserActionModel::Action::ADD_CONTACT_METHOD  ] = action_add_contact_method ;
    actionHash[ (int)UserActionModel::Action::CALL_CONTACT        ] = action_call_contact       ;
    actionHash[ (int)UserActionModel::Action::EDIT_CONTACT        ] = action_edit_contact       ;
    actionHash[ (int)UserActionModel::Action::REMOVE_HISTORY      ] = action_remove_history     ;
 
    for (QHash<int,QAction*>::const_iterator i = actionHash.constBegin(); i != actionHash.constEnd(); ++i) {
       QAction* ea = i.value();
       UserActionModel::Action a = static_cast<UserActionModel::Action>(i.key());
       connect(ea, &QAction::triggered, this, [uam,a](bool) {uam << a;});
    }
 
    // Refresh the action state and text
    static auto l = [actionHash,uam](const QModelIndex& tl, const QModelIndex& br) {
       const int first(tl.row()),last(br.row());
       for(int i = first; i <= last;i++) {
          const auto idx = uam->index(i,0);
          const UserActionModel::Action action = qvariant_cast<UserActionModel::Action>(idx.data(UserActionModel::Role::ACTION));
          QAction* a = actionHash[(int)action];
          if (a) {
             a->setText   ( idx.data(Qt::DisplayRole).toString()                 );
 
             if (action != UserActionModel::Action::ADD_NEW) //HACK
                a->setEnabled( idx.flags() & Qt::ItemIsEnabled                   );
 
             a->setChecked( idx.data(Qt::CheckStateRole) == Qt::Checked          );
          }
       }
    };
 
    connect(uam, &UserActionModel::dataChanged, l);
 
    // Load the initial text
    l(uam->index(0,0), uam->index(uam->rowCount() -1));
 
    const auto as = &Audio::Settings::instance();
 
    // Connect actions
    connect(action_mute_capture           , &QAction::toggled   , as                 , &Audio::Settings::muteCapture             );
    connect(action_mute_playback          , &QAction::toggled   , as                 , &Audio::Settings::mutePlayback            );
    connect(action_show_wizard            , &QAction::triggered , RingApplication::instance(), &RingApplication::showWizard      );
    connect(action_configureAccount       , &QAction::triggered , RingApplication::instance(), &RingApplication::configureAccounts);
    connect(action_show_menu              , &QAction::toggled   , this               , &ActionCollection::slotShowMenubar        );
    connect(action_close                  , &QAction::triggered , this               , &ActionCollection::slotClose              );
    connect(action_new_contact            , &QAction::triggered , this               , &ActionCollection::slotNewContact         );
    connect(action_configureShortcut      , &QAction::triggered , this               , &ActionCollection::showShortCutEditor     );
    connect(action_configureNotifications , &QAction::triggered , this               , &ActionCollection::showNotificationEditor );
    connect(action_addPerson              , &QAction::triggered , this               , &ActionCollection::slotAddPerson          );
    connect(action_raise_client           , &QAction::triggered , this               , &ActionCollection::slotRaiseClient        );
 
    connect(as, &Audio::Settings::captureVolumeChanged  , this                , &ActionCollection::updateRecordButton );
    connect(as, &Audio::Settings::playbackVolumeChanged , this                , &ActionCollection::updateVolumeButton );
    connect(as, &Audio::Settings::captureMuted          , action_mute_capture , &QAction::setChecked                  );
    connect(as, &Audio::Settings::playbackMuted         , action_mute_playback, &QAction::setChecked                  );
 
    // Add the actions to the collection
    for (QAction* a : {
       action_accept            , action_new_call          , action_hold              ,
       action_transfer          , action_record            , action_new_contact       ,
       action_quit              , action_displayDialpad    , action_showDialDock      ,
       action_displayAccountCbb , action_close             ,
       action_configureShortcut , action_pastenumber       , action_showContactDock   ,
       action_showHistoryDock   , action_showBookmarkDock  ,
       action_addPerson         , action_mute_capture      , action_mute_playback     ,
       action_mute_video        , action_join              , action_toggle_video      ,
       action_add_contact       , action_add_to_contact    , action_delete_contact    ,
       action_email_contact     , action_copy_contact      , action_bookmark          ,
       action_view_chat_history , action_add_contact_method, action_call_contact      ,
       action_edit_contact      , action_focus_history     , action_remove_history    ,
       action_raise_client      , action_focus_contact     , action_focus_call        ,
       action_focus_bookmark    , action_show_wizard       ,
       action_show_menu         , action_showTimelineDock  , action_configureAccount  ,
       action_configureNotifications, action_displayVolumeControls ,
    }) {
       col->addAction(a->objectName(), a);
    }
 
    // Enable global shortcuts for relevant "current call" actions
    for (QAction* a : {
       action_accept       , action_new_call    , action_hold         ,
       action_mute_capture , action_transfer    , action_record       ,
       action_hangup       , action_raise_client, action_focus_history,
       action_focus_contact, action_focus_call  , action_focus_bookmark
    }) {
       KGlobalAccel::self()->setGlobalShortcut(a, QList<QKeySequence>{});
    }
 
    GlobalInstances::setInterface<KDEShortcutDelegate>();
 
 #ifdef HAVE_SPEECH
    QList<QAction *> acList = *Accessibility::instance();
 
    foreach(QAction * ac,acList) {
       col->addAction(ac->objectName() , ac);
    }
 #endif
 
    QTimer::singleShot(0, [this]() {
       updateRecordButton();
       updateVolumeButton();
    });
 }
 
 ///Display the shortcuts dialog
 void ActionCollection::showShortCutEditor()
 {
    KShortcutsDialog::configure(
       qobject_cast<KXmlGuiWindow*>(
          ActionCollection::instance()->fakeMainWindow()
       )->actionCollection()
    );
 }
 
 ///Display the notification manager
 void ActionCollection::showNotificationEditor()
 {
    KNotifyConfigWidget::configure(nullptr, QStringLiteral("ring-kde"));
 }
 
 void ActionCollection::slotAddPerson()
 {
    Person* aPerson = new Person();
-   PersonModel::instance().addNewPerson(aPerson);
+   Session::instance()->personDirectory()->addNewPerson(aPerson);
 }
 
 ///Change icon of the record button
 void ActionCollection::updateRecordButton()
 {
    double recVol = Audio::Settings::instance().captureVolume();
    static const QIcon icons[4] = {
       QIcon(QStringLiteral(":/images/icons/mic.svg"   )),
       QIcon(QStringLiteral(":/images/icons/mic_25.svg")),
       QIcon(QStringLiteral(":/images/icons/mic_50.svg")),
       QIcon(QStringLiteral(":/images/icons/mic_75.svg"))
    };
 
    const int idx = (recVol/26 < 0 || recVol/26 >= 4)?0:recVol/26;
    ActionCollection::instance()->muteCaptureAction()->setIcon(icons[idx]);
 }
 
 ///Update the colunm button icon
 void ActionCollection::updateVolumeButton()
 {
    double sndVol = Audio::Settings::instance().playbackVolume();
    static const QIcon icons[4] = {
       QIcon(QStringLiteral(":/images/icons/speaker.svg"   )),
       QIcon(QStringLiteral(":/images/icons/speaker_25.svg")),
       QIcon(QStringLiteral(":/images/icons/speaker_50.svg")),
       QIcon(QStringLiteral(":/images/icons/speaker_75.svg"))
    };
 
    const int idx = (sndVol/26 < 0 || sndVol/26 >= 4)?0:sndVol/26;
    ActionCollection::instance()->mutePlaybackAction()->setIcon(icons[idx]);
 }
 
 void ActionCollection::slotNewContact()
 {
    // Find a suitable collection
-   auto cols = PersonModel::instance().enabledCollections(
+   auto cols = Session::instance()->personDirectory()->enabledCollections(
       CollectionInterface::SupportedFeatures::ADD |
       CollectionInterface::SupportedFeatures::EDIT
    );
 
    if (cols.isEmpty()) {
       qWarning() << "Failed to add a contact: no suitable backend found";
       return;
    }
 
    const auto col = cols.first();
 
    auto p = new Person();
    p->setCollection(col); //TODO have a selection widget again
 
    GlobalInstances::actionExtender().editPerson(p);
 
    // The editor won't save if the name isn't set, so it can be used to check
    // if cancel was clicked.
    col->editor<Person>()->addExisting(p);
 }
 
 void ActionCollection::slotClose()
 {
    RingApplication::instance()->desktopWindow()->hide();
 }
 
 void ActionCollection::slotShowMenubar(bool s)
 {
    Q_UNUSED(s)
 //    RingApplication::instance()->timelineWindow()->showMenu(s);
 }
 
 ///Raise the main window to the foreground
 void ActionCollection::slotRaiseClient(bool focus)
 {
    if (focus) {
       // Add a new call if there is none
       if (!Session::instance()->callModel()->rowCount())
          Session::instance()->callModel()->userActionModel() << UserActionModel::Action::ADD_NEW;
    }
 }
 
 #define GETTER(name, action) QAction* ActionCollection::name(){return action;}
 
 GETTER(holdAction                   , action_hold                  )
 GETTER(recordAction                 , action_record                )
 GETTER(muteCaptureAction            , action_mute_capture          )
 GETTER(mutePlaybackAction           , action_mute_playback         )
 GETTER(hangupAction                 , action_hangup                )
 GETTER(transferAction               , action_transfer              )
 GETTER(acceptAction                 , action_accept                )
 GETTER(newCallAction                , action_new_call              )
 GETTER(displayVolumeControlsAction  , action_displayVolumeControls )
 GETTER(displayDialpadAction         , action_displayDialpad        )
 GETTER(displayAccountCbbAction      , action_displayAccountCbb     )
 GETTER(showContactDockAction        , action_showContactDock       )
 GETTER(showHistoryDockAction        , action_showHistoryDock       )
 GETTER(showBookmarkDockAction       , action_showBookmarkDock      )
 GETTER(showTimelineDockAction       , action_showTimelineDock      )
 GETTER(showDialDockAction           , action_showDialDock          )
 GETTER(quitAction                   , action_quit                  )
 GETTER(closeAction                  , action_close                 )
 GETTER(addPerson                    , action_addPerson             )
 GETTER(focusHistory                 , action_focus_history         )
 GETTER(focusContact                 , action_focus_contact         )
 GETTER(focusCall                    , action_focus_call            )
 GETTER(focusBookmark                , action_focus_bookmark        )
 GETTER(showWizard                   , action_show_wizard           )
 GETTER(showMenu                     , action_show_menu             )
 GETTER(newContact                   , action_new_contact           )
 GETTER(configureShortcut            , action_configureShortcut     )
 GETTER(configureNotification        , action_configureNotifications)
 GETTER(configureAccount             , action_configureAccount)
 
 //Video actions
 #ifdef ENABLE_VIDEO
 GETTER(videoRotateLeftAction        , action_video_rotate_left     )
 GETTER(videoRotateRightAction       , action_video_rotate_right    )
 GETTER(videoFlipHorizontalAction    , action_video_flip_horizontal )
 GETTER(videoFlipVerticalAction      , action_video_flip_vertical   )
 GETTER(videoMuteAction              , action_video_mute            )
 GETTER(videoPreviewAction           , action_video_preview         )
 GETTER(videoScaleAction             , action_video_scale           )
 GETTER(videoFullscreenAction        , action_video_fullscreen      )
 #endif
 
 #undef GETTER
 
 #undef INIT_ACTION
 
 // kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/callview/imageprovider.cpp b/src/callview/imageprovider.cpp
index f7ca05cd..01515fe2 100644
--- a/src/callview/imageprovider.cpp
+++ b/src/callview/imageprovider.cpp
@@ -1,283 +1,283 @@
 /***************************************************************************
  *   Copyright (C) 2017 by Bluesystems                                     *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 3 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, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 #include "imageprovider.h"
 
 // Qt
 #include <QtCore/QMutexLocker>
 #include <QtCore/QDir>
 #include <QtCore/QStandardPaths>
 
 #include <call.h>
 
 #include <callmodel.h>
 #include <session.h>
 #include <video/previewmanager.h>
 
 class FrameBuffer final : public QObject
 {
     Q_OBJECT
 public:
     int          m_Skip       {   3   };
     char*        m_pFrameCopy {nullptr};
     uint         m_FrameSize  {   0   };
     Video::Frame m_Frame;
 
     Video::Renderer* renderer() const;
     void setRenderer(Video::Renderer* r);
 
 private:
     Video::Renderer* m_pRenderer {nullptr};
 
 private Q_SLOTS:
     void slotFinish();
 };
 
 class ImageProviderPrivate final : public QObject
 {
     Q_OBJECT
 public:
     QHash<QByteArray, FrameBuffer*> m_hActiveRenderers;
     QMutex m_FrameReader {};
 
     static ImageProvider* m_spInstance;
 
 public Q_SLOTS:
     void addRenderer(Call* c, Video::Renderer* renderer);
     void removeRenderer(Call* c, Video::Renderer* renderer);
 
     void previewStarted(Video::Renderer* r);
     void previewStopped(Video::Renderer* r);
 };
 
 ImageProvider* ImageProviderPrivate::m_spInstance = nullptr;
 
 
 QString ImageProvider::takeSnapshot(Call* c)
 {
     if (!ImageProviderPrivate::m_spInstance)
         return {};
 
     QSize s;
 
     const auto img = ImageProviderPrivate::m_spInstance->requestImage(QStringLiteral("peer/9999"), &s, {});
 
     const auto path = QStringLiteral("%1/snapshots/%2/")
         .arg(QStandardPaths::writableLocation(QStandardPaths::DataLocation))
         .arg(c->historyId());
 
     QDir d(path);
 
     if (!d.exists())
         d.mkpath(QStringLiteral("."));
 
     QString fileName;
 
     do {
         fileName = QStringLiteral("%1/%2.png")
             .arg(d.absolutePath())
             .arg(qrand()^qrand());
     } while (QFile::exists(fileName));
 
     qDebug() << "Saving snapshot to" << fileName;
 
     img.save(fileName);
 
     return fileName;
 }
 
 ImageProvider::ImageProvider()
     : QQuickImageProvider(QQuickImageProvider::Image), d_ptr(new ImageProviderPrivate)
 {
     ImageProviderPrivate::m_spInstance = this;
 
     QObject::connect(Session::instance()->callModel(), &CallModel::rendererAdded,
         d_ptr, &ImageProviderPrivate::addRenderer);
 
     QObject::connect(Session::instance()->callModel(), &CallModel::rendererRemoved,
         d_ptr, &ImageProviderPrivate::removeRenderer);
 
-    QObject::connect(&Video::PreviewManager::instance(), &Video::PreviewManager::previewStarted,
+    QObject::connect(Session::instance()->previewManager(), &Video::PreviewManager::previewStarted,
         d_ptr, &ImageProviderPrivate::previewStarted);
 
-    QObject::connect(&Video::PreviewManager::instance(), &Video::PreviewManager::previewStopped,
+    QObject::connect(Session::instance()->previewManager(), &Video::PreviewManager::previewStopped,
         d_ptr, &ImageProviderPrivate::previewStopped);
 
     // Check if there is active renderers
 
     foreach(Call* c, Session::instance()->callModel()->getActiveCalls()) {
         if (c->videoRenderer())
             d_ptr->addRenderer(c, c->videoRenderer());
     }
 
-    if (Video::PreviewManager::instance().isPreviewing())
-        d_ptr->previewStarted(Video::PreviewManager::instance().previewRenderer());
+    if (Session::instance()->previewManager()->isPreviewing())
+        d_ptr->previewStarted(Session::instance()->previewManager()->previewRenderer());
 }
 
 ImageProvider::~ImageProvider()
 {
     delete d_ptr;
 }
 
 QImage ImageProvider::requestImage(const QString &id, QSize *size, const QSize &requestedSize)
 {
     Q_UNUSED(requestedSize)
 
     const QStringList path =  id.split('/');
 
     if (Q_UNLIKELY(path.size() < 2)) {
         qWarning() << "Invalid video renderer id" << id;
         if (size)
             *size = QSize(0, 0);
         return {};
     }
 
     QMutexLocker locker(&d_ptr->m_FrameReader);
 
     //FIXME eventually find a better id, but currently, there is always only
     // zero to 2 video renderers.
     FrameBuffer* fb = path[0] == QLatin1String("preview") ?
         d_ptr->m_hActiveRenderers["preview"] :
         d_ptr->m_hActiveRenderers["peer"];
 
     if (fb && fb->renderer()) {
 
         //To give a bit of history about why this code is weird, it used to have another copy buffer
         //but this was removed and replaced with a flip buffer in libQt, there is some leftover
         //code that need to be cleaned
         Video::Frame frm = fb->renderer()->currentFrame();
 
         QMutexLocker l2(fb->renderer()->mutex());
         // Repaint the old frame if there is no new ones
         if (frm.size) {
             fb->m_Frame = std::move(frm);
 
             // I give up, every month, the daemon manage to break their SHM
             // memory model. From now on, ring-kde copy the frame. It's slow,
             // but won't cause surprise SIGSEGV (2015)
             if (!fb->m_pFrameCopy) {
                 fb->m_pFrameCopy = new char[fb->m_Frame.size];
                 fb->m_FrameSize  = fb->m_Frame.size;
             }
             else if (fb->m_Frame.size != fb->m_FrameSize) {
                 delete[] fb->m_pFrameCopy;
                 fb->m_pFrameCopy = new char[fb->m_Frame.size];
                 fb->m_FrameSize  = fb->m_Frame.size;
             }
 
             memcpy(fb->m_pFrameCopy, fb->m_Frame.ptr, fb->m_FrameSize);
         }
 
         QSize res = fb->renderer()->size();
 
         if (size)
             *size = res;
 
         return QImage((uchar*)fb->m_pFrameCopy, res.width(), res.height(), QImage::Format_ARGB32 );
     }
 
     if (size)
         *size = QSize(0, 0);
 
     return {};
 }
 
 void ImageProviderPrivate::addRenderer(Call* c, Video::Renderer* renderer)
 {
     Q_UNUSED(c)
 
     QMutexLocker locker(&m_FrameReader);
 
     if (m_hActiveRenderers.contains("peer")) {
         qWarning() << "The peer video renderer already exists";
         delete m_hActiveRenderers["peer"];
     }
 
     auto fb = new FrameBuffer;
     fb->setRenderer(renderer);
     m_hActiveRenderers["peer"] = fb;
 }
 
 void ImageProviderPrivate::removeRenderer(Call* c, Video::Renderer* renderer)
 {
     Q_UNUSED(c)
     Q_UNUSED(renderer)
 
     if (m_hActiveRenderers.contains("peer")) {
         QMutexLocker locker(&m_FrameReader);
         delete m_hActiveRenderers["peer"];
         m_hActiveRenderers.remove("peer");
     }
 }
 
 void ImageProviderPrivate::previewStarted(Video::Renderer* r)
 {
     QMutexLocker locker(&m_FrameReader);
     if (m_hActiveRenderers.contains("preview") && m_hActiveRenderers["preview"]) {
         if (m_hActiveRenderers["preview"]->renderer() == r)
             return;
 
         qWarning() << "The preview renderer already exists";
         delete m_hActiveRenderers["preview"];
         m_hActiveRenderers.remove("preview");
     }
 
     auto fb = new FrameBuffer;
     fb->setRenderer(r);
     m_hActiveRenderers["preview"] = fb;
 }
 
 void ImageProviderPrivate::previewStopped(Video::Renderer* r)
 {
     Q_UNUSED(r)
 
     if (m_hActiveRenderers.contains("preview")) {
         QMutexLocker locker(&m_FrameReader);
         delete m_hActiveRenderers["preview"];
         m_hActiveRenderers.remove("preview");
     }
 
 }
 
 Video::Renderer* FrameBuffer::renderer() const
 {
     return m_pRenderer;
 }
 
 void FrameBuffer::setRenderer(Video::Renderer* r)
 {
     if (r == m_pRenderer)
         return;
 
     if (m_pRenderer)
         disconnect(m_pRenderer, &QObject::destroyed, this, &FrameBuffer::slotFinish);
 
     m_pRenderer = r;
 
     if (r)
         connect(m_pRenderer, &QObject::destroyed, this, &FrameBuffer::slotFinish);
 }
 
 void FrameBuffer::slotFinish()
 {
     if (m_pRenderer != sender())
         return;
 
     m_pRenderer = nullptr;
 }
 
 #include <imageprovider.moc>
diff --git a/src/callview/qml/callview.qml b/src/callview/qml/callview.qml
index 8355eb6a..8295a086 100644
--- a/src/callview/qml/callview.qml
+++ b/src/callview/qml/callview.qml
@@ -1,281 +1,281 @@
 /***************************************************************************
  *   Copyright (C) 2017 by Bluesystems                                     *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 3 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, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 import QtQuick 2.7
 import QtQuick.Layouts 1.0
 import Ring 1.0
 import net.lvindustries.ringqtquick 1.0 as RingQtQuick
 
 Item {
     id: videoDock
 
     signal callWithVideo ()
     signal callWithAudio ()
     signal callWithScreen()
 
     height: 480
     width: 640
 
     // C++ bindings
     property alias    rendererName   : videoWidget.rendererName
     property bool     displayPreview : false
     property string   mode           : "PREVIEW"
     property bool     previewRunning : false
     property alias    peerRunning    : videoWidget.started
     property QtObject call           : null
     property QtObject renderer       : call ? call.renderer : null
 
     property bool previewVisible: mode != "PREVIEW" &&
-        call && PreviewManager.previewing
+        call && RingSession.previewManager.previewing
 
     Connections {
         target: renderer
         onDestroyed: {
             videoWidget.started = false
         }
     }
 
     // Let the animations finish before
     Timer {
         id: toolbarTimer
         running: false
         interval: 150
         repeat: false
 
         onTriggered: {
             actionToolbar.visible  = false
             videoSource.visible    = false
             controlToolbar.visible = false
         }
     }
 
     function showToolbars() {
         actionToolbar.visible  = true
         videoSource.visible    = true
 
         // This toolbar is only useful when there is video
         if (videoWidget.started)
             controlToolbar.visible = true
 
         actionToolbar.opacity  = 1
         videoSource.opacity    = 1
         controlToolbar.opacity = 1
         videoPreview.opacity   = 0.8
         actionToolbar.anchors.bottomMargin = 0
         videoSource.anchors.rightMargin    = 0
         controlToolbar.anchors.topMargin   = 0
     }
 
     function hideToolbars() {
         actionToolbar.opacity  = 0
         videoSource.opacity    = 0
         controlToolbar.opacity = 0
         videoPreview.opacity   = 1
         videoSource.anchors.rightMargin    = -20
         actionToolbar.anchors.bottomMargin = -20
         controlToolbar.anchors.topMargin   = -20
         toolbarTimer.running = true
     }
 
     VideoWidget {
         id: videoWidget
         anchors.fill: parent
         z: -100
         started: false
         visible: started && !hasFailed
         call: videoDock.call
     }
 
     VideoWidget {
         id: videoPreview
         z: -95
         started: false
         visible: previewVisible
         anchors.right: parent.right
         anchors.bottom: parent.bottom
         width: 192
         height: 108
     }
 
     VideoControlToolbar {
         id: controlToolbar
         anchors.top: parent.top
         visible: false
         Behavior on opacity {
             NumberAnimation {duration: 100}
         }
         Behavior on anchors.topMargin {
             NumberAnimation {duration: 150}
         }
     }
 
     ActionToolbar {
         id: actionToolbar
         anchors.bottom: parent.bottom
         visible: false
         Behavior on opacity {
             NumberAnimation {duration: 100}
         }
         Behavior on anchors.bottomMargin {
             NumberAnimation {duration: 150}
         }
     }
 
     RecordingIcon {
         anchors.right: videoDock.right
         anchors.top: controlToolbar.bottom
     }
 
     DeviceSetting {
         id: deviceSettings
         visible: mode == "PREVIEW"
         width: parent.width
         z: 100
         Rectangle {
             anchors.fill: parent
             color: "black"
             opacity: 0.5
             z: -1
         }
     }
 
     VideoSource {
         id: videoSource
         z: 101
         visible: false
         anchors.right: parent.right
         anchors.verticalCenter: parent.verticalCenter
         Behavior on opacity {
             NumberAnimation {duration: 100}
         }
         Behavior on anchors.rightMargin {
             NumberAnimation {duration: 150}
         }
     }
 
     // The background
     CallBackground {
         id: placeholderMessage
         z: -99
         anchors.fill: parent
         bottomMargin: actionToolbar.visible ? actionToolbar.height : 0
     }
 
     // Hide both toolbars when the mouse isn't moving
     //TODO keep visible if the mouse if over the toolbars
     MouseArea {
         id: mainMouseArea
         Timer {
             id: activityTimer
             interval: 3000
             running: true
             repeat: false
             onTriggered: {
                 hideToolbars()
             }
         }
 
         function trackActivity() {
             if (mode == "PREVIEW") {
                 deviceSettings.visible = true
             }
             else if (call) {
                 showToolbars()
             }
 
             activityTimer.restart()
         }
 
         anchors.fill: parent
         hoverEnabled: true
         propagateComposedEvents: true
         onMouseXChanged: trackActivity()
         onMouseYChanged: trackActivity()
     }
 
     onModeChanged: {
         if (mode == "PREVIEW") {
             hideToolbars()
             videoWidget.rendererName = "preview"
         }
         else if (mode == "CONVERSATION") {
-            videoPreview.started = PreviewManager.previewing
+            videoPreview.started = RingSession.previewManager.previewing
             videoWidget.rendererName = "peer"
         }
         placeholderMessage.mode = mode
     }
 
     onCallChanged: {
         if (call) {
             actionToolbar.userActionModel = call.userActionModel
             placeholderMessage.call = call
             videoSource.call        = call
             controlToolbar.call     = call
         }
         videoWidget.hasFailed = false
         mainMouseArea.visible = call != null || mode == "PREVIEW"
     }
 
     Connections {
-        target: PreviewManager
+        target: RingSession.previewManager
         onPreviewingChanged: {
             if (mode == "PREVIEW")
-                videoWidget.started = PreviewManager.previewing
+                videoWidget.started = RingSession.previewManager.previewing
 
-            videoPreview.started = PreviewManager.previewing
+            videoPreview.started = RingSession.previewManager.previewing
         }
     }
 
     Connections {
         target: call
     }
 
     Connections {
         target: call
         onVideoStarted: {
             videoWidget.started = true
         }
         onVideoStopped: {
             videoWidget.started = false
         }
         onLiveMediaIssuesChanaged: {
             // This isn't using properties because the renderer live in their
             // own thread and QML doesn't support this yet
             videoWidget.hasFailed = call.hasIssue(RingQtQuick.Call.VIDEO_ACQUISITION_FAILED)
         }
     }
 
     Connections {
         target: videoWidget
         onStartedChanged: {
             placeholderMessage.visible = (!videoWidget.started) || (videoWidget.hasFailed)
         }
         onHasFailedChanged: {
             placeholderMessage.visible = (!videoWidget.started) || (videoWidget.hasFailed)
         }
     }
 
     Connections {
         target: call
         onStateChanged: {
             if (call == null || call.lifeCycleState == RingQtQuick.Call.FINISHED) {
                 call = null
                 hideToolbars()
             }
         }
     }
 }
diff --git a/src/conf/dlggeneral.cpp b/src/conf/dlggeneral.cpp
index e5077865..6a09cf6f 100644
--- a/src/conf/dlggeneral.cpp
+++ b/src/conf/dlggeneral.cpp
@@ -1,88 +1,88 @@
 /****************************************************************************
  *   Copyright (C) 2009-2015 by Savoir-Faire Linux                          *
  *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>          *
  *            Emmanuel Lepage Vallee <elv1313@gmail.com>                    *
  *                                                                          *
  *   This library is free software; you can redistribute it and/or          *
  *   modify it under the terms of the GNU Lesser General Public             *
  *   License as published by the Free Software Foundation; either           *
  *   version 2.1 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      *
  *   Lesser General Public License for more details.                        *
  *                                                                          *
  *   You should have received a copy of the GNU General Public License      *
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
  ***************************************************************************/
 #include "dlggeneral.h"
 
 //Qt
 #include <QtWidgets/QToolButton>
 #include <QtWidgets/QAction>
 #include <QtGui/QIcon>
 
 //KDE
 #include <kmessagebox.h>
 #include <klocalizedstring.h>
 
 //Ring
 #include "klib/kcfg_settings.h"
-#include "categorizedhistorymodel.h"
+#include "callhistorymodel.h"
 #include "session.h"
 
 ///Constructor
 DlgGeneral::DlgGeneral(KConfigDialog *parent)
  : QWidget(parent),m_HasChanged(false)
 {
 //    setupUi(this);
 //    connect(toolButton_historyClear, &QAbstractButton::clicked, this, &DlgGeneral::slotClearCallHistoryAsked);
 //    const bool isLimited = Session::instance()->historyModel()->isHistoryLimited();
 //    m_pKeepHistory->setChecked(!isLimited);
 //    m_pHistoryMax ->setEnabled(isLimited );
 //
 //    m_pHistoryMax->setValue(Session::instance()->historyModel()->historyLimit());
 //    m_HasChanged = false;
 }
 
 ///Destructor
 DlgGeneral::~DlgGeneral()
 {
 }
 
 ///Have this dialog changed
 bool DlgGeneral::hasChanged()
 {
    return m_HasChanged;
 }
 
 ///Tag this dialog as changed
 void DlgGeneral::slotChanged()
 {
    m_HasChanged = true;
    emit updateButtons();
 }
 
 ///Update all widgets
 void DlgGeneral::updateWidgets()
 {
 }
 
 ///Save current settings
 void DlgGeneral::updateSettings()
 {
 //    Session::instance()->historyModel()->setHistoryLimited(!m_pKeepHistory->isChecked());
 //
 //    if (!m_pKeepHistory->isChecked())
 //       Session::instance()->historyModel()->setHistoryLimit(m_pHistoryMax->value());
 //
 //    m_HasChanged = false;
 }
 
 void DlgGeneral::slotClearCallHistoryAsked()
 {
 //    Session::instance()->historyModel()->clearAllCollections();
 }
 
 // kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/configurator/audiorecordingconfigurator.cpp b/src/configurator/audiorecordingconfigurator.cpp
index b93e543f..8f95d213 100644
--- a/src/configurator/audiorecordingconfigurator.cpp
+++ b/src/configurator/audiorecordingconfigurator.cpp
@@ -1,101 +1,101 @@
 /***************************************************************************
  *   Copyright (C) 2017 by Bluesystems                                     *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 3 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, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 #include "audiorecordingconfigurator.h"
 
 #include <media/recordingmodel.h>
 #include <call.h>
 #include <QtCore/QSortFilterProxyModel>
 #include <QtWidgets/QWidget>
 
 #include <KLocalizedString>
 
 // #include "ui_recording.h"
 
 AudioRecordingConfigurator::AudioRecordingConfigurator(QObject* parent, AudioRecordingConfigurator::Mode mode)
     : CollectionConfigurationInterface(parent), m_Mode(mode)
 {
 }
 
 QByteArray AudioRecordingConfigurator::id() const
 {
     return "peerProfileConfigurator";
 }
 
 QString AudioRecordingConfigurator::name() const
 {
     return i18n("Peer profile configurator");
 }
 
 QVariant AudioRecordingConfigurator::icon() const
 {
     return QVariant();
 }
 
 void AudioRecordingConfigurator::slotSelectionChanged(const QModelIndex& idx)
 {
     auto date = idx.data((int)Ring::Role::FormattedLastUsed);
 
     if (date.isNull())
         date = idx.data((int)Call::Role::FormattedDate);
 
 //     m_pLastUpdated->setText(date.toString());
 //     m_pLength->setText(idx.data((int)Ring::Role::Length).toString());
 }
 
 void AudioRecordingConfigurator::loadCollection(CollectionInterface* col, QObject* parent)
 {
     Q_UNUSED(col)
 
     if (m_Init)
         return;
 
     if (auto w = qobject_cast<QWidget*>(parent)) {
 //         Ui_Recording ui;
 //         ui.setupUi(w);
 //         m_pLastUpdated = ui.lastUpdated;
 //         m_pLength      = ui.length;
 //
 //         QAbstractItemModel* m = nullptr;
 //
 //         if (m_Mode == Mode::AUDIO)
-//             m = Media::RecordingModel::instance().audioRecordingModel();
+//             m = Media::Session::instance()->recordingModel()->audioRecordingModel();
 //         else
-//             m = Media::RecordingModel::instance().textRecordingModel();
+//             m = Media::Session::instance()->recordingModel()->textRecordingModel();
 //
 //         auto p = new QSortFilterProxyModel(this);
 //         connect(ui.lineEdit ,SIGNAL(filterStringChanged(QString)), p, SLOT(setFilterRegExp(QString)));
 //         p->setSourceModel(m);
 //         p->setFilterRole(Qt::DisplayRole);
 //         p->setFilterCaseSensitivity( Qt::CaseInsensitive );
 //         p->setSortCaseSensitivity  ( Qt::CaseInsensitive );
 //
 //         ui.tableView->setModel(p);
 //         connect(ui.tableView->selectionModel(), &QItemSelectionModel::currentChanged,
 //             this, &AudioRecordingConfigurator::slotSelectionChanged);
 //
 //         if (p->rowCount())
 //             ui.tableView->selectionModel()->setCurrentIndex(
 //                 p->index(0,0),
 //                 QItemSelectionModel::ClearAndSelect
 //             );
     }
 
     m_Init = true;
 }
 
 // kate: space-indent on; indent-width 4; replace-tabs on;
diff --git a/src/configurator/bookmarkconfigurator.cpp b/src/configurator/bookmarkconfigurator.cpp
index 80eca7e0..19738e60 100644
--- a/src/configurator/bookmarkconfigurator.cpp
+++ b/src/configurator/bookmarkconfigurator.cpp
@@ -1,91 +1,91 @@
 /***************************************************************************
  *   Copyright (C) 2017 by Bluesystems                                     *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 3 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, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 #include "bookmarkconfigurator.h"
 
 #include <KLocalizedString>
 
-#include <categorizedbookmarkmodel.h>
+#include <bookmarkmodel.h>
 #include <session.h>
 
 // #include "ui_bookmark.h"
 #include <QtWidgets/QWidget>
 
 BookmarkConfigurator::BookmarkConfigurator(QObject* parent) : CollectionConfigurationInterface(parent)
 {
 }
 
 BookmarkConfigurator::~BookmarkConfigurator()
 {
 //     delete m_pUi;
 }
 
 QByteArray BookmarkConfigurator::id() const
 {
     return "peerProfileConfigurator";
 }
 
 QString BookmarkConfigurator::name() const
 {
     return i18n("Peer profile configurator");
 }
 
 QVariant BookmarkConfigurator::icon() const
 {
     return QVariant();
 }
 
 void BookmarkConfigurator::loadCollection(CollectionInterface* col, QObject* parent)
 {
     Q_UNUSED(col)
 
     if (m_Init)
         return;
 
     if (auto w = qobject_cast<QWidget*>(parent)) {
 //         m_pUi = new Ui_Bookmark();
 //         m_pUi->setupUi(w);
 //         connect(m_pUi->pushButton, &QPushButton::clicked, Session::instance()->bookmarkModel(), &CategorizedBookmarkModel::clear);
 //         connect(m_pUi->pushButton, &QPushButton::clicked, this, [this]() {
 //             m_HasChanged = true;
 //         });
 //         connect(m_pUi->kcfg_displayPopularAsBookmark, &QPushButton::toggled, this, [this]() {
 //             m_HasChanged = true;
 //         });
     }
 
     m_Init = true;
 }
 
 bool BookmarkConfigurator::hasChanged()
 {
     return m_HasChanged;
 }
 
 void BookmarkConfigurator::save()
 {
 //     if (!m_pUi)
 //         return;
 //
 //     Session::instance()->bookmarkModel()->setDisplayPopular(
 //         m_pUi->kcfg_displayPopularAsBookmark->isChecked()
 //     );
 
     m_HasChanged = false;
 }
 
 // kate: space-indent on; indent-width 4; replace-tabs on;
diff --git a/src/configurator/localhistoryconfigurator.cpp b/src/configurator/localhistoryconfigurator.cpp
index 45ada761..f8a36831 100644
--- a/src/configurator/localhistoryconfigurator.cpp
+++ b/src/configurator/localhistoryconfigurator.cpp
@@ -1,69 +1,69 @@
 /***************************************************************************
  *   Copyright (C) 2015 by Savoir-Faire Linux                              *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 3 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, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 #include "localhistoryconfigurator.h"
 #include "conf/dlggeneral.h"
 
-#include <categorizedhistorymodel.h>
+#include <callhistorymodel.h>
 #include <session.h>
 
 #include <KLocalizedString>
 
 #include <QtWidgets/QWidget>
 
 LocalHistoryConfigurator::LocalHistoryConfigurator(QObject* parent) : CollectionConfigurationInterface(parent),m_pDialog(nullptr)
 {
 }
 
 QByteArray LocalHistoryConfigurator::id() const
 {
    return "localHistoryConfigurator";
 }
 
 QString LocalHistoryConfigurator::name() const
 {
    return i18n("Local history configurator");
 }
 
 QVariant LocalHistoryConfigurator::icon() const
 {
    return QVariant();
 }
 
 void LocalHistoryConfigurator::loadCollection(CollectionInterface* col, QObject* parent)
 {
 //    Q_UNUSED(col)
 //    if (parent && qobject_cast<QWidget*>(parent)) {
 //       QWidget* w = qobject_cast<QWidget*>(parent);
 //       if (!m_pDialog) {
 //          m_pDialog = new DlgGeneral(nullptr);
 //          QHBoxLayout* l = new QHBoxLayout(w);
 //          l->addWidget(m_pDialog);
 //
 //          m_pDialog->m_pKeepHistory->setChecked(Session::instance()->historyModel()->isHistoryLimited());
 //          m_pDialog->m_pHistoryMax->setValue(Session::instance()->historyModel()->historyLimit());
 //
 //          connect(m_pDialog->m_pKeepHistory, &QCheckBox::toggled, Session::instance()->historyModel(), &CategorizedHistoryModel::setHistoryLimited);
 //          connect(m_pDialog->m_pHistoryMax , SIGNAL(valueChanged(int)), Session::instance()->historyModel(), SLOT(setHistoryLimit(int)));
 //          connect(m_pDialog, &DlgGeneral::updateButtons, this, [this]() {
 //             emit this->changed();
 //          });
 //       }
 //    }
 }
 
 // kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/contactview/qml/contactlist.qml b/src/contactview/qml/contactlist.qml
index e3a9ce8a..e91d493b 100644
--- a/src/contactview/qml/contactlist.qml
+++ b/src/contactview/qml/contactlist.qml
@@ -1,286 +1,286 @@
 /***************************************************************************
  *   Copyright (C) 2017 by Bluesystems                                     *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 3 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, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 import QtQuick 2.7
 import QtQuick.Layouts 1.0
 import QtQuick.Controls 2.0
 import QtQml.Models 2.2
 import RingQmlWidgets 1.0
 import Ring 1.0
 import QtGraphicalEffects 1.0
 import org.kde.kirigami 2.2 as Kirigami
 import org.kde.playground.kquickitemviews 1.0 as KQuickItemViews
 
 Kirigami.Page {
     id: contactList
     signal contactMethodSelected(var cm)
     signal individualSelected(var ind)
 
     leftPadding: 0
     topPadding: 0
     bottomPadding: 0
     rightPadding: 0
 
     anchors.fill: parent
 
     function selectContact(index, object, modelIndex) {
         treeView.selectItem(modelIndex)
         contactList.individualSelected(
             object.individual
         )
     }
 
     mainAction: Kirigami.Action {
         iconName: "list-add"
         onTriggered: {
             addNewContact()
         }
     }
 
     SystemPalette {
         id: inactivePalette
         colorGroup: SystemPalette.Disabled
     }
 
     SystemPalette {
         id: activePalette
         colorGroup: SystemPalette.Active
     }
 
     FontMetrics {
         id: fontMetrics
     }
 
     Rectangle {
         color: activePalette.base
         anchors.fill: parent
 
         ListView {
             id: sorting
             height: 32
             width: parent.width
-            model: ContactCategoryModel
+            model: RingSession.sontactCategoryModel
             orientation: ListView.Horizontal
             delegate: MouseArea {
                 height: 32
                 width: content.implicitWidth + 10
                 Text {
                     id: content
                     text: display
                     color:activePalette.text
                     font.bold: true
                     anchors.centerIn: parent
                 }
                 onClicked: {
                     sorting.currentIndex = index
                 }
             }
 
             highlightFollowsCurrentItem: true
 
             TreeHelper {
                 id: helper
-                model: ContactCategoryModel
-                selectionModel: ContactCategorySelectionModel
+                model: RingSession.sontactCategoryModel
+                selectionModel: RingSession.contactCategorySelectionModel
             }
 
             highlight: Item {
                 height: 32
                 width: 15
                 Rectangle {
                     height: 4
                     color:activePalette.highlight
                     width:15
                     y: parent.height/2 + fontMetrics.height/2 + 3
                     anchors.horizontalCenter: parent.horizontalCenter
                 }
             }
 
             onCurrentIndexChanged: {
                 helper.selectIndex(currentIndex)
             }
         }
 
         KQuickItemViews.TreeView {
             id: treeView
             anchors.top: sorting.bottom
             anchors.bottom: parent.bottom
             width: contactList.width
             height: contactList.height - sorting.height
 
             function selectItem(index) {
                 treeView.currentIndex = index
             }
 
-            model: SortedContactModel
+            model: RingSession.sortedContactModel
             delegate: masterComponent
             sortingEnabled: true
 
             highlight: Item {
                 Rectangle {
                     anchors.fill: parent
                     anchors.margins: 5
                     anchors.leftMargin: 10
                     anchors.rightMargin: 10
                     radius: 5
                     color: activePalette.highlight
                 }
             }
 
             Component {
                 id: masterComponent
                 Loader {
                     width: contactList.width
                     Component {
                         id: categoryComponent
                         Item {
                             height: catName.implicitHeight + 3
                             width: contactList.width
                             Text {
                                 anchors.topMargin: 3
                                 id: catName
                                 text: display
                                 color: inactivePalette.text
                             }
 
                             Rectangle {
                                 height: 1
                                 width: parent.width
                                 color: inactivePalette.text
                                 anchors.top: parent.top
                             }
                         }
                     }
 
                     Component {
                         id: contactComponent
                         ContactCard {
                             selectionCallback: selectContact
                         }
                     }
 
                     Component {
                         id: phoneNumberComponent
                         Item {
                             height: 0
                             Rectangle {
                                 color: "blue"
                                 y: -48 + index*(numberField.implicitHeight+4)
                                 x: 64
                                 height: 30
                                 Text {
                                     id: numberField
                                     anchors.fill: parent
                                     text: display
                                     color: inactivePalette.text
                                 }
                             }
                         }
                     }
 
                     function selectDelegate() {
                         if (objectType == 0)
                             return contactComponent
                         else if (objectType == 1)
                             return phoneNumberComponent
 
                         return categoryComponent
                     }
 
                     sourceComponent: selectDelegate()
                 }
             }
         }
 
 
 
         // It needs to be here due to z-index conflicts between
         // chatScrollView and timelinePage
         Item {
             id: burryOverlay
             z: 2
             visible: false
             opacity: 0
             anchors.right: parent.right
             anchors.top: parent.top
             anchors.rightMargin: - 15
             width: scrollbar.fullWidth + 15
             height: chatView.height
             clip: true
 
             Behavior on opacity {
                 NumberAnimation {duration: 300; easing.type: Easing.InQuad}
             }
 
             Repeater {
                 anchors.fill: parent
                 model: 5
                 FastBlur {
                     anchors.fill: parent
                     source: effectSource
                     radius: 30
                 }
             }
 
             Rectangle {
                 anchors.fill: parent
                 color: activePalette.base
                 opacity: 0.75
             }
         }
 
         // Add a blurry background
         ShaderEffectSource {
             id: effectSource
             visible: false
 
             sourceItem: chatView
             anchors.right: timelinePage.right
             anchors.top: timelinePage.top
             width: scrollbar.fullWidth + 15
             height: chatView.height
 
             sourceRect: Qt.rect(
                 burryOverlay.x,
                 burryOverlay.y,
                 burryOverlay.width,
                 burryOverlay.height
             )
         }
 
         TimelineScrollbar {
             id: scrollbar
             z: 1000
             width: 10
             height: parent.height
             anchors.right: parent.right
             display: treeView.moving
             model: CategorizedBookmarkModel
             view: treeView
 
             onWidthChanged: {
                 burryOverlay.width = scrollbar.fullWidth + 15
             }
 
             onOverlayVisibleChanged: {
                 burryOverlay.visible = overlayVisible
                 burryOverlay.opacity = overlayVisible ? 1 : 0
                 effectSource.visible = overlayVisible
             }
         }
     }
 }
diff --git a/src/delegates/kdepixmapmanipulation.cpp b/src/delegates/kdepixmapmanipulation.cpp
index de796eb0..ee68a59c 100644
--- a/src/delegates/kdepixmapmanipulation.cpp
+++ b/src/delegates/kdepixmapmanipulation.cpp
@@ -1,429 +1,429 @@
 /****************************************************************************
  *   Copyright (C) 2013-2014 by Savoir-Faire Linux                          *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.com>                    *
  *                                                                          *
  *   This library is free software; you can redistribute it and/or          *
  *   modify it under the terms of the GNU Lesser General Public             *
  *   License as published by the Free Software Foundation; either           *
  *   version 2.1 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      *
  *   Lesser General Public License for more details.                        *
  *                                                                          *
  *   You should have received a copy of the GNU General Public License      *
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
  ***************************************************************************/
 #include "kdepixmapmanipulation.h"
 
 //Qt
 #include <QtCore/QSize>
 #include <QtCore/QBuffer>
 #include <QtGui/QColor>
 #include <QtGui/QPainter>
 #include <QtGui/QBitmap>
 #include <QtWidgets/QApplication>
 #include <QtGui/QImage>
 #include <QtGui/QPalette>
 #include <QtGui/QIcon>
 
 //KDE
 #include <KColorScheme>
 #include <klocalizedstring.h>
 
 
 //Ring
 #include <person.h>
 #include <contactmethod.h>
 #include <presencestatusmodel.h>
 #include <securityevaluationmodel.h>
 #include <collectioninterface.h>
 #include <useractionmodel.h>
 #include <session.h>
 #include <video/sourcemodel.h>
 #include <QStandardPaths>
 #include "icons/icons.h"
 #include "qmlwidgets/cmiconengine.h"
 #include "qmlwidgets/personiconengine.h"
 #include <qrc_assets.cpp>
 #include "../callview/imageprovider.h"
 
 
 static const char* callStateIcons[] = {
    RingIcons::DIALING       , /* NEW            */
    RingIcons::INCOMING      , /* INCOMING       */
    RingIcons::RINGING       , /* RINGING        */
    RingIcons::CURRENT       , /* CURRENT        */
    RingIcons::DIALING       , /* DIALING        */
    RingIcons::HOLD          , /* HOLD           */
    RingIcons::FAILURE       , /* FAILURE        */
    RingIcons::BUSY          , /* BUSY           */
    RingIcons::TRANSFER      , /* TRANSFERRED    */
    RingIcons::TRANSF_HOLD   , /* TRANSF_HOLD    */
    ""                       , /* OVER           */
    RingIcons::FAILURE       , /* ERROR          */
    RingIcons::CONFERENCE    , /* CONFERENCE     */
    RingIcons::HOLD          , /* CONFERENCE_HOLD*/
    RingIcons::INITIALIZATION, /* INITIALIZATION */
    RingIcons::FAILURE       , /* ABORTED        */
    RingIcons::CONNECTED     , /* CONNECTED      */
 };
 
 KDEPixmapManipulation::KDEPixmapManipulation() : QObject(), Interfaces::PixmapManipulatorI()
 {
 
 }
 
 QVariant KDEPixmapManipulation::contactPhoto(Person* c, const QSize& size, bool displayPresence)
 {
    Q_UNUSED(displayPresence)
    Q_UNUSED(size)
 
    // Keep the engine cached
    if (c->property("icon").canConvert<QIcon>())
       return c->property("icon");
 
    auto icn = QIcon(new PersonIconEngine(c));
    c->setProperty("icon", icn);
 
    return icn;
 }
 
 QVariant KDEPixmapManipulation::callPhoto(const ContactMethod* n, const QSize& size, bool displayPresence)
 {
    // Use the photo when available
    if (n->contact())
       return contactPhoto(n->contact(), size, displayPresence);
 
    // Keep the engine cached
    if (n->property("icon2").canConvert<QIcon>())
       return n->property("icon2");
 
    auto cm = const_cast<ContactMethod*>(n);
 
    QIcon icn(new CMIconEngine(cm));
    cm->setProperty("icon2", icn);
 
    return icn;
 }
 
 QVariant KDEPixmapManipulation::callPhoto(Call* c, const QSize& size, bool displayPresence)
 {
    if (c->peerContactMethod()->contact()) {
       return contactPhoto(c->peerContactMethod()->contact(),size,displayPresence);
    }
    else
       return QIcon(callStateIcons[(int)c->state()]);
 }
 
 QVariant KDEPixmapManipulation::numberCategoryIcon(const QVariant& p, const QSize& size, bool displayPresence, bool isPresent)
 {
    Q_UNUSED(size);
    if (displayPresence) {
       QPixmap pxm;
       if(p.isValid())
          pxm = qvariant_cast<QPixmap>(p);
       else
          pxm = QPixmap(QStringLiteral(":/mini/icons/miniicons/call.png"));
       QPainter painter(&pxm);
       painter.setOpacity(0.3);
       painter.setCompositionMode(QPainter::CompositionMode_SourceAtop);
       painter.fillRect(pxm.rect(),isPresent?Qt::green:Qt::red);
       return pxm;
    }
    if (p.isValid())
       return qvariant_cast<QPixmap>(p);
    return QPixmap(QStringLiteral(":/mini/icons/miniicons/call.png"));
 }
 
 QVariant KDEPixmapManipulation::securityIssueIcon(const QModelIndex& index)
 {
    SecurityEvaluationModel::Severity sev = qvariant_cast<SecurityEvaluationModel::Severity>(index.data((int)SecurityEvaluationModel::Role::Severity));
    switch(sev) {
       case SecurityEvaluationModel::Severity::INFORMATION:
          return QIcon::fromTheme(QStringLiteral("dialog-information"));
       case SecurityEvaluationModel::Severity::WARNING:
          return QIcon::fromTheme(QStringLiteral("dialog-warning"));
       case SecurityEvaluationModel::Severity::ISSUE:
       case SecurityEvaluationModel::Severity::FATAL_WARNING:
          return QIcon::fromTheme(QStringLiteral("view-barcode"));
       case SecurityEvaluationModel::Severity::ERROR:
          return QIcon::fromTheme(QStringLiteral("dialog-error"));
       case SecurityEvaluationModel::Severity::UNSUPPORTED:
       case SecurityEvaluationModel::Severity::COUNT__:
          break;
    }
    return QVariant();
 }
 
 QByteArray KDEPixmapManipulation::toByteArray(const QVariant& pxm, const QString& type)
 {
    //Preparation of our QPixmap
    QByteArray bArray;
    QBuffer buffer(&bArray);
    buffer.open(QIODevice::WriteOnly);
 
    //PNG ?
    (qvariant_cast<QPixmap>(pxm)).save(&buffer, type.toLatin1());
    buffer.close();
 
    return bArray;
 }
 
 QVariant KDEPixmapManipulation::personPhoto(const QByteArray& data, const QString& type)
 {
    if (data.isEmpty()) {
       return {};
    }
 
    QImage image;
    //For now, ENCODING is only base64 and image type PNG or JPG
    const bool ret = image.loadFromData(QByteArray::fromBase64(data),type.toLower().toLatin1());
 
    if (!ret) {
       qDebug() << "vCard image loading failed";
       return {};
    } //TODO check is width || height == 0
 
    return QPixmap::fromImage(image);
 }
 
 QVariant KDEPixmapManipulation::userActionIcon(const UserActionElement& state) const
 {
 
    switch(state.action) {
       case UserActionModel::Action::ACCEPT          :
          return QIcon(":/sharedassets/phone_light/accept.svg"   );
       case UserActionModel::Action::HOLD            :
          return QIcon(":/sharedassets/phone_light/hold.svg"     );
       case UserActionModel::Action::MUTE_AUDIO      :
          return QIcon(":/sharedassets/phone_light/mic_off.svg"  );
       case UserActionModel::Action::MUTE_VIDEO      :
          return QIcon(":/sharedassets/phone_light/mic_off.svg"  );
       case UserActionModel::Action::SERVER_TRANSFER :
          return QIcon(":/sharedassets/phone_light/transfert.svg" );
       case UserActionModel::Action::RECORD          :
          return QIcon(":/sharedassets/phone_light/record_call.svg"   );
       case UserActionModel::Action::HANGUP          :
          return QIcon(":/sharedassets/phone_light/refuse.svg"   );
       case UserActionModel::Action::JOIN            :
          return QIcon();
       case UserActionModel::Action::ADD_NEW         :
          return QIcon(":/sharedassets/phone_light/accept.svg"   );
       case UserActionModel::Action::ADD_CONTACT:
       case UserActionModel::Action::ADD_TO_CONTACT:
       case UserActionModel::Action::ADD_CONTACT_METHOD:
          return QIcon::fromTheme(QStringLiteral("contact-new"));
       case UserActionModel::Action::DELETE_CONTACT:
          return QIcon::fromTheme(QStringLiteral("list-remove-user"), QIcon::fromTheme(QStringLiteral("edit-delete")));
       case UserActionModel::Action::EMAIL_CONTACT:
          return QIcon::fromTheme(QStringLiteral("mail-message-new"));
       case UserActionModel::Action::BOOKMARK:
          return QIcon::fromTheme(QStringLiteral("bookmarks"));
       case UserActionModel::Action::VIEW_CHAT_HISTORY:
          return QIcon::fromTheme(QStringLiteral("view-history"));
       case UserActionModel::Action::REMOVE_HISTORY :
          return QIcon::fromTheme(QStringLiteral("list-remove"));
       case UserActionModel::Action::CALL_CONTACT:
          return QIcon::fromTheme(QStringLiteral("call-start"));
       case UserActionModel::Action::EDIT_CONTACT:
          return QIcon::fromTheme(QStringLiteral("contact-new"));
       case UserActionModel::Action::COPY_CONTACT:
          return QIcon::fromTheme(QStringLiteral("edit-copy"));
       case UserActionModel::Action::TOGGLE_VIDEO:
       case UserActionModel::Action::MARK_AS_CONSUMED:
       case UserActionModel::Action::COUNT__:
          break;
    };
 
    return QVariant();
 }
 
 QVariant KDEPixmapManipulation::collectionIcon(const CollectionInterface* interface, Interfaces::PixmapManipulatorI::CollectionIconHint hint) const
 {
    Q_UNUSED(interface)
 
    switch(hint) {
       case Interfaces::PixmapManipulatorI::CollectionIconHint::CONTACT:
          return QIcon::fromTheme(QStringLiteral("folder-publicshare"));
       case Interfaces::PixmapManipulatorI::CollectionIconHint::HISTORY:
          return QIcon::fromTheme(QStringLiteral("view-history"));
       case Interfaces::PixmapManipulatorI::CollectionIconHint::BOOKMARK:
          return QIcon::fromTheme(QStringLiteral("folder-bookmark"));
       case Interfaces::PixmapManipulatorI::CollectionIconHint::CERTIFICATE:
          return QIcon::fromTheme(QStringLiteral("certificate-server"));
       case Interfaces::PixmapManipulatorI::CollectionIconHint::RECORDING:
          return QIcon(":/sharedassets/phone_dark/mailbox.svg");
       case Interfaces::PixmapManipulatorI::CollectionIconHint::RINGTONE:
       case Interfaces::PixmapManipulatorI::CollectionIconHint::NONE:
       case Interfaces::PixmapManipulatorI::CollectionIconHint::PROFILE:
       case Interfaces::PixmapManipulatorI::CollectionIconHint::PHONE_NUMBER:
       case Interfaces::PixmapManipulatorI::CollectionIconHint::ACCOUNT:
       case Interfaces::PixmapManipulatorI::CollectionIconHint::MACRO:
          break;
    };
 
    return QVariant();
 }
 
 const char* KDEPixmapManipulation::icnPath[2][2] = {
    {
    /* INCOMING  */ RingIcons::HISTORY_INCOMING  ,
    /* OUTGOING  */ RingIcons::HISTORY_OUTGOING  ,
    },
    {
    /* MISSED_IN */ RingIcons::HISTORY_MISSED    ,
    /* MISSED_OUT*/ RingIcons::HISTORY_MISSED_OUT,
    }
 };
 
 QVariant KDEPixmapManipulation::securityLevelIcon(const SecurityEvaluationModel::SecurityLevel level) const
 {
    switch (level) {
       case SecurityEvaluationModel::SecurityLevel::COUNT__:
       case SecurityEvaluationModel::SecurityLevel::NONE      :
          return QIcon(":/sharedassets/security/lock_off.svg");
       case SecurityEvaluationModel::SecurityLevel::WEAK      :
       case SecurityEvaluationModel::SecurityLevel::MEDIUM    :
          return QIcon(":/sharedassets/security/lock_unconfirmed.svg");
       case SecurityEvaluationModel::SecurityLevel::ACCEPTABLE:
       case SecurityEvaluationModel::SecurityLevel::STRONG    :
       case SecurityEvaluationModel::SecurityLevel::COMPLETE  :
          return QIcon(":/sharedassets/security/lock_confirmed.svg");
    }
 
    return QVariant();
 }
 
-QVariant KDEPixmapManipulation::historySortingCategoryIcon(const CategorizedHistoryModel::SortedProxy::Categories cat) const
+QVariant KDEPixmapManipulation::historySortingCategoryIcon(const CallHistoryModel::SortedProxy::Categories cat) const
 {
    switch(cat) {
-      case CategorizedHistoryModel::SortedProxy::Categories::DATE      :
+      case CallHistoryModel::SortedProxy::Categories::DATE      :
          break;
-      case CategorizedHistoryModel::SortedProxy::Categories::NAME      :
+      case CallHistoryModel::SortedProxy::Categories::NAME      :
          return QIcon::fromTheme(QStringLiteral("folder-publicshare"));
-      case CategorizedHistoryModel::SortedProxy::Categories::POPULARITY:
+      case CallHistoryModel::SortedProxy::Categories::POPULARITY:
          return QIcon::fromTheme(QStringLiteral("folder-bookmark"));
-      case CategorizedHistoryModel::SortedProxy::Categories::LENGTH    :
-      case CategorizedHistoryModel::SortedProxy::Categories::SPENT_TIME:
-      case CategorizedHistoryModel::SortedProxy::Categories::COUNT__   :
+      case CallHistoryModel::SortedProxy::Categories::LENGTH    :
+      case CallHistoryModel::SortedProxy::Categories::SPENT_TIME:
+      case CallHistoryModel::SortedProxy::Categories::COUNT__   :
          break;
    }
    return QVariant();
 }
 
-QVariant KDEPixmapManipulation::contactSortingCategoryIcon(const CategorizedContactModel::SortedProxy::Categories cat) const
+QVariant KDEPixmapManipulation::contactSortingCategoryIcon(const ContactModel::SortedProxy::Categories cat) const
 {
    switch(cat) {
-      case CategorizedContactModel::SortedProxy::Categories::NAME        :
+      case ContactModel::SortedProxy::Categories::NAME        :
          return QIcon::fromTheme(QStringLiteral("folder-publicshare"));
-      case CategorizedContactModel::SortedProxy::Categories::RECENTLYUSED:
+      case ContactModel::SortedProxy::Categories::RECENTLYUSED:
          return QIcon::fromTheme(QStringLiteral("view-history"));
-      case CategorizedContactModel::SortedProxy::Categories::ORGANIZATION:
-      case CategorizedContactModel::SortedProxy::Categories::GROUP       :
-      case CategorizedContactModel::SortedProxy::Categories::DEPARTMENT  :
-      case CategorizedContactModel::SortedProxy::Categories::COUNT__     :
+      case ContactModel::SortedProxy::Categories::ORGANIZATION:
+      case ContactModel::SortedProxy::Categories::GROUP       :
+      case ContactModel::SortedProxy::Categories::DEPARTMENT  :
+      case ContactModel::SortedProxy::Categories::COUNT__     :
          break;
    }
    return QVariant();
 }
 
 QVariant KDEPixmapManipulation::videoDeviceIcon(const QModelIndex& idx) const
 {
    switch (idx.row()) {
       case Video::SourceModel::ExtendedDeviceList::NONE:
          return QIcon::fromTheme(QStringLiteral("camera-off"));
       case Video::SourceModel::ExtendedDeviceList::SCREEN:
          return QIcon::fromTheme(QStringLiteral("video-display"));
       case Video::SourceModel::ExtendedDeviceList::FILE:
          return QIcon::fromTheme(QStringLiteral("video-mp4"));
       default:
          return QIcon::fromTheme(QStringLiteral("camera-on"));
    }
 
    return {};
 }
 
 QString KDEPixmapManipulation::takeSnapshot(Call* call)
 {
    return ImageProvider::takeSnapshot(call);
 }
 
 QVariant KDEPixmapManipulation::decorationRole(const QModelIndex& index)
 {
    if (!index.isValid())
       return QVariant();
 
    const QVariant tv = index.data(static_cast<int>(Ring::Role::ObjectType));
 
    if (!tv.canConvert<Ring::ObjectType>())
       return QVariant();
 
    const Ring::ObjectType type = qvariant_cast<Ring::ObjectType>(tv);
 
    switch (type) {
       case Ring::ObjectType::Person         : {
 
          Person* p = qvariant_cast<Person*>(
             index.data(static_cast<int>(Ring::Role::Object))
          );
 
          return contactPhoto(p, QSize(22,22), true);
          }
       case Ring::ObjectType::ContactMethod  : {
 
          const ContactMethod* cm = qvariant_cast<ContactMethod*>(
             index.data(static_cast<int>(Ring::Role::Object))
          );
 
          return callPhoto(cm, QSize(22,22), true);
          }
       case Ring::ObjectType::Call           : {
 
          const Call* c = qvariant_cast<Call*>(
             index.data(static_cast<int>(Ring::Role::Object))
          );
 
          return callPhoto(c->peerContactMethod(), QSize(22,22), true);
          }
       case Ring::ObjectType::Media          : //TODO
       case Ring::ObjectType::Certificate    :
       case Ring::ObjectType::ContactRequest :
       case Ring::ObjectType::Event :
       case Ring::ObjectType::Individual :
       case Ring::ObjectType::COUNT__        :
          break;
    }
 
    return QVariant();
 }
 
 QVariant KDEPixmapManipulation::decorationRole(const Call* c)
 {
    return callPhoto(c->peerContactMethod(), QSize(22,22), true);
 }
 
 QVariant KDEPixmapManipulation::decorationRole(const ContactMethod* cm)
 {
    if (!cm)
       return {};
 
    return callPhoto((ContactMethod*)cm, QSize(22,22), true);
 }
 
 QVariant KDEPixmapManipulation::decorationRole(const Person* p)
 {
    if (!p)
       return {};
 
    return contactPhoto((Person*)p, QSize(22,22), true);
 }
 
 QVariant KDEPixmapManipulation::decorationRole(const Account* a)
 {
     Q_UNUSED(a)
     return {};
 }
 
 // kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/delegates/kdepixmapmanipulation.h b/src/delegates/kdepixmapmanipulation.h
index b0be945a..fdab34ed 100644
--- a/src/delegates/kdepixmapmanipulation.h
+++ b/src/delegates/kdepixmapmanipulation.h
@@ -1,75 +1,75 @@
 /****************************************************************************
  *   Copyright (C) 2013-2014 by Savoir-Faire Linux                          *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.com>                    *
  *                                                                          *
  *   This library is free software; you can redistribute it and/or          *
  *   modify it under the terms of the GNU Lesser General Public             *
  *   License as published by the Free Software Foundation; either           *
  *   version 2.1 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      *
  *   Lesser General Public License for more details.                        *
  *                                                                          *
  *   You should have received a copy of the GNU General Public License      *
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
  ***************************************************************************/
 #ifndef KDEPIXMAPMANIPULATION_H
 #define KDEPIXMAPMANIPULATION_H
 
 #include <interfaces/pixmapmanipulatori.h>
 #include <call.h>
 // #include "matrixutils.h"
 
 class Person;
 
 
 class KDEPixmapManipulation final : public QObject ,public Interfaces::PixmapManipulatorI {
    Q_OBJECT
 public:
    KDEPixmapManipulation();
    QVariant contactPhoto(Person* c, const QSize& size, bool displayPresence = true) override;
 
    virtual QVariant callPhoto(const ContactMethod* n, const QSize& size, bool displayPresence = true) override;
 
    virtual QVariant callPhoto(Call* c, const QSize& size, bool displayPresence = true) override;
 
    virtual QByteArray toByteArray(const QVariant& pxm, const QString& type = QStringLiteral("PNG")) override;
 
    virtual QVariant personPhoto(const QByteArray& data, const QString& type = QStringLiteral("PNG")) override;
 
    QVariant numberCategoryIcon(const QVariant& p, const QSize& size, bool displayPresence = false, bool isPresent = false) override;
 
    virtual QVariant securityIssueIcon(const QModelIndex& index) override;
 
    virtual QVariant userActionIcon(const UserActionElement& state) const override;
 
    virtual QVariant collectionIcon(const CollectionInterface* interface, Interfaces::PixmapManipulatorI::CollectionIconHint hint = Interfaces::PixmapManipulatorI::CollectionIconHint::NONE) const override;
 
    virtual QVariant securityLevelIcon(const SecurityEvaluationModel::SecurityLevel level) const override;
 
-   virtual QVariant historySortingCategoryIcon(const CategorizedHistoryModel::SortedProxy::Categories cat) const override;
+   virtual QVariant historySortingCategoryIcon(const CallHistoryModel::SortedProxy::Categories cat) const override;
 
-   virtual QVariant contactSortingCategoryIcon(const CategorizedContactModel::SortedProxy::Categories cat) const override;
+   virtual QVariant contactSortingCategoryIcon(const ContactModel::SortedProxy::Categories cat) const override;
 
    virtual QVariant videoDeviceIcon(const QModelIndex& idx) const override;
 
    virtual QString  takeSnapshot(Call* call) override;
 
    virtual QVariant decorationRole(const QModelIndex& index) override;
 
    virtual QVariant decorationRole(const Call*              c    ) override;
 
    virtual QVariant decorationRole(const ContactMethod*     cm   ) override;
 
    virtual QVariant decorationRole(const Person*            p    ) override;
 
    virtual QVariant decorationRole(const Account*           a    ) override;
 
    static const char* icnPath[2][2];
 };
 
 #endif // KDEPIXMAPMANIPULATION_H
 
 // kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/desktopview/qml/dockbar.qml b/src/desktopview/qml/dockbar.qml
index d0796026..96f20a0e 100644
--- a/src/desktopview/qml/dockbar.qml
+++ b/src/desktopview/qml/dockbar.qml
@@ -1,291 +1,291 @@
 /***************************************************************************
  *   Copyright (C) 2017 by Bluesystems                                     *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 3 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, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 import QtQuick 2.7
 import Ring 1.0
 import QtQuick.Layouts 1.0
 import QtQuick.Controls 2.0 as Controls
 import org.kde.kirigami 2.2 as Kirigami
 import QtQuick.Window 2.2
 import net.lvindustries.ringqtquick 1.0 as RingQtQuick
 import ContactView 1.0
 
 import DesktopView 1.0
 
 Item {
     id: topLevel
 
     width: Math.min(335, root.width-48) + dockBar.width
 
     property var newHolder: null
 
     function setCurrentIndex(index) {
         if (dockLoader.sourceComponent != timelineViewComponent)
             return
 
         dockLoader.item.setCurrentIndex(index)
     }
 
     signal timelineSelected()
 
     RowLayout {
         id: dockLayout
         spacing: 0
         anchors.fill: parent
 
         Image {
             id: dockBar
 
             property string selectedItem: "timeline"
 
             source: "gui/icons/assets/toolbar_bg.png"
             fillMode: Image.Tile
             width: 48
             height: parent.height
 
             Layout.fillHeight: true
             Layout.maximumWidth: width
 
             onSelectedItemChanged: {
                 switch(selectedItem) {
                     case "timeline":
                         dockLoader.sourceComponent = timelineViewComponent
                         break
                     case "call"    :
                         dockLoader.sourceComponent = dialViewComponent
                         break
                     case "contact" :
                         dockLoader.sourceComponent = contactViewComponent
                         break
                     case "bookmark":
                         dockLoader.sourceComponent = bookmarkViewComponent
                         break
                     case "history" :
                         dockLoader.sourceComponent = historyViewComponent
                         break
                 }
             }
 
             Behavior on width {
                 NumberAnimation {duration: 200;  easing.type: Easing.OutQuad }
             }
 
             DockModel {
                 id: icons
             }
 
             FontMetrics {
                 id: fontMetrics
             }
 
             Column {
                 Item {
                     width: dockBar.width
                     height: Math.max(
                         dockBar.width * 1.33,
                         availableAccounts.count*(dockBar.width+5) + 6
                     )
 
                     ListView {
                         y: 5
                         id: availableAccounts
-                        model: ProfileModel.availableProfileModel
+                        model: RingSession.profileModel.availableProfileModel
                         height: 200
                         spacing: 5
                         interactive: false
                         delegate: MouseArea {
                             width: dockBar.width
                             height: dockBar.width
                             ContactPhoto {
                                 anchors.centerIn: parent
                                 width: dockBar.width - 3
                                 height: dockBar.width - 3
                                 individual: object
                                 defaultColor: "#f2f2f2ff" //same as the SVG
                             }
                             onClicked: {
                                 var component = Qt.createComponent("PresenceSelector.qml")
                                 if (component.status == Component.Ready) {
                                     var window = component.createObject(applicationWindow().contentItem)
                                     window.individual = object
                                     window.open()
                                 }
                                 else
                                     console.log("ERROR", component.status, component.errorString())
                             }
                         }
                     }
 
                     Loader {
-                        active: availableAccounts.count == 0 || !ProfileModel.hasAvailableProfiles
+                        active: availableAccounts.count == 0 || !RingSession.profileModel.hasAvailableProfiles
                         anchors.centerIn: parent
                         sourceComponent: Rectangle {
                             height: 48
                             width: 48
                             border.width: 2
                             border.color: Kirigami.Theme.negativeTextColor
                             color: "transparent"
                             radius: 99
 
                             Image {
                                 anchors.fill: parent
                                 sourceSize.width: 48
                                 sourceSize.height: 48
                                 anchors.verticalCenter: parent.verticalCenter
                                 source: "image://SymbolicColorizer/:/sharedassets/outline/warning.svg"
                             }
                         }
                     }
 
                     Rectangle {
                         height: 1
                         width: parent.width
                         color: "#939393"
                         anchors.bottom: parent.bottom
                     }
                 }
 
                 Repeater {
                     model: icons
                     Rectangle {
                         id: actionIcon
                         color: dockBar.selectedItem == identifier ? "#111111" : "transparent"
                         height: dockBar.width + 10
                         width: dockBar.width
 
                         Image {
                             anchors.verticalCenter: parent.verticalCenter
                             source: decoration
                             width: 48
                             height: 48
                             sourceSize.width: 48
                             sourceSize.height: 48
                             fillMode: Image.PreserveAspectFit
                         }
 
                         MouseArea {
                             anchors.fill: parent
                             onClicked: {
                                 dockBar.selectedItem = identifier
                             }
                         }
 
                         Rectangle {
                             color: "red"
                             radius: 99
                             x: 2
                             y: 2
                             width: fontMetrics.height + 4
                             height: fontMetrics.height + 4
                             visible: activeCount > 0
                             Text {
                                 color: "white"
                                 anchors.centerIn: parent
                                 font.bold: true
                                 text: activeCount
                             }
                         }
                     }
                 }
             }
         }
 
         Component {
             id: timelineViewComponent
             PeersTimeline {
                 anchors.fill: parent
                 state: ""
                 onIndividualSelected: {
                     mainPage.setIndividual(ind)
                 }
             }
         }
         Component {
             id: dialViewComponent
             DialView {
                 anchors.fill: parent
                 onSelectCall: {
                     mainPage.showVideo(call)
                 }
             }
         }
         Component {
             id: contactViewComponent
             ContactList {
                 anchors.fill: parent
                 onIndividualSelected: {
                     mainPage.setIndividual(ind)
                 }
             }
         }
         Component {
             id: bookmarkViewComponent
             BookmarkList {
                 anchors.fill: parent
                 onContactMethodSelected: {
                     mainPage.setContactMethod(cm)
                 }
             }
         }
         Component {
             id: historyViewComponent
             HistoryTimeline {
                 anchors.fill: parent
                 onContactMethodSelected: {
                     mainPage.setContactMethod(cm)
                 }
             }
         }
 
         ColumnLayout {
             id: dockHolder
             width: Math.min(335, root.width-48)
             Layout.fillHeight: true
             visible: true
 
             // This is a placeholder for the searchbox
             Item {
                 Layout.fillWidth: true
                 Layout.minimumHeight: 32
                 Layout.maximumHeight: 32
             }
 
             Loader {
                 id: dockLoader
 
                 sourceComponent: timelineViewComponent
                 Layout.fillWidth: true
                 Layout.fillHeight: true
 
                 onItemChanged: {
                     if (item && sourceComponent == timelineViewComponent)
                         timelineSelected()
                 }
             }
         }
     }
 
     SearchOverlay {
         id: searchView
         source: parent
         anchors.fill: parent
         onContactMethodSelected: {
             mainPage.setContactMethod(cm)
             setCurrentIndex(RingSession.peersTimelineModel.individualIndex(cm.individual))
         }
     }
 }
diff --git a/src/dialview/qml/calldelegateitem.qml b/src/dialview/qml/calldelegateitem.qml
index d0d521a2..962e45b9 100644
--- a/src/dialview/qml/calldelegateitem.qml
+++ b/src/dialview/qml/calldelegateitem.qml
@@ -1,452 +1,452 @@
 /******************************************************************************
  *   Copyright (C) 2012 by Savoir-Faire Linux                                 *
  *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>   *
  *                                                                            *
  *   This library is free software; you can redistribute it and/or            *
  *   modify it under the terms of the GNU Lesser General Public               *
  *   License as published by the Free Software Foundation; either             *
  *   version 2.1 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        *
  *   Lesser General Public License for more details.                          *
  *                                                                            *
  *   You should have received a copy of the Lesser GNU General Public License *
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.    *
  *****************************************************************************/
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
 import Ring 1.0
 import RingQmlWidgets 1.0
 import org.kde.kirigami 2.2 as Kirigami
 import net.lvindustries.ringqtquick 1.0 as RingQtQuick
 import ContactView 1.0
 
 Rectangle {
     id: callDelegateItem
     anchors.margins: 2
     radius: 5
     border.width: 0
     color: selected ? activePalette.highlight: "transparent"
 
     height: content.implicitHeight + 20 + errorMessage.height
     property bool selected: object == RingSession.callModel.selectedCall
 
     property bool skipSelect: errorMessage.active || missedMessage.active
 
     property var labelColor: callDelegateItem.selected && !skipSelect ?
         activePalette.highlightedText : activePalette.text
 
     Drag.active: mouseArea.drag.active
     Drag.dragType: Drag.Automatic
     Drag.onDragStarted: {
         var ret = treeHelper.mimeData(model.rootIndex, index)
         Drag.mimeData = ret
     }
 
     Behavior on height {
         NumberAnimation {duration: 200;  easing.type: Easing.OutQuad }
     }
 
     TreeHelper {
         id: treeHelper
         model: RingSession.callModel
     }
 
     Drag.onDragFinished: {
         if (dropAction == Qt.MoveAction) {
             item.display = "hello"
         }
     }
 
     OutlineButton {
         id: closeButton
         label: "  "+i18n("Close")
         anchors.right: parent.right
         anchors.top: parent.top
         anchors.margins: 3
         height: 24
         visible: false
         z: 100
         alignment: Qt.AlignRight
 
         property string colString: selected && !skipSelect ?
             activePalette.highlightedText.toString(16) :
                 activePalette.text.toString(16)
 
         color: colString
 
         icon: "image://SymbolicColorizer/?color="+colString+";:/sharedassets/outline/close.svg"
         onClicked: {
             object.performAction(RingQtQuick.Call.REFUSE)
         }
     }
 
     RowLayout {
         id: content
         spacing: 10
         width: parent.width - 4
 
         ContactPhoto {
             contactMethod: object.peerContactMethod
             height:40
             width:40
             drawEmptyOutline: false
             defaultColor: labelColor
             anchors.verticalCenter: parent.verticalCenter
         }
 
         Column {
             Layout.fillWidth: true
 
             Text {
                 text: display
                 width: parent.width
                 wrapMode: Text.WrapAnywhere
                 color: labelColor
                 font.bold: true
             }
 
             Text {
                 text: model.number
                 width: parent.width
                 wrapMode: Text.WrapAnywhere
                 color: labelColor
             }
         }
     }
 
     DropArea {
         anchors.fill: parent
         keys: ["text/ring.call.id", "text/plain"]
         onEntered: {
             callDelegateItem.color = "red"
         }
         onExited: {
             callDelegateItem.color = "blue"
         }
         onDropped: {
             var formats = drop.formats
             var ret = {}
 
             ret["x-ring/dropaction"] = "join"
 
             // stupid lack of official APIs...
             for(var i=0; i<  formats.length; i++) {
                 ret[formats[i]] = drop.getDataAsArrayBuffer(formats[i])
             }
 
             treeHelper.dropMimeData2(ret, model.rootIndex, index)
         }
     }
 
     MouseArea {
         id: mouseArea
         anchors.fill: parent
         propagateComposedEvents: true
         onClicked: {
             mouse.accepted = true
             RingSession.callModel.selectedCall = object
             dialView.selectCall(object)
         }
         drag.target: callDelegateItem
     }
 
     Loader {
         id: completionLoader
         active: false
         opacity: 0
         anchors.bottom: parent.bottom
         anchors.bottomMargin: 10
         width: callDelegateItem.width
         height: 0
 
         Behavior on height {
             NumberAnimation {duration: 200;  easing.type: Easing.OutQuad }
         }
 
         Behavior on opacity {
             NumberAnimation {duration: 200;  easing.type: Easing.OutQuad }
         }
 
         sourceComponent: Component {
             ListView {
                 clip: true
                 anchors.fill: parent
                 anchors.margins: 10
                 spacing: 10
-                model: CompletionModel
+                model: RingSession.numberCompletionModel
                 currentIndex: completionSelection.currentIndex
                 delegate: Rectangle {
                     property bool selected: ListView.isCurrentItem
                     height: searchDelegate.height
                     width: callDelegateItem.width - 20
                     color: selected ? activePalette.highlightedText : "transparent"
                     border.width: 1
                     border.color: activePalette.highlightedText
                     radius: 5
                     clip: true
                     CompletionDelegate {
                         id: searchDelegate
                         showPhoto: false
                         showControls: false
                         showSeparator: false
                         labelHeight: fontMetrics.height
                     }
                 }
 
                 onCountChanged: {
                     completionLoader.height = Math.min(4, count)*(3*fontMetrics.height+12)
                     callDelegateItem.height = content.implicitHeight +
                         Math.min(4, count)*(3*fontMetrics.height+10) + 10
                 }
             }
         }
     }
 
     Loader {
         id: errorMessage
         anchors.top: content.bottom
         active: false
         width: parent.width
         height: active ? item.implicitHeight : 0
         sourceComponent: Component {
             CallError {
                 call: object
                 width: errorMessage.width
             }
         }
     }
 
     Loader {
         id: outgoingMessage
         anchors.top: content.bottom
         active: false
         width: parent.width
         height: active ? item.implicitHeight : 0
         sourceComponent: Component {
             OutgoingCall {
                 call: object
                 width: outgoingMessage.width
             }
         }
     }
 
     Loader {
         id: finishedMessage
         anchors.top: content.bottom
         active: false
         width: parent.width
         height: active ? item.implicitHeight : 0
         sourceComponent: Component {
             FinishedCall {
                 call: object
                 width: finishedMessage.width
             }
         }
     }
 
     Loader {
         id: currentMessage
         anchors.top: content.bottom
         active: false
         width: parent.width
         height: active ? item.implicitHeight : 0
         sourceComponent: Component {
             CurrentCall {
                 call: object
                 width: currentMessage.width
             }
         }
     }
 
     Loader {
         id: missedMessage
         active: false
         width: parent.width
         height: active ? item.implicitHeight : 0
         sourceComponent: Component {
             MissedCall {
                 call: object
                 width: missedMessage.width
             }
         }
     }
 
     Loader {
         id: rigningAnimation
         active: false
         width: parent.width
         height: active ? 32 : 0
         anchors.top: content.bottom
         anchors.horizontalCenter: parent.horizontalCenter
         sourceComponent: Component {
             IncomingCall {
                 //call: object
                 width: rigningAnimation.width
             }
         }
     }
 
     StateGroup {
         id: stateGroup
         states: [
             State {
                 name: ""
 
                 PropertyChanges {
                     target: callDelegateItem
                     border.width: 0
                 }
 
             },
             State {
                 name: "dialing"
                 when: selected && object.state == RingQtQuick.Call.DIALING
                 PropertyChanges {
                     target: callDelegateItem
                     border.width: 0
                     height: content.implicitHeight +
                         Math.min(4, count)*(3*fontMetrics.height+10) + 10
                 }
                 PropertyChanges {
                     target: completionLoader
                     active: true
                     opacity: 1
                     height: Math.min(4, count)*(3*fontMetrics.height+10) + 10
                 }
                 PropertyChanges {
                     target: closeButton
                     visible: false
                 }
             },
             State {
                 name: "error"
                 when: lifeCycleState == RingQtQuick.Call.FINISHED && object.state != RingQtQuick.Call.OVER
                     && object.state != RingQtQuick.Call.ABORTED
 
                 PropertyChanges {
                     target: errorMessage
                     active: true
                 }
 
                 PropertyChanges {
                     target: callDelegateItem
                     color: "#33ff0000"
                     border.width: 1
                     border.color: "#55ff0000"
                 }
 
                 PropertyChanges {
                     target: closeButton
                     visible: true
                 }
             },
             State {
                 name: "missed"
                 when: object.state == RingQtQuick.Call.OVER && object.missed
 
                 PropertyChanges {
                     target: missedMessage
                     active: true
                 }
                 PropertyChanges {
                     target: content
                     visible: false
                 }
 
                 PropertyChanges {
                     target: callDelegateItem
                     height: missedMessage.height
                     color: "#33ff0000"
                     border.width: 1
                     border.color: "#55ff0000"
                 }
 
                 PropertyChanges {
                     target: closeButton
                     visible: true
                 }
             },
             State {
                 name: "incoming"
                 when: object.state == 1/*iNCOMING*/
 
                 PropertyChanges {
                     target: callDelegateItem
                     border.width: 0
                     height: rigningAnimation.height + content.implicitHeight + 3
                 }
 
                 PropertyChanges {
                     target: rigningAnimation
                     active: true
                 }
                 PropertyChanges {
                     target: closeButton
                     visible: false
                 }
             },
             State {
                 name: "outgoing"
                 when: object.lifeCycleState == RingQtQuick.Call.INITIALIZATION && object.direction == 1/*OUTGOING*/
 
                 PropertyChanges {
                     target: callDelegateItem
                     border.width: 0
                     height: outgoingMessage.height + content.implicitHeight
                 }
 
                 PropertyChanges {
                     target: outgoingMessage
                     active: true
                 }
                 PropertyChanges {
                     target: closeButton
                     visible: false
                 }
             },
             State {
                 name: "finished"
                 when: object.state == RingQtQuick.Call.OVER
 
                 PropertyChanges {
                     target: callDelegateItem
                     border.width: 0
                     height: finishedMessage.height + content.implicitHeight
                 }
 
                 PropertyChanges {
                     target: finishedMessage
                     active: true
                 }
                 PropertyChanges {
                     target: closeButton
                     visible: true
                 }
             },
             State {
                 name: "current"
                 when: object.lifeCycleState == RingQtQuick.Call.PROGRESS
 
                 PropertyChanges {
                     target: callDelegateItem
                     border.width: 0
                     height: currentMessage.height + content.implicitHeight
                 }
 
                 PropertyChanges {
                     target: currentMessage
                     active: true
                 }
                 PropertyChanges {
                     target: closeButton
                     visible: false
                 }
             }
         ]
     }
 
 } //Call delegate
 
diff --git a/src/dialview/qml/dialview.qml b/src/dialview/qml/dialview.qml
index 0b22f512..17daffa3 100644
--- a/src/dialview/qml/dialview.qml
+++ b/src/dialview/qml/dialview.qml
@@ -1,196 +1,196 @@
 /***************************************************************************
  *   Copyright (C) 2017 by Bluesystems                                     *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 3 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, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 import QtQuick 2.7
 import Ring 1.0
 import QtQuick.Layouts 1.0
 import org.kde.kirigami 2.2 as Kirigami
 
 import RingQmlWidgets 1.0
 import net.lvindustries.ringqtquick 1.0 as RingQtQuick
 
 FocusScope {
     id: dialView
     focus: true
     anchors.fill: parent
 
     signal selectCall(RingQtQuick.Call call)
 
     SystemPalette {
         id: inactivePalette
         colorGroup: SystemPalette.Disabled
     }
 
     SystemPalette {
         id: activePalette
         colorGroup: SystemPalette.Active
     }
 
     FontMetrics {
         id: fontMetrics
     }
 
     TreeHelper {
         id: completionSelection
-        selectionModel: CompletionModel.selectionModel
+        selectionModel: RingSession.numberCompletionModel.selectionModel
     }
 
     CallList {
         anchors.fill: parent
     }
 
     DialPad {
         width: parent.width
         visible: RingSession.callModel.supportsDTMF
         height: 200
         anchors.horizontalCenter: dialView.horizontalCenter
         anchors.bottom: actionToolbar.top
         anchors.bottomMargin: 50
     }
 
     ActionToolbar {
         id: actionToolbar
         width: parent.width
         anchors.bottom: parent.bottom
     }
 
     function selectPrevious(call) {
         if (call.state == RingQtQuick.Call.DIALING && completionSelection.selectPrevious())
             return
 
         completionSelection.clearSelection()
 
         var idx = RingSession.callModel.getIndex(call)
 
         if (!idx.valid)
             return
 
         var directPrev = RingSession.callModel.index(idx.row-1, 0, idx.parent)
 
         var nextCall = RingSession.callModel.getCall(directPrev)
 
         if (!nextCall)
             return
 
         RingSession.callModel.selectedCall = nextCall
 
         dialView.selectCall(nextCall)
     }
 
     function selectNext(call) {
         if (call.state == RingQtQuick.Call.DIALING && completionSelection.selectNext())
             return
 
         completionSelection.clearSelection()
 
         var idx = RingSession.callModel.getIndex(call)
 
         if (!idx.valid)
             return
 
         var directPrev = RingSession.callModel.index(idx.row+1, 0, idx.parent)
 
         var nextCall = RingSession.callModel.getCall(directPrev)
 
         if (!nextCall)
             return
 
         RingSession.callModel.selectedCall = nextCall
 
         dialView.selectCall(nextCall)
     }
 
     function performCall() {
         var call = RingSession.callModel.selectedCall
 
         if (!call) {
             call = RingSession.callModel.dialingCall()
             RingSession.callModel.selectedCall = call
         }
 
         // Apply the auto completion
-        if (call.state == RingQtQuick.Call.DIALING && CompletionModel.selectedContactMethod)
-            call.peerContactMethod = CompletionModel.selectedContactMethod
+        if (call.state == RingQtQuick.Call.DIALING && RingSession.numberCompletionModell.selectedContactMethod)
+            call.peerContactMethod = RingSession.ompletionModel.selectedContactMethod
 
         call.performAction(RingQtQuick.Call.ACCEPT)
     }
 
 
     function getCall() {
         var call = RingSession.callModel.selectedCall
 
         if (!call) {
             call = RingSession.callModel.dialingCall()
             RingSession.callModel.selectedCall = call
         }
 
         return call
     }
 
     Keys.onPressed: {
         switch (event.key) {
             case Qt.Key_Up:
                 selectPrevious(getCall())
                 break
             case Qt.Key_Down:
                 selectNext(getCall())
                 break
             case Qt.Key_Escape:
                 getCall().performAction(RingQtQuick.Call.REFUSE)
                 break
             case Qt.Key_Backspace:
                 getCall().backspaceItemText()
                 break;
             case Qt.Key_Return:
             case Qt.Key_Enter:
                 performCall()
                 break
             default:
                 // Prevent "control" from creating a dialing call
                 if (event.text == "")
                     return
 
                 var call = getCall()
 
                 call.appendText(event.text)
                 call.playDTMF(event.text)
         }
     }
 
     Connections {
         target: RingSession.callModel
         onCallAttentionRequest: {
             RingSession.callModel.selectedCall = call
         }
     }
 
     Component.onCompleted: {
         dialView.forceActiveFocus()
     }
 
     MouseArea {
         z: 9999
         anchors.fill: parent
         propagateComposedEvents: true
         onClicked: {
             mouse.accepted = false
             mouse.refused = true
             dialView.focus = true
             dialView.forceActiveFocus()
         }
     }
 }
diff --git a/src/klib/akonadibackend.cpp b/src/klib/akonadibackend.cpp
index 07a26b0f..e2a71079 100644
--- a/src/klib/akonadibackend.cpp
+++ b/src/klib/akonadibackend.cpp
@@ -1,595 +1,595 @@
 /****************************************************************************
  *   Copyright (C) 2011-2015 by Savoir-Faire Linux                          *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.com>                    *
  *                                                                          *
  *   This library is free software; you can redistribute it and/or          *
  *   modify it under the terms of the GNU Lesser General Public             *
  *   License as published by the Free Software Foundation; either           *
  *   version 2.1 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      *
  *   Lesser General Public License for more details.                        *
  *                                                                          *
  *   You should have received a copy of the GNU General Public License      *
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
  ***************************************************************************/
 
 //Parent
 #include "akonadibackend.h"
 
 //Qt
 #include <QtCore/QPointer>
 #include <QtWidgets/QVBoxLayout>
 #include <QtWidgets/QDialog>
 #include <QtWidgets/QDialogButtonBox>
 #include <QtWidgets/QPushButton>
 
 //KDE
 #include <KJob>
 #include <KLocalizedString>
 #include <AkonadiCore/Control>
 #include <AkonadiCore/CollectionFilterProxyModel>
 // #include <AkonadiCore/Kmime/MessageModel>
 #include <AkonadiCore/RecursiveItemFetchJob>
 #include <AkonadiCore/ItemFetchJob>
 #include <AkonadiCore/ItemFetchScope>
 #include <AkonadiCore/CollectionFetchJob>
 #include <AkonadiCore/CollectionFetchScope>
 #include <Akonadi/Contact/ContactEditor>
 #include <Akonadi/Contact/ContactEditorDialog>
 #include <AkonadiCore/Session>
 #include <AkonadiCore/Monitor>
 #include <AkonadiCore/ChangeRecorder>
 #include <AkonadiCore/ItemDeleteJob>
 #include <AkonadiCore/EntityDisplayAttribute>
 #include <AkonadiCore/EntityTreeModel>
 #include <kcontacts/addressee.h>
 #include <kcontacts/addresseelist.h>
 #include <kcontacts/contactgroup.h>
 
 //Ring library
 #include "person.h"
 #include "accountmodel.h"
 #include "account.h"
 #include "call.h"
 #include "callmodel.h"
 #include "contactmethod.h"
 #include "individualdirectory.h"
 #include "numbercategorymodel.h"
 #include "collectioninterface.h"
 #include "numbercategory.h"
-#include "personmodel.h"
+#include "persondirectory.h"
 #include "interfaces/itemmodelstateserializeri.h"
 #include "globalinstances.h"
 
 // Ring-KDE
 #include "kcfg_settings.h"
 
 Akonadi::Session*          AkonadiBackend::m_spSession = nullptr;
 Akonadi::EntityTreeModel*  AkonadiBackend::m_spModel   = nullptr;
 QHash<Akonadi::Collection::Id, AkonadiBackend*> AkonadiBackend::m_hParentLookup;
 
 class AkonadiEditor : public CollectionEditor<Person>
 {
 public:
    AkonadiEditor(CollectionMediator<Person>* m) : CollectionEditor<Person>(m) {}
    ~AkonadiEditor() {
       m_lBackendPersons.clear();
       m_ItemHash.clear();
       m_AddrHash.clear();
    }
    virtual bool save       ( const Person* item ) override;
    virtual bool addExisting( const Person* item ) override;
    virtual bool remove     ( const Person* item ) override;
    virtual bool edit       ( Person*       item ) override;
    virtual bool addNew     ( Person*       item ) override;
 
    QHash<QString,KContacts::Addressee> m_AddrHash       ;
    QHash<QString,Akonadi::Item>        m_ItemHash       ;
    QVector<Person*>                    m_lBackendPersons;
 private:
    virtual QVector<Person*> items() const override;
 };
 
 void AkonadiBackend::digg(QAbstractItemModel* model, const QModelIndex& idx)
 {
    if (!model)
       return;
 
    if (idx.isValid()) {
       auto col = idx.data( Akonadi::EntityTreeModel::CollectionRole ).value<Akonadi::Collection>();
 
       if (col.isValid()) {
-         auto col2 = PersonModel::instance().addCollection<AkonadiBackend,Akonadi::Collection*>(&col);
+         auto col2 = Session::instance()->personDirectory()->addCollection<AkonadiBackend,Akonadi::Collection*>(&col);
          if (col2 && col2->isEnabled())
             col2->load();
       }
    }
 
    for (int i = 0;i < model->rowCount(idx);i++) {
       QModelIndex current = model->index(i,0,idx);
       digg(model, current);
    }
 }
 
 void AkonadiBackend::slotRowsInserted(const QModelIndex& parent, int start, int end)
 {
    for (int i = start; i <= end; i++) {
       digg(m_spModel, m_spModel->index(i,0, parent));
    }
 }
 
 // Watch and digg the EntityTreeModel to get the collection list
 void AkonadiBackend::initCollections()
 {
    if (!m_spSession)
       m_spSession = new Akonadi::Session("ring-kde");
 
    auto changeRecorder = new Akonadi::ChangeRecorder();
 
    changeRecorder->setCollectionMonitored( Akonadi::Collection::root() );
    changeRecorder->setMimeTypeMonitored( "text/directory" );
    changeRecorder->setSession( m_spSession );
 
    m_spModel = new Akonadi::EntityTreeModel( changeRecorder, changeRecorder );
    m_spModel->setItemPopulationStrategy( Akonadi::EntityTreeModel::NoItemPopulation );
 
    QObject::connect(m_spModel, &QAbstractItemModel::rowsInserted, &slotRowsInserted);
 
    digg(m_spModel, QModelIndex());
 }
 
 ///Constructor
 AkonadiBackend::AkonadiBackend(CollectionMediator<Person>* mediator, Akonadi::Collection* parentCol) : QObject(mediator->model()),
    CollectionInterface(new AkonadiEditor(mediator),m_hParentLookup[parentCol->parentCollection().id()]),m_pJob{},m_pMediator(mediator),
   m_pMonitor(nullptr),m_isEnabled(false),m_wasEnabled(false)
 {
    if (!m_spSession)
       m_spSession = new Akonadi::Session( "Ring::instance" );
    setObjectName(parentCol->name());
    m_Coll = *parentCol;
    m_hParentLookup[m_Coll.id()] = this;
 } //AkonadiBackend
 
 
 
 ///Destructor
 AkonadiBackend::~AkonadiBackend()
 {
    if (m_pJob)
       delete m_pJob;
    if (m_pMonitor)
       delete m_pMonitor;
 }
 
 bool AkonadiEditor::save(const Person* item)
 {
    Q_UNUSED(item)
    return false;
 }
 
 bool AkonadiEditor::addExisting(const Person* item)
 {
    Q_UNUSED(item)
    return false;
 }
 
 bool AkonadiEditor::remove(const Person* c)
 {
    if (!c)
       return false;
    Akonadi::Item item = m_ItemHash[c->uid()];
    Akonadi::ItemDeleteJob *job = new Akonadi::ItemDeleteJob( item );
    job->exec();
    return true;
 }
 
 void applyNativeEdit()
 {
    
 }
 
 bool AkonadiEditor::edit( Person* contact)
 {
    Akonadi::Item item = m_ItemHash[contact->uid()];
    if (!(item.hasPayload<KContacts::Addressee>() && item.payload<KContacts::Addressee>().uid() == contact->uid())) {
       qDebug() << "Person not found";
       return false ;
    }
 
    if ( item.isValid() ) {
       QPointer<Akonadi::ContactEditorDialog> editor = new Akonadi::ContactEditorDialog( Akonadi::ContactEditorDialog::EditMode );
       editor->editor()->loadContact(item);
 
       if ( editor->exec() == QDialog::Accepted ) {
          if ( !contact->save() ) {
             delete editor;
             qDebug() << "Unable to save new contact to storage";
             return false;
          }
       }
       delete editor;
       return true;
    }
    return false;
 }
 
 bool AkonadiEditor::addNew( Person* contact)
 {
    KContacts::Addressee newPerson;
    newPerson.setNickName       ( contact->nickName     () );
    newPerson.setFormattedName  ( contact->formattedName() );
    newPerson.setGivenName      ( contact->firstName    () );
    newPerson.setFamilyName     ( contact->secondName   () );
    newPerson.setOrganization   ( contact->organization () );
    newPerson.setDepartment     ( contact->department   () );
 //    newPerson.setPreferredEmail ( contact->preferredEmail()  );//TODO
 
    foreach (ContactMethod* nb, contact->phoneNumbers()) {
       KContacts::PhoneNumber pn;
       pn.setType(AkonadiBackend::nameToType(nb->category()->name()));
 
       pn.setNumber(nb->uri());
       newPerson.insertPhoneNumber(pn);
    }
 
    //aPerson->setContactMethods   (newNumbers           );//TODO
 
    QPointer<Akonadi::ContactEditorDialog> editor = new Akonadi::ContactEditorDialog( Akonadi::ContactEditorDialog::CreateMode );
 
    editor->editor()->setContactTemplate(newPerson);
 
    if ( editor->exec() == QDialog::Accepted ) {
       if ( !contact->save() ) {
          delete editor;
          qDebug() << "Unable to save new contact to storage";
          return false;
       }
    }
    delete editor;
    return true;
 }
 
 QVector<Person*> AkonadiEditor::items() const
 {
    return m_lBackendPersons;
 }
 
 QString AkonadiBackend::name () const
 {
    QString name;
    Akonadi::EntityDisplayAttribute* attr = m_Coll.attribute<Akonadi::EntityDisplayAttribute>();
    if (attr)
       name = attr->displayName().trimmed();
    return name.isEmpty()?m_Coll.name():name;
 }
 
 QString AkonadiBackend::category() const
 {
    return i18n("Contact");
 }
 
 QVariant AkonadiBackend::icon() const
 {
    Akonadi::EntityDisplayAttribute* attr = m_Coll.attribute<Akonadi::EntityDisplayAttribute>();
    if (attr)
       return QVariant(attr->icon());
    return QVariant();
 }
 
 bool AkonadiBackend::isEnabled() const
 {
    try {
       return GlobalInstances::itemModelStateSerializer().isChecked(this);
    } catch (...) {
       return true;
    }
 }
 
 bool AkonadiBackend::load()
 {
    Akonadi::ItemFetchScope scope;
    scope.fetchFullPayload(true);
 
    // fetching all collections recursively, starting at the root collection
    m_pJob = new Akonadi::ItemFetchJob( m_Coll, this );
    m_pJob->setFetchScope(scope);
 //    m_pJob->fetchScope().setContentMimeTypes( QStringList() << "text/x-vcard" );
    connect( m_pJob, SIGNAL(itemsReceived(Akonadi::Item::List)), this, SLOT(itemsReceived(Akonadi::Item::List)) );
 
    //Configure change monitor
    m_pMonitor = new Akonadi::Monitor(this);
    m_pMonitor->fetchCollectionStatistics(false);
    m_pMonitor->setItemFetchScope(scope);
    connect(m_pMonitor,SIGNAL(itemAdded(Akonadi::Item,Akonadi::Collection)),this,SLOT(slotItemAdded(Akonadi::Item,Akonadi::Collection)));
    connect(m_pMonitor,SIGNAL(itemChanged(Akonadi::Item,QSet<QByteArray>)),this,SLOT(slotItemChanged(Akonadi::Item,QSet<QByteArray>)));
    connect(m_pMonitor,SIGNAL(itemRemoved(Akonadi::Item)),this,SLOT(slotItemRemoved(Akonadi::Item)));
 
    m_pMonitor->setCollectionMonitored(m_Coll,true);
    m_isEnabled = true; //FIXME does it make sense to merge loaded and enabled?
    m_wasEnabled = false;
    return true;
 }
 
 bool AkonadiBackend::enable (bool enable)
 {
    if (enable && (!m_wasEnabled)) {
       return load();
    }
    else if (m_wasEnabled && enable) {
       foreach(Person* contact, items<Person>()) {
          activate(contact);
          emit contact->changed();
       }
       m_wasEnabled = false;
       m_isEnabled = true;
    }
    else if (m_isEnabled && !enable) {
       foreach(Person* contact, items<Person>()) {
          deactivate(contact);
          emit contact->changed();
       }
       m_isEnabled = false;
       m_wasEnabled = true;
    }
    return false;
 }
 
 bool AkonadiBackend::reload()
 {
    //TODO
    return false;
 }
 
 QByteArray AkonadiBackend::id() const
 {
    return QString::number(m_Coll.id()).toLatin1();
 }
 
 FlagPack<CollectionInterface::SupportedFeatures> AkonadiBackend::supportedFeatures() const
 {
    return (
       CollectionInterface::SupportedFeatures::NONE        |
       CollectionInterface::SupportedFeatures::LOAD        |
       CollectionInterface::SupportedFeatures::SAVE        |
       CollectionInterface::SupportedFeatures::EDIT        |
       CollectionInterface::SupportedFeatures::REMOVE      |
       CollectionInterface::SupportedFeatures::ADD         |
       CollectionInterface::SupportedFeatures::MANAGEABLE  |
       CollectionInterface::SupportedFeatures::DISABLEABLE |
       CollectionInterface::SupportedFeatures::ENABLEABLE
    );
 }
 
 /*****************************************************************************
  *                                                                           *
  *                                  Helper                                   *
  *                                                                           *
  ****************************************************************************/
 
 ///Convert string to akonadi KContacts::PhoneNumber
 KContacts::PhoneNumber::Type AkonadiBackend::nameToType(const QString& name)
 {
    if      (name == "Home"   ) return KContacts::PhoneNumber::Home ;
    else if (name == "Work"   ) return KContacts::PhoneNumber::Work ;
    else if (name == "Msg"    ) return KContacts::PhoneNumber::Msg  ;
    else if (name == "Pref"   ) return KContacts::PhoneNumber::Pref ;
    else if (name == "Voice"  ) return KContacts::PhoneNumber::Voice;
    else if (name == "Fax"    ) return KContacts::PhoneNumber::Fax  ;
    else if (name == "Cell"   ) return KContacts::PhoneNumber::Cell ;
    else if (name == "Video"  ) return KContacts::PhoneNumber::Video;
    else if (name == "Bbs"    ) return KContacts::PhoneNumber::Bbs  ;
    else if (name == "Modem"  ) return KContacts::PhoneNumber::Modem;
    else if (name == "Car"    ) return KContacts::PhoneNumber::Car  ;
    else if (name == "Isdn"   ) return KContacts::PhoneNumber::Isdn ;
    else if (name == "Pcs"    ) return KContacts::PhoneNumber::Pcs  ;
    else if (name == "Pager"  ) return KContacts::PhoneNumber::Pager;
    return KContacts::PhoneNumber::Home;
 }
 
 void AkonadiBackend::fillPerson(Person* c, const KContacts::Addressee& addr)
 {
    if (!c) {
       qDebug() << "Contact not found";
       return;
    }
 
    c->setNickName       ( addr.nickName      () );
    c->setFormattedName  ( addr.formattedName () );
    c->setFirstName      ( addr.givenName     () );
    c->setFamilyName     ( addr.familyName    () );
    c->setOrganization   ( addr.organization  () );
    c->setPreferredEmail ( addr.preferredEmail() );
    c->setDepartment     ( addr.department    () );
    c->setUid            ( addr.uid().toUtf8  () );
 
    const KContacts::PhoneNumber::List numbers = addr.phoneNumbers();
    QVector<ContactMethod*> newNumbers;
    foreach (const KContacts::PhoneNumber& number, numbers) {
       ContactMethod* cm = Session::instance()->individualDirectory()->getNumber(number.number(),c,nullptr,number.typeLabel());
 
       newNumbers << cm;
    }
 
    c->setContactMethods   ( newNumbers );
 }
 
 Person* AkonadiBackend::addItem(Akonadi::Item item, bool ignoreEmpty)
 {
    Q_UNUSED(ignoreEmpty)
    Person* aPerson = nullptr;
    if ( item.hasPayload<KContacts::Addressee>() ) {
       m_pMonitor->setItemMonitored(item,true);
       KContacts::Addressee tmp = item.payload<KContacts::Addressee>();
       const KContacts::PhoneNumber::List numbers = tmp.phoneNumbers();
       const QString uid = tmp.uid();
       if (numbers.size() ) {
          aPerson   = new Person(this);
 
          //This need to be done first because of the phone numbers indexes
          fillPerson(aPerson,tmp);
 
          if (!tmp.photo().data().isNull())
             aPerson->setPhoto(QPixmap::fromImage( tmp.photo().data()).scaled(QSize(48,48)));
 
          static_cast<AkonadiEditor*>(editor<Person>())->m_AddrHash[ uid ] = tmp ;
          static_cast<AkonadiEditor*>(editor<Person>())->m_ItemHash[ uid ] = item;
          static_cast<AkonadiEditor*>(editor<Person>())->m_lBackendPersons << aPerson;
       }
    }
    return aPerson;
 }
 
 
 /*****************************************************************************
  *                                                                           *
  *                                  Mutator                                  *
  *                                                                           *
  ****************************************************************************/
 
 void AkonadiBackend::slotJobCompleted(KJob* job)
 {
    if (job->error()) {
       qDebug() << "An Akonadi job failed";
       return;
    }
    Akonadi::RecursiveItemFetchJob* akojob = qobject_cast<Akonadi::RecursiveItemFetchJob*>(job);
    if (akojob) {
       const bool onlyWithNumber =  ConfigurationSkeleton::hidePersonWithoutPhone();
       const Akonadi::Item::List items = akojob->items();
       foreach ( const Akonadi::Item &item, items ) {
          Person* c = addItem(item,onlyWithNumber);
-         PersonModel::instance().addPerson(c);
+         Session::instance()->personDirectory()->addPerson(c);
       }
    }
 }
 
 ///Update the contact list when a new Akonadi collection is added
 void AkonadiBackend::update(const Akonadi::Collection& collection)
 {
    if ( !collection.isValid() ) {
       qDebug() << "The current collection is not valid";
       return;
    }
 
    Akonadi::RecursiveItemFetchJob *job = new Akonadi::RecursiveItemFetchJob( collection, QStringList() << KContacts::Addressee::mimeType() << KContacts::ContactGroup::mimeType());
    job->fetchScope().fetchFullPayload();
    connect(job, SIGNAL(result(KJob*)), this, SLOT(slotJobCompleted(KJob*)));
    job->start();
 
 } //update
 
 ///Save a contact
 bool AkonadiBackend::save(const Person* contact)
 {
    Akonadi::Item item = static_cast<AkonadiEditor*>(editor<Person>())->m_ItemHash[contact->uid()];
 
    if (!(item.hasPayload<KContacts::Addressee>() && item.payload<KContacts::Addressee>().uid() == contact->uid())) {
       qDebug() << "Person not found";
       return false;
    }
 
    auto payload = item.payload<KContacts::Addressee> ();
 
    payload.setNickName       ( contact->nickName     () );
    payload.setFormattedName  ( contact->formattedName() );
    payload.setGivenName      ( contact->firstName    () );
    payload.setFamilyName     ( contact->secondName   () );
    payload.setOrganization   ( contact->organization () );
    payload.setDepartment     ( contact->department   () );
 
    foreach (ContactMethod* nb, contact->phoneNumbers()) {
       KContacts::PhoneNumber pn;
       pn.setType(nameToType(nb->category()->name()));
 
       pn.setNumber(nb->uri());
       payload.insertPhoneNumber(pn);
    }
    //TODO save the contact
    return false;
 }
 
 ///Add a new phone number to an existing contact
 bool AkonadiBackend::addContactMethod(Person* contact, ContactMethod* number)
 {
    Akonadi::Item item = static_cast<AkonadiEditor*>(editor<Person>())->m_ItemHash[contact->uid()];
    if (!(item.hasPayload<KContacts::Addressee>() && item.payload<KContacts::Addressee>().uid() == contact->uid())) {
       qDebug() << "Person not found";
       return false;
    }
    if ( item.isValid() ) {
       KContacts::Addressee payload = item.payload<KContacts::Addressee>();
       payload.insertPhoneNumber(KContacts::PhoneNumber(number->uri(),nameToType(number->category()->name())));
       item.setPayload<KContacts::Addressee>(payload);
       QPointer<Akonadi::ContactEditorDialog> editor = new Akonadi::ContactEditorDialog( Akonadi::ContactEditorDialog::EditMode, (QWidget*)nullptr );
       editor->editor()->loadContact(item);
 
       if ( editor->exec() == QDialog::Accepted ) {
          if ( !contact->save() ) {
             delete editor;
             qDebug() << "Unable to save new contact to storage";
             return false;
          }
       }
 
       delete editor;
       return true;
    }
    else {
       qDebug() << "Invalid item";
       return false;
    }
 }
 
 
 /*****************************************************************************
  *                                                                           *
  *                                    Slots                                  *
  *                                                                           *
  ****************************************************************************/
 
 ///Called when a new collection is added
 void AkonadiBackend::itemsReceived( const Akonadi::Item::List& list)
 {
    foreach (const Akonadi::Item& item, list) {
       slotItemAdded(item,m_Coll);
    }
 }
 
 ///Callback when a new item is added
 void AkonadiBackend::slotItemAdded(const Akonadi::Item& item,const Akonadi::Collection& coll)
 {
    Q_UNUSED(coll)
    Person* c = addItem(item,ConfigurationSkeleton::hidePersonWithoutPhone());
    if (c) { //Not all items will have an addressee payload
       m_pMediator->addItem(c);
    }
 }
 
 ///Callback when an item change
 void AkonadiBackend::slotItemChanged(const Akonadi::Item &item, const QSet< QByteArray > &part)
 {
    Q_UNUSED(part)
    if (item.hasPayload<KContacts::Addressee>()) {
       KContacts::Addressee tmp = item.payload<KContacts::Addressee>();
-      Person* c = PersonModel::instance().getPersonByUid(tmp.uid().toUtf8());
+      Person* c = Session::instance()->personDirectory()->getPersonByUid(tmp.uid().toUtf8());
       if (c)
          fillPerson(c,tmp);
    }
 }
 
 ///Callback when a contact is removed
 void AkonadiBackend::slotItemRemoved(const Akonadi::Item &item)
 {
-   Person* c = PersonModel::instance().getPersonByUid(item.remoteId().toUtf8());
+   Person* c = Session::instance()->personDirectory()->getPersonByUid(item.remoteId().toUtf8());
 
    if (c)
       deactivate(c);
    else
       qDebug() << "A contact was deleted, but Ring-KDE can't find it";
-   //PersonModel::instance().disablePerson(c);
+   //Session::instance()->personDirectory()->disablePerson(c);
 }
 
 // kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/klib/itemmodelserialization.cpp b/src/klib/itemmodelserialization.cpp
index 86fd094f..bf8d043e 100644
--- a/src/klib/itemmodelserialization.cpp
+++ b/src/klib/itemmodelserialization.cpp
@@ -1,89 +1,89 @@
 /****************************************************************************
  *   Copyright (C) 2014-2015 by Savoir-Faire Linux                          *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.com>                    *
  *                                                                          *
  *   This library is free software; you can redistribute it and/or          *
  *   modify it under the terms of the GNU Lesser General Public             *
  *   License as published by the Free Software Foundation; either           *
  *   version 2.1 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      *
  *   Lesser General Public License for more details.                        *
  *                                                                          *
  *   You should have received a copy of the GNU General Public License      *
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.  *
  ***************************************************************************/
 #include "itemmodelserialization.h"
 
-#include <personmodel.h>
+#include <persondirectory.h>
 
 
 #ifdef ENABLE_AKONADI
  #include "akonadibackend.h"
 #endif
 
 #include "collectioninterface.h"
 #include "kcfg_settings.h"
 
 ItemModelStateSerialization::~ItemModelStateSerialization()
 {
    
 }
 
 bool ItemModelStateSerialization::save()
 {
    //FIXME this is too tied to the contact backend, it need to support roles for
    //other collection types (aka: bookmarks)
    QStringList ret;
    for (QHash<QByteArray,bool>::iterator i = m_hChecked.begin(); i != m_hChecked.end(); ++i) {
       if (i.value())
          ret << i.key();
    }
 //    digg(QModelIndex());
    ConfigurationSkeleton::setDisabledCollectionList(ret);
    return true;
 }
 
 bool ItemModelStateSerialization::load()
 {
    m_hChecked.clear();
    const QStringList disabled = ConfigurationSkeleton::disabledCollectionList();
    foreach(const QString& str, disabled) {
       m_hChecked[str.toLatin1()] = true; //Disabled == true, enabled == false
    }
    return true;
 }
 
 bool ItemModelStateSerialization::isChecked(const CollectionInterface* backend) const
 {
    return backend ? (!(m_hChecked[backend->id()])) : false;
 }
 
 bool ItemModelStateSerialization::setChecked(const CollectionInterface* backend, bool enabled)
 {
    m_hChecked[backend->id()] = ! enabled;
    return true;
 }
 
 CollectionInterface* ItemModelStateSerialization::preferredCollection(CollectionManagerInterfaceBase* manager, FlagPack<CollectionInterface::SupportedFeatures> features, FlagPack<Interfaces::ItemModelStateSerializerI::Hints> hints )
 {
    Q_UNUSED(hints)
 
 #ifdef ENABLE_AKONADI
-   if (manager == &PersonModel::instance()) {
-      foreach(CollectionInterface* i, PersonModel::instance().collections(features)) {
+   if (manager == Session::instance()->personDirectory()) {
+      foreach(CollectionInterface* i, Session::instance()->personDirectory()->collections(features)) {
          if (dynamic_cast<AkonadiBackend*>(i)) //TODO use something better
             return i;
       }
    }
 #else
    Q_UNUSED(manager )
    Q_UNUSED(features)
 #endif
 
    return nullptr;
 }
 
 // kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/notification.cpp b/src/notification.cpp
index efd1b7ef..fa1ac850 100644
--- a/src/notification.cpp
+++ b/src/notification.cpp
@@ -1,266 +1,266 @@
 /***************************************************************************
  *   Copyright (C) 2015 by Emmanuel Lepage Vallee                          *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 3 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, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 #include "notification.h"
 
 
 // Qt
 #include <QtWidgets/QApplication>
 
 // KDE
 #include <KNotification>
 #include <KLocalizedString>
 
 // LRC
 #include <callmodel.h>
 #include <accountmodel.h>
 #include <call.h>
 #include <person.h>
 #include <session.h>
 #include <contactmethod.h>
 #include <numbercategory.h>
 #include <useractionmodel.h>
 #include <media/textrecording.h>
 #include <media/mimemessage.h>
 #include <media/recordingmodel.h>
 
 // Ring-KDE
 #include <ringapplication.h>
 
 #define REGISTER_ACTION(list, var, name)  list << name;var = list.size();
 
 
 /*
  * IncomingCallNotification
  */
 
 class IncomingCallNotification : public KNotification
 {
    Q_OBJECT
 
 public:
    explicit IncomingCallNotification(Call* c);
 
 private:
    uint m_Answer      {99};
    //TODO uint m_AnswerVideo {99};
    uint m_HangUp      {99};
 
    Call* m_pCall;
 
 private Q_SLOTS:
    void stateChanged(Call::LifeCycleState newState, Call::LifeCycleState previousState);
    void actionPerformed(uint actionId);
 };
 
 IncomingCallNotification::IncomingCallNotification(Call* call) : KNotification(
    QStringLiteral("incomingCall"), nullptr,
    NotificationFlag::Persistent), m_pCall(call)
 {
 
    const Person* contact = call->peerContactMethod()->contact();
    if (contact) {
 
       const QPixmap px = (contact->photo()).type() == QVariant::Pixmap ? (contact->photo()).value<QPixmap>():QPixmap();
       setPixmap(px);
    }
 
    setTitle(i18n("New incoming call"));
 
    setText(i18n("New call from <b>%1</b>\n<i>(%2)</i>"
       ,call->formattedName()
       ,call->peerContactMethod()->uri()
    ));
 
    QStringList actions;
 
    REGISTER_ACTION(actions, m_Answer, i18n( "Answer"  ))
    REGISTER_ACTION(actions, m_HangUp, i18n( "Hang up" ))
 
    //TODO support answer without video
 
    setActions(actions);
 
    addContext(QStringLiteral("contact"), call->peerContactMethod()->category()->name());
 
    connect(call, &Call::lifeCycleStateChanged, this, &IncomingCallNotification::stateChanged);
 
    connect(this, SIGNAL(activated(uint)), this , SLOT(actionPerformed(uint)));
 }
 
 void IncomingCallNotification::stateChanged(Call::LifeCycleState newState, Call::LifeCycleState previousState)
 {
    Q_UNUSED(previousState)
 
    if (newState != Call::LifeCycleState::INITIALIZATION) {
 
       close();
 
       deleteLater();
    }
 }
 
 void IncomingCallNotification::actionPerformed(uint actionId)
 {
    if (actionId == m_Answer) {
       m_pCall << Call::Action::ACCEPT;
    }
    else if (actionId == m_HangUp) {
       m_pCall << Call::Action::REFUSE;
    }
 }
 
 
 /*
  * Text message notification
  */
 class IncomingTextNotification : public KNotification
 {
    Q_OBJECT
 public:
    explicit IncomingTextNotification(ContactMethod* cm, Media::TextRecording* t);
    void actionPerformed(uint actionId);
 };
 
 IncomingTextNotification::IncomingTextNotification(ContactMethod* cm, Media::TextRecording* t) : KNotification(
    QStringLiteral("incomingText"), nullptr)
 {
    setTitle(i18n("Message from %1", cm->primaryName()));
 
    if (auto contact = cm->contact()) {
 
       const QPixmap px = (contact->photo()).type() == QVariant::Pixmap ? (contact->photo()).value<QPixmap>():QPixmap();
       setPixmap(px);
    }
 
    setText(t->instantTextMessagingModel()->index(
       t->instantTextMessagingModel()->rowCount()-1, 0
    ).data().toString());
 }
 
 void IncomingTextNotification::actionPerformed(uint actionId)
 {
    Q_UNUSED(actionId)
 }
 
 /*
  * CreateContactNotification
  */
 
 class CreateContactNotification : public KNotification
 {
    Q_OBJECT
 
 public:
    explicit CreateContactNotification(ContactMethod* cm);
 
 private:
    uint m_Yes   {99};
    uint m_No    {99};
    uint m_Never {99};
 
 private Q_SLOTS:
    void actionPerformed(uint actionId);
 };
 
 CreateContactNotification::CreateContactNotification(ContactMethod* cm) :KNotification(
    QStringLiteral("incomingCall"), nullptr)
 {
    setTitle(i18n("Add %1 to contacts?", cm->uri()));
 
    setText(i18n("Do you wish to add %1 to your addressbook?", cm->primaryName()));
 
    QStringList actions;
 
    REGISTER_ACTION(actions, m_Yes  , i18n( "Yes"              ))
    REGISTER_ACTION(actions, m_No   , i18n( "No"               ))
    REGISTER_ACTION(actions, m_Never, i18n( "Do not ask again" ))
 
    setActions(actions);
 
    connect(this, SIGNAL(activated(uint)), this , SLOT(actionPerformed(uint)));
 }
 
 void CreateContactNotification::actionPerformed(uint actionId)
 {
    if (actionId == m_Yes) {
       //TODO do something
    }
    else if (actionId == m_No) {
       //Nothing to do
    }
    else if (actionId == m_Never) {
       //TODO edit the config to disable this notification
    }
 
    deleteLater();
 }
 
 
 
 
 Notification::Notification(QObject* parent) : QObject(parent)
 {
    connect(Session::instance()->callModel(), &CallModel::incomingCall, this, &Notification::incomingCall);
    connect(Session::instance()->accountModel(), &AccountModel::accountStateChanged, this, &Notification::accountStatus);
-   connect(&Media::RecordingModel::instance(), &Media::RecordingModel::mimeMessageInserted, this, &Notification::incomingText);
+   connect(Session::instance()->recordingModel(), &Media::RecordingModel::mimeMessageInserted, this, &Notification::incomingText);
 }
 
 Notification* Notification::instance()
 {
    static auto i = new Notification(QApplication::instance());
 
    return i;
 }
 
 void Notification::contactOnline()
 {
    //TODO fix the presence model
 }
 
 void Notification::accountStatus(Account* a, const Account::RegistrationState state)
 {
    Q_UNUSED(a)
    Q_UNUSED(state)
    //TODO
 }
 
 void Notification::incomingCall(Call* call)
 {
    if (call)
       (new IncomingCallNotification(call))->sendEvent();
 }
 
 void Notification::incomingText(Media::MimeMessage* m, Media::TextRecording* t, ContactMethod* cm)
 {
    if (m->direction() == Media::Media::Direction::OUT)
       return;
 
    if (t && !RingApplication::instance()->mayHaveFocus())
       (new IncomingTextNotification(cm, t))->sendEvent();
 }
 
 void Notification::createContact()
 {
    //TODO
 }
 
 #undef REGISTER_ACTION
 
 #include <notification.moc>
 
 // kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/photoselector/qml/editor.qml b/src/photoselector/qml/editor.qml
index 4800c785..e9b1a514 100644
--- a/src/photoselector/qml/editor.qml
+++ b/src/photoselector/qml/editor.qml
@@ -1,287 +1,288 @@
 /***************************************************************************
  *   Copyright (C) 2017 by Bluesystems                                     *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 3 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, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 import QtQuick 2.7
 import QtQuick.Layouts 1.0
 import QtQuick.Controls 2.2
 import RingQmlWidgets 1.0
 
 import PhotoSelectorPlugin 1.0
 import org.kde.playground.kquickitemviews 1.0 as KQuickItemViews
+import net.lvindustries.ringqtquick 1.0 as RingQtQuick
 
 import Ring 1.0
 
 Dialog {
     property QtObject person: null
     property QtObject contactMethod: null
     property var individual: null
     property bool isSelected: false
     signal newPhoto(var photo)
     signal done()
     modal: true
 
     property bool isGlobal: applicationWindow != undefined && (
         typeof(applicationWindow) == "function"
     )
 
     visible: true
     width:  Math.min(isGlobal ? applicationWindow().width  : 500, 500)
     height: Math.min(isGlobal ? applicationWindow().height : 400, 400)
     standardButtons: Dialog.Ok | Dialog.Cancel
     closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent
 
     parent: isGlobal ? applicationWindow().contentItem : parent
     x: isGlobal ?
         (applicationWindow().contentItem.width / 2 - width/2) :
         (parent.width / 2 - width/2)
     y: isGlobal ?
         (applicationWindow().height / 2 - height/2) :
         (parent.height / 2 - height/2)
 
     PhotoSelector {
         id: selector
     }
 
     contentItem: ColumnLayout {
 
         // The photo fills the item, but is a child of the selection rectangle
         Item {
             id: selectorContainer
             Layout.fillWidth: true
             Layout.fillHeight: true
             clip: true
 
             Label {
                 anchors.centerIn: parent
                 text: i18n("Either select a file or take a selfie")
                 z: -4
                 visible: !existingPhoto.hasPixmap
             }
 
             KQuickItemViews.DecorationAdapter {
                 id: existingPhoto
                 anchors.centerIn: parent
                 pixmap: person ? person.photo : undefined
                 z: -3
                 width: 128
                 height: 128
             }
 
             Rectangle {
                 id: overlay
                 z: 100
 
                 VideoWidget {
                     id: videoWidget
                     visible: false
                     z: -1
                 }
 
                 Image {
                     id: fromFile
                     z: -2
                     visible: true
                     fillMode: Image.PreserveAspectFit
                 }
 
                 color: "transparent"
                 border.width: 3
                 border.color: "red"
             }
 
             MouseArea {
                 anchors.fill: parent
                 property bool track: false
                 property int rootX: 0
                 property int rootY: 0
                 onPressed: {
                     track = true
                     rootX = mouse.x
                     rootY = mouse.y
                     overlay.x = mouse.x
                     overlay.y = mouse.y
                     overlay.width = 0
                     overlay.height = 0
                     fromFile.x = -overlay.x
                     fromFile.y = -overlay.y
                     fromFile.width = selectorContainer.width
                     fromFile.height = selectorContainer.height
                     videoWidget.x = -overlay.x
                     videoWidget.y = -overlay.y
                     videoWidget.width = selectorContainer.width
                     videoWidget.height = selectorContainer.height
                 }
                 onPositionChanged: {
 
                     if (track) {
                         var w = 0
                         var h = 0
                         if (mouse.x >= rootX) {
                             overlay.x = rootX
                             w = mouse.x - rootX
                         }
                         else {
                             overlay.x = mouse.x
                             w = rootX - mouse.x
                         }
 
                         if (mouse.y >= rootY) {
                             overlay.y = rootY
                             h = mouse.y - rootY
                         }
                         else {
                             overlay.y = mouse.y
                             h = rootY - mouse.y
                         }
 
                         var size = w > h ? h : w
 
                         overlay.width  = size
                         overlay.height = size
                         fromFile.x = -overlay.x
                         fromFile.y = -overlay.y
                         fromFile.width = selectorContainer.width
                         fromFile.height = selectorContainer.height
                         videoWidget.x = -overlay.x
                         videoWidget.y = -overlay.y
                         videoWidget.width = selectorContainer.width
                         videoWidget.height = selectorContainer.height
                         //FIXME bottom-right -> top-left [x,y]
                     }
                 }
                 onReleased: {
                     track = false
                     overlay.border.color = "transparent"
                     overlay.border.width = 0
                     overlay.grabToImage(function(result) {
                         selector.image = result.image;
                         newPhoto(result.image)
                         overlay.border.color = "red"
                         overlay.border.width = 3
                         isSelected = true
                     });
                 }
             }
 
             Component.onCompleted: {
                 fromFile.x = -overlay.x
                 fromFile.y = -overlay.y
                 fromFile.width = selectorContainer.width
                 fromFile.height = selectorContainer.height
                 videoWidget.x = -overlay.x
                 videoWidget.y = -overlay.y
                 videoWidget.width = selectorContainer.width
                 videoWidget.height = selectorContainer.height
             }
         }
 
         RowLayout {
             Layout.fillWidth: true
             Item {
                 height: 1
                 Layout.fillWidth: true
             }
             Button {
                 text: i18n("From file")
                 onClicked: {
                     videoWidget.visible = false
                     fromFile.visible = true
                     fromFile.source = selector.selectFile("")
                 }
             }
             Button {
                 text: i18n("From camera")
                 onClicked: {
                     videoWidget.visible = true
                     fromFile.visible = false
 
-                    if (!PreviewManager.previewing) {
-                        PreviewManager.startPreview()
+                    if (!RingSession.previewManager.previewing) {
+                        RingSession.previewManager.startPreview()
                         videoWidget.started = true
                     }
                     else {
-                        PreviewManager.stopPreview()
+                        RingSession.previewManager.stopPreview()
                         videoWidget.started = false
                         videoWidget.started = false
                     }
                 }
             }
             Button {
                 text: i18n("Clear")
                 onClicked: {
                     videoWidget.visible = false
                     fromFile.visible = false
                     fromFile.source = ""
                     selector.clear()
                     existingPhoto.pixmap = undefined
                 }
             }
             Item {
                 height: 1
                 Layout.fillWidth: true
             }
         }
 
         Item {
             height: 30
         }
     }
 
     function applyPhoto() {
         if (person)
             selector.setToPerson(person)
         else if (contactMethod)
             selector.setToContactMethod(contactMethod)
         else if (individual)
             selector.setToIndividual(person)
 
         videoWidget.started = false
-        if (PreviewManager.previewing)
-            PreviewManager.stopPreview()
+        if (RingSession.previewManager.previewing)
+            RingSession.previewManager.stopPreview()
     }
 
     onAccepted: {
         // It's not obvious that you have to select a square, so do it
         // if the user has not done it
 
         if ((!isSelected) && (videoWidget.started || fromFile.source != "")) {
             overlay.x = selectorContainer.width/2 - selectorContainer.height/2
             overlay.y = 0
             overlay.width = selectorContainer.height
             overlay.height = selectorContainer.height
             overlay.border.color = "transparent"
             overlay.border.width = 0
             overlay.grabToImage(function(result) {
                 selector.image = result.image;
                 newPhoto(result.image)
                 applyPhoto()
             });
         }
 
         applyPhoto()
 
         done()
     }
 
     onRejected: {
         videoWidget.started = false
-        if (PreviewManager.previewing)
-            PreviewManager.stopPreview()
+        if (RingSession.previewManager.previewing)
+            RingSession.previewManager.stopPreview()
 
         done()
     }
 }
diff --git a/src/qmlwidgets/contactbuilder.cpp b/src/qmlwidgets/contactbuilder.cpp
index 1d86b6b7..547a9702 100644
--- a/src/qmlwidgets/contactbuilder.cpp
+++ b/src/qmlwidgets/contactbuilder.cpp
@@ -1,212 +1,212 @@
 /***************************************************************************
  *   Copyright (C) 2017 by Bluesystems                                     *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 3 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, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 #include "contactbuilder.h"
 
 #include <contactmethod.h>
 #include <person.h>
-#include <personmodel.h>
+#include <persondirectory.h>
 #include <collectioninterface.h>
 #include <numbercategorymodel.h>
 #include <individualdirectory.h>
 #include <individual.h>
 #include <session.h>
 #include <accountmodel.h>
 
 class ContactBuilderPrivate
 {
 public:
     QMap<QString, QString> m_Payloads {};
 };
 
 ContactBuilder::ContactBuilder(QObject* parent) : QObject(parent),
     d_ptr(new ContactBuilderPrivate())
 {}
 
 ContactBuilder::~ContactBuilder()
 {
     delete d_ptr;
 }
 
 Person* ContactBuilder::from(Individual* ind, const QString& name)
 {
     if (!ind)
         return nullptr;
 
     if (ind->phoneNumbers().isEmpty())
         return nullptr;
 
-    auto cols = PersonModel::instance().enabledCollections(
+    auto cols = Session::instance()->personDirectory()->enabledCollections(
         CollectionInterface::SupportedFeatures::ADD |
         CollectionInterface::SupportedFeatures::EDIT|
         CollectionInterface::SupportedFeatures::SAVE
     );
 
     if (cols.isEmpty()) {
         qWarning() << "Failed to add a contact: no suitable backend found";
         return nullptr;
     }
 
     const auto col = cols.first();
 
     auto p = ind->buildPerson();
     p->setCollection(col);
     col->editor<Person>()->addExisting(p);
 
     if (!name.isEmpty())
         p->setFormattedName(name);
 
     Q_ASSERT(ind->person() == p);
 
     return p;
 }
 
 Person* ContactBuilder::from(ContactMethod* cm)
 {
     if (cm && cm->contact())
         return cm->contact();
 
     auto p = fromScratch();
 
     if (cm) {
         cm->setPerson(p);
         p->individual()->addPhoneNumber(cm);
     }
 
     qDebug() << "New contact successfully added";
 
     return p;
 }
 
 Person* ContactBuilder::fromScratch()
 {
-    auto cols = PersonModel::instance().enabledCollections(
+    auto cols = Session::instance()->personDirectory()->enabledCollections(
         CollectionInterface::SupportedFeatures::ADD |
         CollectionInterface::SupportedFeatures::EDIT|
         CollectionInterface::SupportedFeatures::SAVE
     );
 
     if (cols.isEmpty()) {
         qWarning() << "Failed to add a contact: no suitable backend found";
         return nullptr;
     }
 
     const auto col = cols.first();
 
     auto p = new Person();
     p->setCollection(col); //TODO have a selection widget again
     col->editor<Person>()->addExisting(p);
 
     return p;
 }
 
 ContactMethod* ContactBuilder::updatePhoneNumber(ContactMethod* cm, Individual* ind, Person* p, const QString& number, int categoryIndex, int accountIdx)
 {
     auto catIndex = Session::instance()->numberCategoryModel()->index(categoryIndex, 0);
 
     if (!catIndex.isValid())
         return nullptr;
 
     const bool wasTemporary = cm && cm->type() == ContactMethod::Type::TEMPORARY;
 
     if (wasTemporary && !number.isEmpty()) {
         qobject_cast<TemporaryContactMethod*>(cm)->setUri(number);
     }
 
     ContactMethod* newCM = Session::instance()->individualDirectory()->fromTemporary(cm);
 
     Account* a = accountIdx == -1 ? nullptr : Session::instance()->accountModel()->getAccountByModelIndex(
         Session::instance()->accountModel()->index(accountIdx, 0)
     );
 
     // Create a person and add the CM to the phone numbers
     if ((!cm) && ind) {
         ind->addPhoneNumber(number, a, catIndex.data().toString());
     }
     else if (!cm) {
         newCM = Session::instance()->individualDirectory()->getNumber(
             number, a, catIndex.data().toString()
         );
 
         from(newCM);
 
         return newCM;
     }
 
     p = (p || !newCM) ? p : newCM->contact();
 
     if (newCM && a)
         newCM->setAccount(a);
 
     if (!p) {
         if (Q_UNLIKELY(!newCM)) {
             qWarning() << "Failed to create a contact";
             return nullptr;
         }
         else {
             qWarning() << "Creating a contact for" << newCM;
             from(newCM);
             return newCM;
         }
     }
 
     if (!newCM) {
         newCM = Session::instance()->individualDirectory()->getNumber(
             number, p, a, catIndex.data().toString()
         );
         p->individual()->addPhoneNumber(newCM);
     }
     else if (wasTemporary)
         p->individual()->addPhoneNumber(newCM);
     else {
         auto newCM2 = Session::instance()->individualDirectory()->getNumber(
             number, p, newCM->account(), catIndex.data().toString()
         );
         p->individual()->replacePhoneNumber(newCM, newCM2);
         newCM = newCM2;
     }
 
     if (wasTemporary)
         p->individual()->setEditRow(false);
 
     qDebug() << "New phone number added to" << p;
 
     return newCM;
 }
 
 
 void ContactBuilder::addEmptyPhoneNumber(Person* p)
 {
     if (!p)
         return;
 
     const auto idx = p->individual()->index(p->individual()->rowCount(), 0);
     p->individual()->setData(idx, QString(), Qt::DisplayRole);
 }
 
 void ContactBuilder::acceptEmptyPhoneNumber(Person* p)
 {
     if (!p)
         return;
 
 }
 void ContactBuilder::rejectEmptyPhoneNumber(Person* p)
 {
     if (!p)
         return;
 
 }
diff --git a/src/ringapplication.cpp b/src/ringapplication.cpp
index 725dc191..e762798d 100644
--- a/src/ringapplication.cpp
+++ b/src/ringapplication.cpp
@@ -1,620 +1,586 @@
 /***************************************************************************
  *   Copyright (C) 2009-2015 by Savoir-Faire Linux                         *
  *   Author : Emmanuel Lepage Valle <emmanuel.lepage@savoirfairelinux.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 3 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, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 
 //Parent
 #include "ringapplication.h"
 
 //Qt
 #include <QtCore/QDir>
 #include <QtCore/QTimer>
 #include <QtCore/QCommandLineParser>
 #include <QtCore/QDebug>
 #include <QtCore/QStandardPaths>
 #include <QtCore/QItemSelectionModel>
 #include <QtWidgets/QAction>
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
 #include <QQuickItem>
 #include <QQuickWindow>
 #include <QQmlExtensionPlugin>
 #include <QQmlComponent>
 
 //KDE
 #include <KIconLoader>
 #include <KActionCollection>
 #include <kmessagebox.h>
 #include <KDeclarative/KDeclarative>
 
 //LRC
 #include <itemdataroles.h>
 #include <session.h>
 #include <callmodel.h>
 #include <eventmodel.h>
 #include <accountmodel.h>
 #include <account.h>
 #include <individual.h>
 #include <contactmethod.h>
 #include <individualdirectory.h>
-#include <categorizedhistorymodel.h>
-#include <categorizedcontactmodel.h>
+#include <callhistorymodel.h>
+#include <contactmodel.h>
 #include <ringdevicemodel.h>
 #include <namedirectory.h>
-#include <categorizedbookmarkmodel.h>
+#include <bookmarkmodel.h>
 #include <numbercompletionmodel.h>
 #include <useractionmodel.h>
 #include <protocolmodel.h>
 #include <pendingcontactrequestmodel.h>
 #include <video/configurationproxy.h>
 #include <video/sourcemodel.h>
 #include <contactmethod.h>
 #include <media/recordingmodel.h>
 #include <peerstimelinemodel.h>
 #include <individualtimelinemodel.h>
 #include <ringtonemodel.h>
 #include <video/previewmanager.h>
 #include <media/recording.h>
 #include <media/avrecording.h>
 #include <media/textrecording.h>
 #include <media/availabilitytracker.h>
 #include <media/media.h>
 #include <video/renderer.h>
 #include <libcard/historyimporter.h>
 #include <troubleshoot/dispatcher.h>
 
 //Ring
 #include "klib/kcfg_settings.h"
 #include "cmd.h"
 #include "errormessage.h"
 #include "implementation.h"
 #include "wizard/welcome.h"
 #include "callview/videowidget.h"
 #include "notification.h"
 #include "actioncollection.h"
 
 //Models
 #include <profilemodel.h>
 #include <certificatemodel.h>
 #include <availableaccountmodel.h>
 #include <numbercategorymodel.h>
 #include <codecmodel.h>
 #include <credentialmodel.h>
 #include <presencestatusmodel.h>
-#include <personmodel.h>
+#include <persondirectory.h>
 #include <infotemplatemanager.h>
 
 //Collections
 #include <foldercertificatecollection.h>
 #include <fallbackpersoncollection.h>
 #include <peerprofilecollection2.h>
 #include <localhistorycollection.h>
 #include <localbookmarkcollection.h>
 #include <localrecordingcollection.h>
 #include <localprofilecollection.h>
 #include <localtextrecordingcollection.h>
 #include <globalinstances.h>
 
 //Configurators
 #include "configurator/localhistoryconfigurator.h"
 #include "configurator/audiorecordingconfigurator.h"
 #include "configurator/fallbackpersonconfigurator.h"
 #include "configurator/peerprofileconfigurator.h"
 #include "configurator/bookmarkconfigurator.h"
 
 //Delegates
 #include <delegates/kdepixmapmanipulation.h>
 #include <interfaces/itemmodelstateserializeri.h>
 #include "klib/itemmodelserialization.h"
 #include "extensions/presencecollectionextension.h"
 
 //QML
 #include <KQuickItemViews/plugin.h>
 #include "qmlwidgets/plugin.h"
 #include "qmlwidgets/recentfilemodel.h"
 #include "qmlwidgets/symboliccolorizer.h"
 #include "photoselector/photoplugin.h"
 #include "canvasindicators/canvasindicator.h"
 #include "canvasindicators/ringingimageprovider.h"
 #include "desktopview/desktopviewplugin.h"
 #include "contactview/contactviewplugin.h"
 #include "accountview/accountviewplugin.h"
 #include "dialview/dialviewplugin.h"
 #include "timeline/timelineplugin.h"
 
 //Widgets
 #include "widgets/systray.h"
 
 //Other
 #include <unistd.h>
 
 KDeclarative::KDeclarative* RingApplication::m_pDeclarative {nullptr};
 RingQmlWidgets* RingApplication::m_pQmlWidget {nullptr};
 PhotoSelectorPlugin* RingApplication::m_pPhotoSelector {nullptr};
 DesktopView* RingApplication::m_pDesktopView {nullptr};
 ContactView* RingApplication::m_pContactView {nullptr};
 AccountView* RingApplication::m_pAccountView {nullptr};
 DialView* RingApplication::m_pDialView {nullptr};
 TimelinePlugin* RingApplication::m_pTimeline {nullptr};
 CanvasIndicator* RingApplication::m_pCanvasIndicator {nullptr};
 RingApplication* RingApplication::m_spInstance {nullptr};
 
 //This code detect if the window is active, innactive or minimzed
 class PhoneWindowEvent final : public QObject {
    Q_OBJECT
 public:
    PhoneWindowEvent(RingApplication* ev) : QObject(ev),m_pParent(ev) {
       QTimer::singleShot(0, [this]() {
          m_pParent->desktopWindow()->installEventFilter(this);
       });
    }
 protected:
    virtual bool eventFilter(QObject *obj, QEvent *event)  override {
       Q_UNUSED(obj)
       if (event->type() == QEvent::WindowDeactivate) {
          m_pParent->m_HasFocus = false;
       }
       else if (event->type() == QEvent::WindowActivate) {
          m_pParent->m_HasFocus = true;
       }
       return false;
    }
 
 private:
    RingApplication* m_pParent;
 
 Q_SIGNALS:
    void minimized(bool);
 };
 
 /**
  * The application constructor
  */
 RingApplication::RingApplication(int & argc, char ** argv) : QApplication(argc,argv),m_StartIconified(false)
 {
    Q_ASSERT(argc != -1);
 #ifdef ENABLE_VIDEO
    //Necessary to draw OpenGL from a separated thread
    setAttribute(Qt::AA_X11InitThreads,true);
 #endif
    setAttribute(Qt::AA_EnableHighDpiScaling);
 
    m_pEventFilter = new PhoneWindowEvent(this);
 
    m_spInstance = this;
 }
 
 void RingApplication::init()
 {
    if ((!Session::instance()->callModel()->isConnected()) || (!Session::instance()->callModel()->isValid())) {
       QTimer::singleShot(5000,this,&RingApplication::daemonTimeout);
    }
 
    initCollections();
 }
 
 /**
  * Destructor
  */
 RingApplication::~RingApplication()
 {
    delete m_pDeclarative;
    delete engine();
    delete m_pCanvasIndicator;
    delete m_pPhotoSelector;
    delete m_pQmlWidget;
 
    delete Session::instance()->peersTimelineModel();
-   delete &Media::RecordingModel::instance();
-   delete &PersonModel::instance();
+   delete Session::instance()->recordingModel();
+   delete Session::instance()->personDirectory();
    delete Session::instance()->callModel();
-   delete &ProfileModel::instance();
+   delete Session::instance()->profileModel();
    delete Session::instance()->accountModel();
    delete Session::instance()->individualDirectory();
    delete Session::instance()->numberCategoryModel();
    m_spInstance = nullptr;
 }
 
 RingApplication* RingApplication::instance()
 {
    Q_ASSERT(m_spInstance);
    return m_spInstance;
 }
 
 static void loadNumberCategories()
 {
    auto model = Session::instance()->numberCategoryModel();
    static const QString pathTemplate = QStringLiteral(":/mini/icons/miniicons/%1.png");
 #define ICN(name) QPixmap(QString(pathTemplate).arg(QStringLiteral(name)))
    model->addCategory(i18n("Home")     ,ICN("home")     , 1 /*KABC::PhoneNumber::Home */);
    model->addCategory(i18n("Work")     ,ICN("work")     , 2 /*KABC::PhoneNumber::Work */);
    model->addCategory(i18n("Msg")      ,ICN("mail")     , 3 /*KABC::PhoneNumber::Msg  */);
    model->addCategory(i18n("Pref")     ,ICN("call")     , 4 /*KABC::PhoneNumber::Pref */);
    model->addCategory(i18n("Voice")    ,ICN("video")    , 5 /*KABC::PhoneNumber::Voice*/);
    model->addCategory(i18n("Fax")      ,ICN("call")     , 6 /*KABC::PhoneNumber::Fax  */);
    model->addCategory(i18n("Cell")     ,ICN("mobile")   , 7 /*KABC::PhoneNumber::Cell */);
    model->addCategory(i18n("Video")    ,ICN("call")     , 8 /*KABC::PhoneNumber::Video*/);
    model->addCategory(i18n("Bbs")      ,ICN("call")     , 9 /*KABC::PhoneNumber::Bbs  */);
    model->addCategory(i18n("Modem")    ,ICN("call")     , 10/*KABC::PhoneNumber::Modem*/);
    model->addCategory(i18n("Car")      ,ICN("car")      , 11/*KABC::PhoneNumber::Car  */);
    model->addCategory(i18n("Isdn")     ,ICN("call")     , 12/*KABC::PhoneNumber::Isdn */);
    model->addCategory(i18n("Pcs")      ,ICN("call")     , 13/*KABC::PhoneNumber::Pcs  */);
    model->addCategory(i18n("Pager")    ,ICN("pager")    , 14/*KABC::PhoneNumber::Pager*/);
    model->addCategory(i18n("Preferred"),ICN("preferred"), 10000                         );
 #undef ICN
 #undef IS_ENABLED
 }
 
 void RingApplication::initCollections()
 {
    GlobalInstances::setInterface<KDEActionExtender>();
 
    GlobalInstances::setInterface<ColorDelegate>();
 
    GlobalInstances::setInterface<KDEPixmapManipulation>();
 
    loadNumberCategories();
 
    Session::instance()->callModel()->setAudoCleanDelay(5000);
 
-   InfoTemplateManager::instance();
-
    /*******************************************
       *           Set the configurator          *
       ******************************************/
 
-   PersonModel::instance()             .registerConfigarator<PeerProfileCollection2  >    (new PeerProfileConfigurator   (this));
-   PersonModel::instance()             .registerConfigarator<FallbackPersonCollection>    (new FallbackPersonConfigurator(this));
+   Session::instance()->personDirectory()->registerConfigarator<PeerProfileCollection2  >    (new PeerProfileConfigurator   (this));
+   Session::instance()->personDirectory()->registerConfigarator<FallbackPersonCollection>    (new FallbackPersonConfigurator(this));
    Session::instance()->historyModel()->registerConfigarator<LocalHistoryCollection  >    (new LocalHistoryConfigurator  (this));
    Session::instance()->bookmarkModel()->registerConfigarator<LocalBookmarkCollection >    (new BookmarkConfigurator      (this));
-   Media::RecordingModel::instance()   .registerConfigarator<LocalRecordingCollection>    (new AudioRecordingConfigurator(this,
+   Session::instance()->recordingModel()->registerConfigarator<LocalRecordingCollection>    (new AudioRecordingConfigurator(this,
       AudioRecordingConfigurator::Mode::AUDIO
    ));
-   Media::RecordingModel::instance()   .registerConfigarator<LocalTextRecordingCollection>(new AudioRecordingConfigurator(this,
+   Session::instance()->recordingModel()->registerConfigarator<LocalTextRecordingCollection>(new AudioRecordingConfigurator(this,
       AudioRecordingConfigurator::Mode::TEXT
    ));
 
    /*******************************************
       *           Load the collections          *
       ******************************************/
 
    // Load the old phone call history and port it to the newer calendar events format.
    if (QFile::exists(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1Char('/') +"history.ini")) {
       auto histo = Session::instance()->historyModel()->addCollection<LocalHistoryCollection>(LoadOptions::FORCE_ENABLED);
       HistoryImporter::importHistory(histo);
       histo->clear();
    }
 
    //HACK load the Calendar now to speedup everything else
    const int accountCount = Session::instance()->accountModel()->size();
    for (int i=0; i < accountCount; i++)
       (*Session::instance()->accountModel())[i]->calendar();
 
-   ProfileModel::instance().addCollection<LocalProfileCollection>(LoadOptions::FORCE_ENABLED);
+   Session::instance()->profileModel()->addCollection<LocalProfileCollection>(LoadOptions::FORCE_ENABLED);
 
 #ifdef Q_OS_LINUX
    CertificateModel::instance().addCollection<FolderCertificateCollection,QString, FlagPack<FolderCertificateCollection::Options>,QString>(
       QStringLiteral("/usr/share/ca-certificates/"),
       FolderCertificateCollection::Options::ROOT
          | FolderCertificateCollection::Options::RECURSIVE
          | FolderCertificateCollection::Options::READ_ONLY,
       i18n("System root certificates"),
       LoadOptions::FORCE_ENABLED
    );
 #endif
 
    Session::instance()->bookmarkModel()->addCollection<LocalBookmarkCollection>();
    Session::instance()->bookmarkModel()->setDisplayPopular(
       ConfigurationSkeleton::displayPopularAsBookmark()
    );
 
-   PersonModel::instance().addCollection<FallbackPersonCollection>(LoadOptions::FORCE_ENABLED);
-   auto ppc = PersonModel::instance().addCollection<PeerProfileCollection2>(LoadOptions::FORCE_ENABLED);
+   Session::instance()->personDirectory()->addCollection<FallbackPersonCollection>(LoadOptions::FORCE_ENABLED);
+   auto ppc = Session::instance()->personDirectory()->addCollection<PeerProfileCollection2>(LoadOptions::FORCE_ENABLED);
 
    const auto m = static_cast<PeerProfileCollection2::DefaultMode>(ConfigurationSkeleton::defaultPeerProfileMode());
    ppc->setDefaultMode(m);
 
    GlobalInstances::setInterface<ItemModelStateSerialization>();
    GlobalInstances::itemModelStateSerializer().load();
 
 #ifdef ENABLE_AKONADI
    AkonadiBackend::initCollections();
 #endif
 
 //       PresenceCollectionModelExtension* ext = new PresenceCollectionModelExtension(this);
-//       PersonModel::instance().backendModel()->addExtension(ext); //FIXME
+//       Session::instance()->personDirectory()->backendModel()->addExtension(ext); //FIXME
 
-   ProfileModel::instance();
+   Session::instance()->profileModel();
 
    Notification::instance();
 }
 
 ///Parse command line arguments
 int RingApplication::newInstance()
 {
    static bool displayWizard  = ConfigurationSkeleton::enableWizard() || ConfigurationSkeleton::showSplash();
    const  bool displayOnStart = ConfigurationSkeleton::displayOnStart() && !startIconified();
 
    static bool init = true;
    //Only call on the first instance
    if (init) {
       init = false;
 
       ActionCollection::instance()->setupAction();
       desktopWindow();
       new SysTray(QIcon(QStringLiteral(":appicon/icons/64-apps-ring-kde.png")));
    }
 
    // The first run wizard
    if (displayOnStart && displayWizard) {
       // Also add this object
       engine()->rootContext()->setContextProperty(
          QStringLiteral("RingApplication"), this
       );
 
       engine()->rootContext()->setContextProperty(
          QStringLiteral("wizardWelcomeOnly"), QVariant(!ConfigurationSkeleton::enableWizard())
       );
 
       if (!Session::instance()->accountModel()->size())
          showWizard();
 
       ConfigurationSkeleton::setEnableWizard(false);
       displayWizard = false;
       return 0;
    }
 
    return 0;
 }
 
 bool RingApplication::startIconified() const
 {
    return m_StartIconified;
 }
 
 void RingApplication::setIconify(bool iconify)
 {
    m_StartIconified = iconify;
 }
 
 void RingApplication::setStartTimeline(bool value)
 {
    m_StartTimeLine = value;
 }
 
 void RingApplication::setStartPhone(bool value)
 {
    m_StartPhone = value;
 }
 
 #define QML_TYPE(name) qmlRegisterUncreatableType<name>(AppName, 1,0, #name, #name "cannot be instantiated");
 #define QML_NS(name) qmlRegisterUncreatableMetaObject( name :: staticMetaObject, #name, 1, 0, #name, "Namespaces cannot be instantiated" );
 #define QML_CRTYPE(name) qmlRegisterType<name>(AppName, 1,0, #name);
 #define QML_SINGLETON(name) RingApplication::engine()->rootContext()->setContextProperty(QStringLiteral(#name), &name::instance());
 #define QML_SINGLETON2(name) RingApplication::engine()->rootContext()->setContextProperty(QStringLiteral(#name), name::instance());
 #define QML_ADD_OBJECT(name, obj) RingApplication::engine()->rootContext()->setContextProperty(QStringLiteral(#name), obj);
 
 constexpr static const char AppName[]= "Ring";
 
 /// Create a QML engine for various canvas widgets
 QQmlApplicationEngine* RingApplication::engine()
 {
    static QQmlApplicationEngine* e = nullptr;
    static std::atomic_flag engineInit = ATOMIC_FLAG_INIT;
 
    if (!engineInit.test_and_set()) {
       m_pQmlWidget = new RingQmlWidgets;
       m_pQmlWidget->registerTypes("RingQmlWidgets");
 
       m_pPhotoSelector = new PhotoSelectorPlugin;
       m_pPhotoSelector->registerTypes("PhotoSelectorPlugin");
 
       m_pDesktopView = new DesktopView;
       m_pDesktopView->registerTypes("DesktopView");
 
       m_pContactView = new ContactView;
       m_pContactView->registerTypes("ContactView");
 
       m_pAccountView = new AccountView;
       m_pAccountView->registerTypes("AccountView");
 
       m_pDialView = new DialView;
       m_pDialView->registerTypes("DialView");
 
       m_pTimeline = new TimelinePlugin;
       m_pTimeline->registerTypes("TimeLine");
 
       m_pCanvasIndicator = new CanvasIndicator;
       m_pCanvasIndicator->registerTypes("CanvasIndicator");
 
       QML_TYPE( QAction)
 
       QML_CRTYPE( QItemSelectionModel )
 
       QML_NS(Ring)
 
       e = new QQmlApplicationEngine(QGuiApplication::instance());
 
       // Setup the icon theme provider and ki18n
       m_pDeclarative = new KDeclarative::KDeclarative;
       m_pDeclarative->setDeclarativeEngine(e);
       m_pDeclarative->setupBindings();
       try {
          QML_SINGLETON( RecentFileModel          );
-         QML_SINGLETON( ProfileModel             );
-         QML_SINGLETON( PresenceStatusModel      );
-         QML_SINGLETON( EventModel               );
-         QML_SINGLETON( RingtoneModel            );
-
          QML_SINGLETON2( ActionCollection        );
 
          QML_ADD_OBJECT(VideoRateSelectionModel      , &Video::ConfigurationProxy::rateSelectionModel      ());
          QML_ADD_OBJECT(VideoResolutionSelectionModel, &Video::ConfigurationProxy::resolutionSelectionModel());
          QML_ADD_OBJECT(VideoChannelSelectionModel   , &Video::ConfigurationProxy::channelSelectionModel   ());
          QML_ADD_OBJECT(VideoDeviceSelectionModel    , &Video::ConfigurationProxy::deviceSelectionModel    ());
-         { using namespace Media;
-            QML_SINGLETON( RecordingModel        );
-         }
-
-         { using namespace Video;
-            QML_SINGLETON( PreviewManager        );
-         }
 
          qmlRegisterUncreatableType<::Media::Media>(
             AppName, 1,0, "Media", QStringLiteral("cannot be instantiated")
          );
 
-         RingApplication::engine()->rootContext()->setContextProperty(
-            QStringLiteral("SortedContactModel"),
-            CategorizedContactModel::SortedProxy::instance().model()
-         );
-
-         RingApplication::engine()->rootContext()->setContextProperty(
-            QStringLiteral("ContactCategoryModel"),
-            CategorizedContactModel::SortedProxy::instance().categoryModel()
-         );
-
-         RingApplication::engine()->rootContext()->setContextProperty(
-            QStringLiteral("ContactCategorySelectionModel"),
-            CategorizedContactModel::SortedProxy::instance().categorySelectionModel()
-         );
-
-         auto completionModel = new NumberCompletionModel();
-
-         RingApplication::engine()->rootContext()->setContextProperty(
-            QStringLiteral("CompletionModel"), completionModel
-         );
          auto im = new RingingImageProvider();
          e->addImageProvider( QStringLiteral("RingingImageProvider"), im );
          e->addImportPath(QStringLiteral("qrc:/"));
 
          auto im2 = new SymbolicColorizer();
          e->addImageProvider( QStringLiteral("SymbolicColorizer"), im2 );
 
          VideoWidget3::initProvider();
       }
       catch(char const* e) {
          qDebug() << "Failed to connect to the daemon" << e;
          sync();
          ::exit(1);
       }
       catch(...) {
          qDebug() << "Failed to connect to the daemon with an unknown problem";
          ::exit(2);
       }
    }
    return e;
 }
 
 #undef QML_TYPE
 #undef QML_SINGLETON
 #undef QML_ADD_OBJECT
 #undef QML_CRTYPE
 
 QQuickWindow* RingApplication::desktopWindow() const
 {
    static QQuickWindow* dw = nullptr;
    if (!dw) {
       QQmlComponent component(engine());
       component.loadUrl(QUrl(QStringLiteral("qrc:/DesktopWindow.qml")));
       if ( component.isReady() ) {
          qDebug() << "Previous error" << component.errorString();
 
          auto obj2 = component.create();
 
          // I have *no* clue why this is needed... A race somewhere
          while (component.errorString().isEmpty() && !obj2)
             obj2 = component.create();
 
          if (!(dw = qobject_cast<QQuickWindow*>(obj2)))
             qWarning() << "Failed to load:" << component.errorString();
       }
       else
          qWarning() << component.errorString();
    }
 
    Q_ASSERT(dw);
 
    return dw;
 }
 
 ///The daemon is not found
 void RingApplication::daemonTimeout()
 {
    if ((!Session::instance()->callModel()->isConnected()) || (!Session::instance()->callModel()->isValid())) {
       KMessageBox::error(nullptr, ErrorMessage::NO_DAEMON_ERROR);
       exit(1);
    }
 }
 
 void RingApplication::showWizard()
 {
    RingApplication::engine()->rootContext()->setContextProperty(
       QStringLiteral("wizardWelcomeOnly"), QVariant(false)
    );
 
    auto wiz = new WelcomeDialog();
    wiz->show();
 }
 
 void RingApplication::configureAccounts()
 {
    desktopWindow()->setProperty(
       "accountMode", true
    );
 }
 
 ///Exit gracefully
 bool RingApplication::notify (QObject* receiver, QEvent* e)
 {
    try {
       return QApplication::notify(receiver,e);
    }
    catch (const Call::State& state) {
       qDebug() << ErrorMessage::GENERIC_ERROR << "CallState" << state;
       QTimer::singleShot(2500, this, &RingApplication::daemonTimeout);
    }
    catch (const Call::Action& state) {
       qDebug() << ErrorMessage::GENERIC_ERROR << "Call Action" << state;
       QTimer::singleShot(2500, this, &RingApplication::daemonTimeout);
    }
    catch (const QString& errorMessage) {
       KMessageBox::error(nullptr,errorMessage);
       QTimer::singleShot(2500, this, &RingApplication::daemonTimeout);
    }
    catch (const std::exception& e) {
       qDebug() << ErrorMessage::GENERIC_ERROR << e.what();
       KMessageBox::error(nullptr,ErrorMessage::GENERIC_ERROR);
       QTimer::singleShot(2500, this, &RingApplication::daemonTimeout);
 
    }
    catch (...) {
       Q_ASSERT(false);
       qDebug() << ErrorMessage::GENERIC_ERROR;
       KMessageBox::error(nullptr, ErrorMessage::GENERIC_ERROR);
       QTimer::singleShot(2500, this, &RingApplication::daemonTimeout);
    }
    return false;
 }
 
 bool RingApplication::mayHaveFocus()
 {
    return m_HasFocus;
 }
 
 #include <ringapplication.moc>
 
 // kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/timeline/qml/audioplayer.qml b/src/timeline/qml/audioplayer.qml
index 1644ca08..3cd18112 100644
--- a/src/timeline/qml/audioplayer.qml
+++ b/src/timeline/qml/audioplayer.qml
@@ -1,143 +1,144 @@
 /***************************************************************************
  *   Copyright (C) 2017 by Bluesystems                                     *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 3 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, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 import QtQuick 2.7
 import QtQuick.Controls 2.0 as Controls2
 import QtQuick.Layouts 1.0
 import Ring 1.0
+import net.lvindustries.ringqtquick 1.0 as RingQtQuick
 
 Item {
     property QtObject recording: audioRecording
 
     id: audioPlayer
     height: content.implicitHeight
 
     RowLayout {
         id: content
         width: parent.width
         state: "disabled"
 
         Controls2.Button {
             id: reset
             text: "⏮" // "⏸" ⏹ ⏮ ⏭
             Layout.fillHeight: true
             Layout.preferredWidth: 30
             Layout.maximumWidth: 30
             enabled: false
         }
         Controls2.Button {
             id: playPause
             text: "▶"
             Layout.fillHeight: true
             Layout.preferredWidth: 30
             Layout.maximumWidth: 30
             enabled: false
 
             onClicked: {
                 if (!audioRecording.isCurrent) return
 
                 if (stateGroup.state == "enabled")
                     audioRecording.play()
                 else if(stateGroup.state == "playing")
                     audioRecording.pause()
             }
         }
         Controls2.Slider {
             id: progress
             from: 0
             value: audioRecording.position
             to: audioRecording.duration
             Layout.fillWidth: true
             Layout.fillHeight: true
             enabled: false
         }
 
         Controls2.Button {
             id: end
             text: "⏭"
             Layout.preferredWidth: 30
             Layout.maximumWidth: 30
             Layout.fillHeight: true
             enabled: false
         }
     }
 
     Rectangle {
         id: selectOverlay
         color: inactivePalette.base
         opacity: 0.5
         anchors.fill: parent
         Text {
             anchors.centerIn: parent
             text: i18n("Click to play")
             color: inactivePalette.text
         }
         MouseArea {
             anchors.fill: parent
             onClicked: {
-                RecordingModel.currentRecording = recording
+                RingSession.recordingModel.currentRecording = recording
             }
         }
     }
 
     StateGroup {
         id: stateGroup
         states: [
             // Hide all buttons
             State {
                 name: "disabled"
-                when: !recording == RecordingModel.currentRecording
+                when: !recording == RingSession.recordingModel.currentRecording
             },
             State {
                 name: "enabled"
-                when: recording == RecordingModel.currentRecording
+                when: recording == RingSession.recordingModel.currentRecording
 
                 PropertyChanges {
                     target: reset
                     enabled: true
                 }
                 PropertyChanges {
                     target: selectOverlay
                     visible: false
                 }
                 PropertyChanges {
                     target: playPause
                     enabled: true
                 }
                 PropertyChanges {
                     target: progress
                     enabled: true
-                    value: RecordingModel.currentRecording.position
+                    value: RingSession.recordingModel.currentRecording.position
                 }
                 PropertyChanges {
                     target: end
                     enabled: true
                 }
             },
             State {
                 name: "playing"
                 extend: "enabled"
                 when: recording.isPlaying
 
                 PropertyChanges {
                     target: playPause
                     text: "⏸"
                 }
             }
         ]
     }
 }
diff --git a/src/timeline/qml/findpeers.qml b/src/timeline/qml/findpeers.qml
index ad38fb24..43c816f6 100644
--- a/src/timeline/qml/findpeers.qml
+++ b/src/timeline/qml/findpeers.qml
@@ -1,66 +1,66 @@
 /***************************************************************************
  *   Copyright (C) 2017 by Bluesystems                                     *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 3 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, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 import QtQuick 2.7
 
 ListView {
     clip: true
 
     FontMetrics {
         id: fontMetrics
     }
 
     Component {
         id: searchDelegate
         SearchDelegate {
             width: parent.width
             buttonHeight: fontMetrics.height + 12
             labelHeight: fontMetrics.height
         }
     }
 
     highlight: Item {
         anchors.topMargin: 5
         anchors.bottomMargin: 5
         anchors.leftMargin: 5
         anchors.rightMargin: 5
         Rectangle {
             anchors.fill: parent
             anchors.topMargin: 5
             anchors.bottomMargin: 5
             anchors.leftMargin: 10
             anchors.rightMargin: 10
             radius: 5
             color: activePalette.highlight
         }
     }
 
-    model: CompletionModel
+    model: RingSession.numberCompletionModel
     delegate: searchDelegate
 //     add: Transition {
 //         NumberAnimation {
 //             properties: "y"
 //             duration: 100
 //         }
 //     }
 //     addDisplaced: Transition {
 //         NumberAnimation {
 //             properties: "y"
 //             duration: 100
 //         }
 //     }
 }
diff --git a/src/timeline/qml/historytimeline.qml b/src/timeline/qml/historytimeline.qml
index 3a5108c1..94ef32d5 100644
--- a/src/timeline/qml/historytimeline.qml
+++ b/src/timeline/qml/historytimeline.qml
@@ -1,199 +1,200 @@
 /***************************************************************************
  *   Copyright (C) 2018 by Bluesystems                                     *
  *   Author : Emmanuel Lepage Vallee <elv1313@gmail.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 3 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, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 import QtQuick 2.7
 import QtQuick.Layouts 1.0
 import QtQuick.Controls 2.0
 import QtQml.Models 2.2
 import RingQmlWidgets 1.0
 import Ring 1.0
 import ContactView 1.0
 import org.kde.kirigami 2.2 as Kirigami
+import net.lvindustries.ringqtquick 1.0 as RingQtQuick
 
 Kirigami.Page {
     id: bookmarkList
     signal contactMethodSelected(var cm)
 
     leftPadding: 0
     topPadding: 0
     bottomPadding: 0
     rightPadding: 0
 
     SystemPalette {
         id: inactivePalette
         colorGroup: SystemPalette.Disabled
     }
 
     SystemPalette {
         id: activePalette
         colorGroup: SystemPalette.Active
     }
 
     FontMetrics {
         id: fontMetrics
     }
 
     Rectangle {
         color: activePalette.base
         anchors.fill: parent
 
         ListView {
             id: treeView
             anchors.fill: parent
             width: parent.width
             highlightFollowsCurrentItem: true
 
-            model: EventModel
+            model: RingSession.eventModel
 
 
             section.property: "formattedLastUsed"
             section.criteria: ViewSection.FullString
             section.delegate: Text {
                 color: inactivePalette.text
                 text: section
             }
 
             highlight: Item {
 
                 anchors.topMargin: 5
                 anchors.bottomMargin: 5
                 anchors.leftMargin: 30
                 anchors.rightMargin: 40
 
                 Rectangle {
                     anchors.fill: parent
                     anchors.topMargin: 5
                     anchors.bottomMargin: 5
                     anchors.leftMargin: 30
                     anchors.rightMargin: 40
                     radius: 10
                     color: activePalette.highlight
                 }
             }
 
             delegate: Item {
                 height: 5*fontMetrics.height + 13
                 width: parent.width
 
                 Rectangle {
                     width: 1
                     color: inactivePalette.text
                     height: parent.height
                     x: 10
                 }
 
                 Rectangle {
                     radius: 99
                     color: activePalette.base
                     border.width: 1
                     border.color: inactivePalette.text
                     width: 16
                     height: 16
                     y: 10
                     x: 3 // (16 - 10) / 2
 
                     Rectangle {
                         id: demandsAttention
                         radius: 99
                         color: inactivePalette.text
                         anchors.centerIn: parent
                         height: 8
                         width: 8
                     }
                 }
 
                 Rectangle {
                     border.color: inactivePalette.text
                     border.width: 1
                     anchors.fill: parent
 
                     anchors.topMargin: 5
                     anchors.bottomMargin: 5
                     anchors.leftMargin: 30
                     anchors.rightMargin: 40
 
                     color: "transparent"
                     radius: 10
 
                     ColumnLayout {
                         anchors.fill: parent
                         RowLayout {
                             Layout.fillWidth: true
                             height: 3*fontMetrics.height
 
                             Item {
                                 anchors.margins: 4
 
                                 height: parent.height
                                 width:  parent.height
 
                                 ContactPhoto {
                                     anchors.margins: 3
                                     anchors.fill: parent
                                     event: object
                                     defaultColor: ListView.isCurrentItem ?
                                         activePalette.highlightedText : activePalette.text
                                     drawEmptyOutline: false
                                 }
                             }
 
                             Text {
                                 text: bestName
                                 clip: true
                                 font.bold : true
                                 Layout.fillWidth: true
                                 anchors.verticalCenter: parent.verticalCenter
                                 color: ListView.isCurrentItem ?
                                     activePalette.highlightedText : activePalette.text
                             }
                         }
 
                         Rectangle {
                             color: inactivePalette.text
                             height:1
                             Layout.fillWidth: true
                         }
 
                         Text {
                             Layout.fillWidth: true
                             text: formattedDate
 
                             height: 2*fontMetrics.height
                             leftPadding: 10
 
                             verticalAlignment: Text.AlignVCenter
                             color: ListView.isCurrentItem ?
                                 activePalette.highlightedText : inactivePalette.text
                         }
 
                         Item {
                             Layout.fillHeight: true
                         }
                     }
                 }
 
                 MouseArea {
                     anchors.fill: parent
                     onClicked: {
                         treeView.currentIndex = index
                     }
                 }
             }
 //             sortingEnabled: true
         }
     }
 }