diff --git a/src/accessibility.cpp b/src/accessibility.cpp
index cd66a521..d8193881 100644
--- a/src/accessibility.cpp
+++ b/src/accessibility.cpp
@@ -1,132 +1,132 @@
 /***************************************************************************
  *   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 "accessibility.h"
 
 //KDE
 // #include <KSpeech>
 #include <klocalizedstring.h>
 
 //Qt
 #include <QtCore/QDateTime>
 #include <QtCore/QTime>
 #include <QTextToSpeech>
 #include <QtGui/QIcon>
 
 //Ring
 #include <call.h>
 #include <callmodel.h>
 #include <contactmethod.h>
 #include "phonewindow.h"
 #include "view.h"
 
 Accessibility* Accessibility::m_pInstance = nullptr;
 
 ///Constructor
 Accessibility::Accessibility() : QObject(0),QList<QAction *>()
 {
    QAction * action = new QAction(0);
    action->setObjectName ( "listCall"               );
    action->setShortcut   ( Qt::CTRL + Qt::Key_L     );
    action->setText       ( i18n("List all current calls") );
    action->setIcon       ( QIcon::fromTheme("text-speak")      );
    *this << action;
    connect(action,SIGNAL(triggered(bool)),this,SLOT(listCall()));
 
    action = new QAction(0);
    action->setObjectName ( "currentCallDetails"       );
    action->setShortcut   ( Qt::CTRL + Qt::Key_I       );
    action->setText       ( i18n("Get current call details") );
    action->setIcon       ( QIcon::fromTheme("text-speak")        );
    *this << action;
    connect(action,SIGNAL(triggered(bool)),this,SLOT(currentCallDetails()));
 
    m_Speech = new QTextToSpeech(this);
 }
 
 Accessibility::~Accessibility()
 {
    for (int i=0;i<QList<QAction *>::size();i++){
       delete QList<QAction *>::at(i);
    }
 }
 
 ///Signleton
 Accessibility* Accessibility::instance()
 {
    if (! m_pInstance) {
       m_pInstance = new Accessibility();
    }
    return m_pInstance;
 }
 
 ///Use the speech daemon to read details about the current calls
 void Accessibility::listCall()
 {
-   if (CallModel::instance().getActiveCalls().size()>0) {
-      m_Speech->say(i18np("You currently have <numid>%1</numid> call","You currently have <numid>%1</numid> calls",CallModel::instance().getActiveCalls().size()));
-      foreach (Call* call,CallModel::instance().getActiveCalls()) {
+   if (Session::instance()->callModel()->getActiveCalls().size()>0) {
+      m_Speech->say(i18np("You currently have <numid>%1</numid> call","You currently have <numid>%1</numid> calls",Session::instance()->callModel()->getActiveCalls().size()));
+      foreach (Call* call,Session::instance()->callModel()->getActiveCalls()) {
          m_Speech->say(i18n("Call from %1, number %2",call->peerName(),numberToDigit((!call->peerContactMethod()->uri().isEmpty())?call->peerContactMethod()->uri():call->dialNumber())));
       }
    }
    else {
       m_Speech->say(i18n("You currently have no call"));
    }
 }
 
 ///Convert number to digit so the speech daemon say "one two three" instead of "one hundred and twenty three"
 QString Accessibility::numberToDigit(const QString &number)
 {
    QString toReturn;
    for(int i=0;i<number.count();i++) {
       if (i+1 < number.count() && (number[i] >= 0x30 && number[i] <= 0x39) && (number[i+1] >= 0x30 && number[i+1] <= 0x39))
          toReturn += QString(number[i])+' ';
       else
          toReturn += number[i];
    }
    return toReturn;
 }
 
 ///Use the speech daemon to read the current call details
 void Accessibility::currentCallDetails()
 {
-   foreach (Call* call,CallModel::instance().getActiveCalls()) {
-      if (CallModel::instance().selectedCall() == call) {
+   foreach (Call* call,Session::instance()->callModel()->getActiveCalls()) {
+      if (Session::instance()->callModel()->selectedCall() == call) {
          QString toSay = i18n("The current call is %1",i18n(call->toHumanStateName(call->state()).toLatin1() ));
          if (!call->peerName().trimmed().isEmpty())
             toSay += i18n(",Your peer is %1",numberToDigit(call->peerName()));
          if (!call->peerContactMethod()->uri().isEmpty())
             toSay += i18n(", the peer phone number is %1 ",numberToDigit(call->peerContactMethod()->uri())    );
          else if (!call->dialNumber().isEmpty())
             toSay += i18n(", the phone number is %1 ",numberToDigit(call->dialNumber()));
 
          const int nSec = QDateTime::fromTime_t(call->startTimeStamp()).time().secsTo( QTime::currentTime() );
          if (nSec>0)
             toSay += i18n(" and you have been talking since %1 seconds",nSec );
 
          m_Speech->say(toSay);
       }
    }
 }
 
 ///Helper function is make code shorter
 void Accessibility::say(const QString &message)
 {
    m_Speech->say(message);
 }
 
 // kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/actioncollection.cpp b/src/actioncollection.cpp
index c5d36d4c..5d618e8d 100644
--- a/src/actioncollection.cpp
+++ b/src/actioncollection.cpp
@@ -1,499 +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 <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 = CallModel::instance().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);
 }
 
 ///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(
       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 (!CallModel::instance().rowCount())
-         CallModel::instance().userActionModel() << UserActionModel::Action::ADD_NEW;
+      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 7016b635..f7ca05cd 100644
--- a/src/callview/imageprovider.cpp
+++ b/src/callview/imageprovider.cpp
@@ -1,282 +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(&CallModel::instance(), &CallModel::rendererAdded,
+    QObject::connect(Session::instance()->callModel(), &CallModel::rendererAdded,
         d_ptr, &ImageProviderPrivate::addRenderer);
 
-    QObject::connect(&CallModel::instance(), &CallModel::rendererRemoved,
+    QObject::connect(Session::instance()->callModel(), &CallModel::rendererRemoved,
         d_ptr, &ImageProviderPrivate::removeRenderer);
 
     QObject::connect(&Video::PreviewManager::instance(), &Video::PreviewManager::previewStarted,
         d_ptr, &ImageProviderPrivate::previewStarted);
 
     QObject::connect(&Video::PreviewManager::instance(), &Video::PreviewManager::previewStopped,
         d_ptr, &ImageProviderPrivate::previewStopped);
 
     // Check if there is active renderers
 
-    foreach(Call* c, CallModel::instance().getActiveCalls()) {
+    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());
 }
 
 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/actiontoolbar.qml b/src/callview/qml/actiontoolbar.qml
index c99b1047..adb75ae7 100644
--- a/src/callview/qml/actiontoolbar.qml
+++ b/src/callview/qml/actiontoolbar.qml
@@ -1,286 +1,286 @@
 /***************************************************************************
  *   Copyright (C) 2015 by Emmanuel Lepage Vallee                          *
  *   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.0
 import Ring 1.0
 import QtQuick.Layouts 1.0
 import net.lvindustries.ringqtquick 1.0 as RingQtQuick
 import net.lvindustries.ringqtquick.models 1.0 as RingQtModels
 
 import org.kde.playground.kquickitemviews 1.0 as KQuickItemViews
 
 Rectangle {
     id: toolbar
     color: "#55000000"
     height: actionGrid.contentHeight
     width:parent.width
     y:parent.height-toolbar.height -10
     z: 100
 
     property var userActionModel: null
 
     Timer {
         id: hideLabel
         running: false
         repeat: false
         interval: 5000
         onTriggered: {
             currentText.visible = false
         }
     }
 
     // Use a separate label. This allows to use only icons in the buttons,
     // this reducing the footprint and avoiding a second row.
     Rectangle {
         id: currentText
         clip: true
         color: "#333333"
         height: 20
         width: 200
         radius: 99 // circle
         visible: false
         anchors.horizontalCenter: parent.horizontalCenter
         y: - 30
         Text {
             id: currentTextText
             anchors.fill: parent
             color: "white"
             font.bold : true
             horizontalAlignment: Text.AlignHCenter
             verticalAlignment: Text.AlignVCenter
             onContentWidthChanged: parent.width = contentWidth + 20
             onContentHeightChanged: parent.height = contentHeight + 10
         }
 
         Behavior on width {
             NumberAnimation {duration: 50}
         }
     }
 
     // Show the accept and hangup buttons in green and red
     function selectColor(action) {
         if (action == RingQtModels.UserActionModel.HANGUP)
             return "#550000";
         else if(action == RingQtModels.UserActionModel.ACCEPT)
             return "#005500"
 
         // Default
         return "#CC222222"
     }
 
     function selectLabelColor(action) {
         if (action == RingQtModels.UserActionModel.HANGUP ||
           action == RingQtModels.UserActionModel.ACCEPT)
             return "white"
 
         // Default
         return "white"
     }
 
     Component {
         id: actionDelegate
 
 
         Item {
             id: mainArea
             width:  actionGrid.cellWidth
             height: actionGrid.cellHeight
             Rectangle {
                 id: background
                 color:  mouseArea.containsMouse ? "#CC333333" : selectColor(action)
                 radius: 99 // circle
                 anchors.leftMargin: 5
                 anchors.rightMargin: 5
                 anchors.fill: parent
                 border.width:  mouseArea.containsMouse ? 3 : 0
                 border.color: "#dd5555"
 
                 RowLayout {
                     anchors.margins: 15
                     anchors.fill: parent
                     KQuickItemViews.DecorationAdapter {
                         anchors.verticalCenter: parent.verticalCenter
                         pixmap: decoration
                         width:  30
                         height:  30
                     }
                     Text {
                         id: label
                         text: display
                         visible: false
                         horizontalAlignment: Text.AlignHCenter
                         verticalAlignment: Text.AlignVCenter
                         color: selectLabelColor(action)
                         font.bold: true
 
                         anchors.leftMargin: 10
                         Layout.fillHeight: true
                         Layout.fillWidth: true
                         anchors.verticalCenter: parent.verticalCenter
                     }
                 }
 
                 MouseArea {
                     id: mouseArea
                     anchors.fill: parent
                     hoverEnabled: true
                     z: 101
                     onClicked: {
                         userActionModel.execute(action)
                     }
                     onContainsMouseChanged: {
                         if (containsMouse) {
                             currentText.visible = true
                             currentTextText.text = display
                         }
                         hideLabel.restart()
                     }
                 }
 
                 Behavior on color {
                     ColorAnimation {duration: 300}
                 }
 
                 Behavior on border.width {
                     NumberAnimation {duration: 200}
                 }
 
                 StateGroup {
                     id: stateGroup
                     states: [
                         State {
                             name: ""
                             when: actionGrid.count > 2 || actionGrid.count == 0
                             PropertyChanges {
                                 target: background
                                 radius: 99
                                 anchors.margins: 0
                             }
                             PropertyChanges {
                                 target: mainArea
                                 width: 70
                             }
                             PropertyChanges {
                                 target: label
                                 visible: false
                             }
                         },
                         State {
                             name: "single"
                             when: actionGrid.count == 1
                             PropertyChanges {
                                 target: background
                                 radius: 5
                                 anchors.margins: 2
                             }
                             PropertyChanges {
                                 target: mainArea
                                 width: (toolbar.width/1)
                             }
                             PropertyChanges {
                                 target: label
                                 visible: true
                             }
                         },
                         State {
                             name: "two"
                             when: actionGrid.count == 2
                             PropertyChanges {
                                 target: background
                                 radius: 5
                                 anchors.margins: 2
                             }
                             PropertyChanges {
                                 target: mainArea
                                 width: (toolbar.width/2)
                             }
                             PropertyChanges {
                                 target: label
                                 visible: true
                             }
                         }
                     ]
                 }
             }
         }
     }
 
     GridView  {
         id: actionGrid
         anchors.fill: parent
-        model: CallModel.userActionModel.activeActionModel
+        model: RingQtQuick.Session.callModel.userActionModel.activeActionModel
         delegate: actionDelegate
         cellWidth: 70; cellHeight: 60
 
         StateGroup {
             id: stateGroup
             states: [
                 State {
                     name: ""
                     when: actionGrid.count > 2 || actionGrid.count == 0
                     PropertyChanges {
                         target: actionGrid
                         cellWidth: 70
                     }
                 },
                 State {
                     name: "single2"
                     when: actionGrid.count == 1
                     PropertyChanges {
                         target: actionGrid
                         cellWidth: (toolbar.width/1)
                     }
                 },
                 State {
                     name: "two2"
                     when: actionGrid.count == 2
                     PropertyChanges {
                         target: actionGrid
                         cellWidth: (toolbar.width/2)
                     }
                 }
             ]
         }
     }
 
     // Hide the label when the mouse is out
     MouseArea {
         z: -100
         anchors.fill: parent
         hoverEnabled: true
         onContainsMouseChanged: {
             if (!containsMouse)
                 currentText.visible = false
         }
     }
 
     onVisibleChanged: {
         if (!visible)
             currentText.visible = false
     }
 
     onUserActionModelChanged: {
         if (!userActionModel) {
-            userActionModel = CallModel.userActionModel
+            userActionModel = RingQtQuick.Session.callModel.userActionModel
             return
         }
 
         actionGrid.model = (userActionModel && userActionModel.activeActionModel) ?
-            userActionModel.activeActionModel : CallModel.userActionModel.activeActionModel
+            userActionModel.activeActionModel : RingQtQuick.Session.callModel.userActionModel.activeActionModel
     }
 }
diff --git a/src/callview/videowidget.cpp b/src/callview/videowidget.cpp
index 1b6b2fb5..ed2b0480 100644
--- a/src/callview/videowidget.cpp
+++ b/src/callview/videowidget.cpp
@@ -1,248 +1,249 @@
 /***************************************************************************
  *   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 "videowidget.h"
 
 #include <QQmlApplicationEngine>
 #include <QQuickPaintedItem>
 #include <QQmlEngine>
 #include <QtGui/QPixmap>
 #include <QtGui/QPainter>
 #include <QtCore/QMimeData>
 
 #include <qrc_callview.cpp>
 #include <../ringapplication.h>
 
 #include <video/previewmanager.h>
 #include <video/sourcemodel.h>
 #include <call.h>
 #include <callmodel.h>
+#include <session.h>
 #include <useractionmodel.h>
 
 #include "imageprovider.h"
 
 class VideoWidget3Private final : public QObject
 {
     Q_OBJECT
 public:
     explicit VideoWidget3Private(VideoWidget3* parent) : QObject(parent), q_ptr(parent) {}
     VideoWidget3::Mode m_Mode {VideoWidget3::Mode::CONVERSATION};
     static ImageProvider* m_spProvider;
     Video::SourceModel* m_pSourceModel {nullptr};
 
     VideoWidget3* q_ptr;
 
 public Q_SLOTS:
     void slotRendererIssue();
     void slotRendererRestored();
 };
 
 // Only one must exist per context, better not try to regenerate it
 ImageProvider* VideoWidget3Private::m_spProvider = nullptr;
 
 VideoWidget3::VideoWidget3(QWidget* parent) :
     VideoWidget3(VideoWidget3::Mode::CONVERSATION, parent)
 {
-    connect(&CallModel::instance(), &CallModel::rendererAdded,
+    connect(Session::instance()->callModel(), &CallModel::rendererAdded,
         this, &VideoWidget3::addRenderer);
 
-    connect(&CallModel::instance(), &CallModel::rendererRemoved,
+    connect(Session::instance()->callModel(), &CallModel::rendererRemoved,
         this, &VideoWidget3::removeRenderer);
 }
 
 void VideoWidget3::initProvider()
 {
     if (!VideoWidget3Private::m_spProvider) {
         VideoWidget3Private::m_spProvider = new ImageProvider();
         RingApplication::engine()->addImageProvider(
             QStringLiteral("VideoFrame"), VideoWidget3Private::m_spProvider
         );
     }
 }
 
 VideoWidget3::VideoWidget3(VideoWidget3::Mode mode, QWidget* parent) :
     QQuickWidget(RingApplication::engine(), parent), d_ptr(new VideoWidget3Private(this))
 {
     d_ptr->m_Mode = mode;
 
     initProvider();
 
     setResizeMode(QQuickWidget::SizeRootObjectToView);
     setSource(QUrl(QStringLiteral("qrc:/CallView.qml")));
 
     setMode(mode);
 
     setAcceptDrops(true);
     installEventFilter(this);
 
     if (mode == Mode::CONVERSATION) {
-        connect(&CallModel::instance(), &CallModel::rendererAdded,
+        connect(Session::instance()->callModel(), &CallModel::rendererAdded,
             this, &VideoWidget3::addRenderer);
 
-        connect(&CallModel::instance(), &CallModel::rendererRemoved,
+        connect(Session::instance()->callModel(), &CallModel::rendererRemoved,
             this, &VideoWidget3::removeRenderer);
     }
 }
 
 VideoWidget3::~VideoWidget3()
 {
     delete d_ptr;
 }
 
 bool VideoWidget3::eventFilter(QObject *obj, QEvent *event)
 {
     Q_UNUSED(obj)
 
     if (event->type() == QEvent::DragEnter) {
         auto e = static_cast<QDragEnterEvent*>(event);
         e->acceptProposedAction();
         event->accept();
         return true;
     }
     else if (event->type() == QEvent::DragMove) {
         event->accept();
         return true;
     }
     else if (event->type() == QEvent::KeyRelease) {
         auto e = static_cast<QKeyEvent*>(event);
         if (e->key() == Qt::Key_Escape) {
             if (auto c = qvariant_cast<Call*>(rootObject()->property("call"))) {
                 c->userActionModel() << UserActionModel::Action::HANGUP;
                 e->accept();
                 return true;
             }
         }
     }
     else if (event->type() == QEvent::Drop) {
         auto e = static_cast<QDropEvent*>(event);
         if (d_ptr->m_pSourceModel && e->mimeData()->hasFormat(QStringLiteral("text/uri-list"))) {
             const auto url =  QUrl(e->mimeData()->data(QStringLiteral("text/uri-list")).trimmed());
             d_ptr->m_pSourceModel->setFile(url);
             e->accept();
             return true;
         }
     }
 
     return QQuickWidget::eventFilter(obj, event);
 }
 
 void VideoWidget3::setCall(Call* c)
 {
    rootObject()->setProperty("call", QVariant::fromValue(c));
 }
 
 void VideoWidget3::addRenderer(Call* call, Video::Renderer* renderer)
 {
     Q_UNUSED(call)
     if (d_ptr->m_Mode != Mode::CONVERSATION)
         return;
 
     connect(renderer, &Video::Renderer::failure,
         d_ptr, &VideoWidget3Private::slotRendererIssue);
     connect(renderer, &Video::Renderer::failure,
         d_ptr, &VideoWidget3Private::slotRendererRestored);
 
     rootObject()->setProperty("peerRunning", true);
 }
 
 void VideoWidget3::removeRenderer(Call* call, Video::Renderer* renderer)
 {
     Q_UNUSED(call)
     if (d_ptr->m_Mode != Mode::CONVERSATION)
         return;
 
     disconnect(renderer, &Video::Renderer::failure,
         d_ptr, &VideoWidget3Private::slotRendererIssue);
     disconnect(renderer, &Video::Renderer::failure,
         d_ptr, &VideoWidget3Private::slotRendererRestored);
 
     rootObject()->setProperty("peerRunning", false);
 }
 
 void VideoWidget3::slotRotateLeft()
 {
     //TODO
 }
 
 void VideoWidget3::slotRotateRight()
 {
     //TODO
 }
 
 void VideoWidget3::slotShowPreview(bool show)
 {
     Q_UNUSED(show)
     rootObject()->setProperty("displayPreview", show);
     //TODO
 }
 
 void VideoWidget3::slotMuteOutgoindVideo(bool mute)
 {
     Q_UNUSED(mute)
     //TODO
 }
 
 void VideoWidget3::slotKeepAspectRatio(bool mute)
 {
     Q_UNUSED(mute)
     //TODO
 }
 
 void VideoWidget3::slotPreviewEnabled(bool show)
 {
     Q_UNUSED(show)
     //TODO
 }
 
 void VideoWidget3::setSourceModel(Video::SourceModel* model)
 {
     d_ptr->m_pSourceModel = model;
 }
 
 void VideoWidget3::setMode(VideoWidget3::Mode mode)
 {
     d_ptr->m_Mode = mode;
 
     Q_ASSERT(rootObject());
 
     switch(mode) {
         case Mode::CONVERSATION:
             rootObject()->setProperty("mode", "CONVERSATION");
             rootObject()->setProperty("rendererName", "peer");
             break;
         case Mode::PREVIEW:
             rootObject()->setProperty("mode", "PREVIEW");
             rootObject()->setProperty("rendererName", "preview");
             break;
         case Mode::SELFIE:
             rootObject()->setProperty("mode", "SELFIE");
             rootObject()->setProperty("rendererName", "preview");
             break;
     }
 }
 
 void VideoWidget3Private::slotRendererIssue()
 {
     q_ptr->rootObject()->setProperty("peerRunning", false);
 }
 
 void VideoWidget3Private::slotRendererRestored()
 {
     q_ptr->rootObject()->setProperty("peerRunning", true);
 }
 
 #include <videowidget.moc>
diff --git a/src/cmd.cpp b/src/cmd.cpp
index 2e0f948b..dff49b3c 100644
--- a/src/cmd.cpp
+++ b/src/cmd.cpp
@@ -1,224 +1,225 @@
 /***************************************************************************
  *   Copyright (C) 2013-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 "cmd.h"
 
 //Qt
 #include <QtCore/QCoreApplication>
 #include <QtCore/QTimer>
 #include <QtCore/QCommandLineParser>
 #include <QtCore/QCommandLineOption>
 
 //KDE
 #include <KAboutData>
 #include <klocalizedstring.h>
 
 //Ring
 #include <call.h>
 #include <callmodel.h>
+#include <session.h>
 #include <media/text.h>
 #include "ringapplication.h"
 #include "klib/kcfg_settings.h"
 
 //Static definition
 Cmd* Cmd::m_spSelf = nullptr;
 
 ///(Private) constructor
 Cmd::Cmd(QObject* parent) : QObject(parent)
 {
 }
 
 ///Signleton
 Cmd* Cmd::instance() {
    if (!m_spSelf) {
       m_spSelf = new Cmd();
    }
    return m_spSelf;
 }
 
 ///Setup command line options before passing them to the KUniqueApplication
 bool Cmd::parseCmd(int argc, char **argv, KAboutData& about)
 {
    Q_UNUSED(argc)
    Q_UNUSED(argv)
 
    QCoreApplication* app = QCoreApplication::instance();
 
    QCommandLineOption call      (QStringList { "place-call" }, i18n("Place a call to a given number"                                              ), QStringLiteral("number" ), QLatin1String(""));
    QCommandLineOption text      (QStringList { "send-text"  }, i18n("Send a text to &lt;number&gt;, use --message to set the content, then hangup"), QStringLiteral("number" ), QLatin1String(""));
    QCommandLineOption message   (QStringList { "message"    }, i18n("Used in combination with --send-text"                                        ), QStringLiteral("content"), QLatin1String(""));
    QCommandLineOption icon      (QStringList { "iconify"    }, i18n("Start in the system tray"                                                    )                                             );
    QCommandLineOption showPhone (QStringList { "phone"      }, i18n("Start with the phone interface"                                              )                                             );
    QCommandLineOption showTimeL (QStringList { "timeline"   }, i18n("Start with the timeline interface"                                           )                                             );
 
    QCommandLineParser parser;
    parser.addOptions({call,text,message,icon,showPhone,showTimeL});
 
    about.setupCommandLine(&parser);
 
    parser.process(*app);
 
    about.processCommandLine(&parser);
 
    const auto versionOption = parser.addVersionOption();
    const auto helpOption    = parser.addHelpOption   ();
 
    if (parser.isSet(versionOption) || parser.isSet(helpOption))
       return false;
 
    RingApplication::instance()->init();
 
    if (parser.isSet(call))
       placeCall(parser.value(call));
 
    if (parser.isSet(icon))
       iconify();
    if (parser.isSet(showPhone))
       phoneInterface();
    if (parser.isSet(showTimeL))
       timelineInterface();
 
    if (parser.isSet(text) && parser.isSet(message))
       sendText(parser.value(text),parser.value(message));
 
    return true;
 }
 
 ///Place a call (from the command line)
 void Cmd::placeCall(const QString& number)
 {
    if (number.isEmpty()) {
       qWarning() << "Example: --place-call 123@example.com";
       return;
    }
 
    //Wait until the initialization is done
    QTimer::singleShot(0,[number] {
-      Call* call = CallModel::instance().dialingCall();
+      Call* call = Session::instance()->callModel()->dialingCall();
       call->reset();
       call->appendText(number);
       call->performAction(Call::Action::ACCEPT);
    });
 }
 
 ///Send a text ans hang up (from the command line)
 void Cmd::sendText(const QString& number, const QString& text)
 {
    Q_UNUSED(number)
    Q_UNUSED(text)
    QTimer::singleShot(0,[number,text] {
-      Call* call = CallModel::instance().dialingCall();
+      Call* call = Session::instance()->callModel()->dialingCall();
       call->reset();
       call->appendText(number);
       call->setProperty("message",text);
       QObject::connect(call,&Call::lifeCycleStateChanged,[text,call](const Call::LifeCycleState st) {
          if (st == Call::LifeCycleState::PROGRESS) {
             call->addOutgoingMedia<Media::Text>()->send({{"text/plain",call->property("message").toString()}});
             call->performAction(Call::Action::REFUSE); //HangUp
          }
       });
       call->performAction(Call::Action::ACCEPT);
    });
 }
 
 void Cmd::iconify()
 {
    if (RingApplication::instance()) {
       RingApplication::instance()->setIconify(true);
    }
 }
 
 void Cmd::phoneInterface()
 {
    if (RingApplication::instance()) {
       RingApplication::instance()->setStartPhone(true);
    }
 }
 
 void Cmd::timelineInterface()
 {
    if (RingApplication::instance()) {
       RingApplication::instance()->setStartTimeline(true);
    }
 }
 
 void Cmd::slotActivateActionRequested (const QString&, const QVariant&)
 {
 }
 
 /**
  * This function is called when a new client try to open. It will stop but this
  * process need to take care of its arguments.
  */
 void Cmd::slotActivateRequested (const QStringList& args, const QString& cwd)
 {
    Q_UNUSED(cwd)
 
    enum class Current {
       NONE      , /* No args */
       PLACE_CALL, /* One arg */
       SEND_TEXT , /* One arg */
       MESSAGE   , /* One arg */
       MINIMIZED   /* No args */
    };
 
    Current current = Current::NONE;
    bool sendMessage = false;
    QStringList messages;
    QString sendTextTo;
 
    for(const QString& arg : args) {
       if (current != Current::NONE) {
          switch(current) {
             case Current::NONE      :
             case Current::MINIMIZED :
                //Iconify do nothing when the executable is already started
                break;
             case Current::SEND_TEXT :
                sendTextTo = arg;
                break;
             case Current::PLACE_CALL:
                placeCall(arg);
                break;
             case Current::MESSAGE   :
                messages << arg;
                break;
          }
       }
       else {
          if (arg == QLatin1String("--place-call"))
             current = Current::PLACE_CALL;
          else if (arg == QLatin1String("--send-text"))
             sendMessage = true;
          else if (arg == QLatin1String("--message"))
             current = Current::MESSAGE;
          else if (arg == QLatin1String("--iconify"))
          {}//TODO
       }
    }
 
    if (sendMessage && sendTextTo.size() && messages.size()) {
       foreach (const QString& msg, messages)
          sendText(sendTextTo, msg);
    }
 }
 
 void Cmd::slotOpenRequested (const QList<QUrl>&)
 {
 }
 
 // kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/contactview/mainpage.cpp b/src/contactview/mainpage.cpp
index 3011185d..11d673b0 100644
--- a/src/contactview/mainpage.cpp
+++ b/src/contactview/mainpage.cpp
@@ -1,381 +1,382 @@
 /***************************************************************************
  *   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 "mainpage.h"
 
 #include <QQmlApplicationEngine>
 #include <QQuickPaintedItem>
 #include <QQuickWindow>
 #include <QQmlEngine>
 #include <QtGui/QPixmap>
 #include <QtGui/QPainter>
 #include <QtGui/QIcon>
 #include <QtCore/QMimeData>
 #include <QtCore/QTimer>
 #include <QtCore/QSortFilterProxyModel>
 #include <QQmlContext>
 
 #include <../ringapplication.h>
 #include "peerstimelinemodel.h"
 #include "phonedirectorymodel.h"
 #include <contactmethod.h>
 #include <libcard/eventaggregate.h>
 #include <individual.h>
 #include <person.h>
 #include <call.h>
 #include <callmodel.h>
+#include <session.h>
 
 // Remove inactive calls from the CallModel
 class ActiveCallProxy2 : public QSortFilterProxyModel
 {
     Q_OBJECT
 
 public:
     explicit ActiveCallProxy2(QObject* parent) : QSortFilterProxyModel(parent) {}
 
 protected:
     virtual bool filterAcceptsRow(int row, const QModelIndex & srcParent ) const override;
 };
 
 class MainPagePrivate final : public QObject {
     Q_OBJECT
 public:
     QSharedPointer<QAbstractItemModel> m_CallsModel;
     Individual* m_Invididual {nullptr};
     QSharedPointer<QAbstractItemModel> m_TimelineModel;
     QQuickItem* m_pItem   {nullptr};
     QQuickItem* m_pHeader {nullptr};
 
     QList< QTimer* > m_lTimers;
 
     MainPage* q_ptr;
 
 public Q_SLOTS:
     void slotWindowChanged();
 };
 
 MainPage::MainPage(QQuickItem* parent) :
     QQuickItem(parent), d_ptr(new MainPagePrivate)
 {
     d_ptr->q_ptr = this;
-    auto cp = new ActiveCallProxy2(&CallModel::instance());
-    cp->setSourceModel(&CallModel::instance());
+    auto cp = new ActiveCallProxy2(Session::instance()->callModel());
+    cp->setSourceModel(Session::instance()->callModel());
 
     QFile file(QStringLiteral(":/assets/welcome.html"));
     if (file.open(QIODevice::ReadOnly))
         RingApplication::engine()->rootContext()->setContextProperty(QStringLiteral("welcomeMessage"), file.readAll());
 
     RingApplication::engine()->rootContext()->setContextProperty(QStringLiteral("ActiveCallProxyModel"), cp);
 
     connect(this, &QQuickItem::windowChanged, d_ptr, &MainPagePrivate::slotWindowChanged);
-    connect(&CallModel::instance(), &CallModel::callAttentionRequest, this, &MainPage::showVideo);
+    connect(Session::instance()->callModel(), &CallModel::callAttentionRequest, this, &MainPage::showVideo);
 
     installEventFilter(this);
 
     // Wait a bit, the timeline will change while it is loading, so before
     // picking something at random, give it a chance to load some things.
     QTimer::singleShot(500, [this]() {
         if (d_ptr->m_Invididual)
             return;
 
         auto i = PeersTimelineModel::instance().mostRecentIndividual();
 
         // Select whatever is first (if any)
         if ((!i) && PeersTimelineModel::instance().rowCount())
             if (auto rawI = qvariant_cast<Individual*>(
                 PeersTimelineModel::instance().index(0,0).data((int)Ring::Role::Object)
             ))
                 i = rawI;
 
         // There is nothing yet, wait
         if (!i) {
             QMetaObject::Connection c;
 
             c = connect(&PeersTimelineModel::instance(), &QAbstractItemModel::rowsInserted, this, [c, this]() {
                 if (d_ptr->m_Invididual) {
                     disconnect(c);
                     return;
                 }
 
                 if (auto i = PeersTimelineModel::instance().mostRecentIndividual()) {
                     disconnect(c);
                     setIndividual(i);
                     const auto idx = PeersTimelineModel::instance().individualIndex(i);
                     emit suggestSelection(i, idx);
                 }
             });
 
             return;
         }
 
         setIndividual(i);
 
         if (i) {
             const auto idx = PeersTimelineModel::instance().individualIndex(i);
             emit suggestSelection(i, idx);
         }
     });
 }
 
 MainPage::~MainPage()
 {
     d_ptr->m_TimelineModel.clear();
     d_ptr->m_Invididual = nullptr;
     d_ptr->m_CallsModel.clear();
 
     // Release the shared pointer reference from the timer.
     for (auto t : qAsConst(d_ptr->m_lTimers)) {
         disconnect(t);
         delete t;
     }
 
     delete d_ptr;
 }
 
 bool MainPage::eventFilter(QObject *obj, QEvent *event)
 {
     Q_UNUSED(obj)
     Q_UNUSED(event)
     //TODO the context menu
     return false;
 }
 
 void MainPage::setIndividual(Individual* ind)
 {
     if (!ind)
         return;
 
     if (d_ptr->m_TimelineModel) {
         disconnect(d_ptr->m_TimelineModel.data(), &QAbstractItemModel::rowsInserted,
             this, &MainPage::contextInserted);
     }
 
     d_ptr->m_Invididual = ind;
     d_ptr->m_TimelineModel = ind->timelineModel();
     d_ptr->m_CallsModel = ind->eventAggregate()->unsortedListView();
     Q_ASSERT(d_ptr->m_CallsModel);
 
     d_ptr->m_pItem->setProperty( "currentContactMethod", QVariant::fromValue(
         static_cast<ContactMethod*>(nullptr)
     ));
 
     d_ptr->m_pItem->setProperty( "currentIndividual", QVariant::fromValue(
         ind
     ));
 
     d_ptr->m_pItem->setProperty( "timelineModel", QVariant::fromValue(d_ptr->m_TimelineModel));
     d_ptr->m_pItem->setProperty( "unsortedListView", QVariant::fromValue(d_ptr->m_CallsModel));
 
     if (d_ptr->m_TimelineModel) {
         connect(d_ptr->m_TimelineModel.data(), &QAbstractItemModel::rowsInserted,
             this, &MainPage::contextInserted);
     }
 }
 
 void MainPage::setContactMethod(ContactMethod* cm)
 {
     if ((!cm) || (!d_ptr->m_pItem))
         return;
 
 
     cm = PhoneDirectoryModel::instance().fromTemporary(cm);
 
     // Keep a reference for 5 minutes to avoid double free from QML
     for (auto ptr : {d_ptr->m_CallsModel, d_ptr->m_TimelineModel})
         if (ptr) {
             auto t = new QTimer(this);
             t->setInterval(5 * 60 * 1000);
             t->setSingleShot(true);
             connect(t, &QTimer::timeout, this, [t, this, ptr]() {
                 this->d_ptr->m_lTimers.removeAll(t);
             });
             t->start();
             d_ptr->m_lTimers << t;
         }
 
     if (d_ptr->m_TimelineModel) {
         disconnect(d_ptr->m_TimelineModel.data(), &QAbstractItemModel::rowsInserted,
             this, &MainPage::contextInserted);
     }
 
     // Keep a strong reference because QML won't
     d_ptr->m_Invididual = cm->individual();
     d_ptr->m_CallsModel = cm->individual()->eventAggregate()->unsortedListView();
     Q_ASSERT(d_ptr->m_CallsModel);
 
     d_ptr->m_TimelineModel = cm->individual()->timelineModel();
 
     d_ptr->m_pItem->setProperty( "currentContactMethod", QVariant::fromValue(cm));
     d_ptr->m_pItem->setProperty( "currentIndividual", QVariant::fromValue(
         cm->individual()
     ));
     d_ptr->m_pItem->setProperty( "timelineModel", QVariant::fromValue(d_ptr->m_TimelineModel));
     d_ptr->m_pItem->setProperty( "unsortedListView", QVariant::fromValue(d_ptr->m_CallsModel));
 
     if (d_ptr->m_TimelineModel) {
         connect(d_ptr->m_TimelineModel.data(), &QAbstractItemModel::rowsInserted,
             this, &MainPage::contextInserted);
     }
 }
 
 void MainPage::setPerson(Person* p)
 {
     if (d_ptr->m_TimelineModel) {
         disconnect(d_ptr->m_TimelineModel.data(), &QAbstractItemModel::rowsInserted,
             this, &MainPage::contextInserted);
     }
 
     auto ind = p->individual();
     d_ptr->m_Invididual = ind;
 
     d_ptr->m_pItem->setProperty( "currentPerson", QVariant::fromValue(p));
     d_ptr->m_pItem->setProperty( "currentIndividual", QVariant::fromValue(
         ind
     ));
 
     d_ptr->m_CallsModel = ind->eventAggregate()->unsortedListView();
     Q_ASSERT(d_ptr->m_CallsModel);
 
     d_ptr->m_pItem->setProperty( "unsortedListView", QVariant::fromValue(d_ptr->m_CallsModel));
 
     if (d_ptr->m_TimelineModel) {
         connect(d_ptr->m_TimelineModel.data(), &QAbstractItemModel::rowsInserted,
             this, &MainPage::contextInserted);
     }
 }
 
 void MainPage::setCurrentPage(MainPage::Pages page)
 {
     QString name;
     switch (page) {
         case MainPage::Pages::INFORMATION:
             name = QStringLiteral("INFORMATION");
             break;
         case MainPage::Pages::TIMELINE:
             name = QStringLiteral("TIMELINE");
             break;
         case MainPage::Pages::CALL_HISTORY:
             name = QStringLiteral("CALL_HISTORY");
             break;
         case MainPage::Pages::RECORDINGS:
             name = QStringLiteral("RECORDINGS");
             break;
         case MainPage::Pages::SEARCH:
             name = QStringLiteral("SEARCH");
             break;
         case MainPage::Pages::MEDIA:
             name = QStringLiteral("MEDIA");
             break;
     }
 
     d_ptr->m_pItem->setProperty( "currentPage", name);
 }
 
 bool ActiveCallProxy2::filterAcceptsRow(int row, const QModelIndex& srcParent ) const
 {
     // Conferences are always active
     if (srcParent.isValid())
         return true;
 
     return sourceModel()->index(row, 0)
         .data((int)Call::Role::LifeCycleState) == QVariant::fromValue(Call::LifeCycleState::PROGRESS);
 }
 
 void MainPagePrivate::slotWindowChanged()
 {
     auto ctx = QQmlEngine::contextForObject(q_ptr);
     Q_ASSERT(ctx);
 
     QQmlComponent comp(ctx->engine(), QStringLiteral("qrc:/ViewContact.qml"), q_ptr);
 
     m_pItem = qobject_cast<QQuickItem*>(comp.create(ctx));
 
     if (!m_pItem) {
         qDebug() << "Previous error" << comp.errorString();
     }
 
     Q_ASSERT(m_pItem);
     m_pItem->setParentItem(q_ptr);
 
 
     auto anchors = qvariant_cast<QObject*>(m_pItem->property("anchors"));
     anchors->setProperty("fill", QVariant::fromValue(q_ptr));
     m_pItem->setProperty( "unsortedListView", QVariant::fromValue(nullptr));
 }
 
 void MainPage::showVideo(Call* c)
 {
     // Ignore clicks on dialing calls
     if ((!c) || c->state() == Call::State::NEW || c->state() == Call::State::DIALING)
         return;
 
     setContactMethod(c->peerContactMethod());
     QMetaObject::invokeMethod(d_ptr->m_pItem, "showVideo");
 }
 
 QQuickItem* MainPage::page() const
 {
     return d_ptr->m_pItem;
 }
 
 
 QQuickItem* MainPage::header() const
 {
     return d_ptr->m_pHeader;
 }
 
 void MainPage::setHeader(QQuickItem* item)
 {
     d_ptr->m_pItem->setProperty("contactHeader", QVariant::fromValue(item));
     d_ptr->m_pHeader = item;
 }
 
 bool MainPage::isMobile() const
 {
     return d_ptr->m_pItem->property("mobile").toBool();
 }
 
 void MainPage::setMobile(bool v)
 {
     d_ptr->m_pItem->setProperty("mobile", v);
 }
 
 Individual* MainPage::individual() const
 {
     if (d_ptr->m_Invididual)
         return qobject_cast<Individual*>(d_ptr->m_Invididual);
 
     return nullptr;
 }
 
 QModelIndex MainPage::suggestedTimelineIndex() const
 {
     if (d_ptr->m_Invididual)
         return PeersTimelineModel::instance().individualIndex(
             qobject_cast<Individual*>(d_ptr->m_Invididual)
         );
 
     return {};
 }
 
 void MainPage::contextInserted()
 {
     QMetaObject::invokeMethod(d_ptr->m_pItem, "showNewContent");
 }
 
 #include <mainpage.moc>
 // kate: space-indent on; indent-width 4; replace-tabs on;
diff --git a/src/delegates/kdepixmapmanipulation.cpp b/src/delegates/kdepixmapmanipulation.cpp
index e51763e9..de796eb0 100644
--- a/src/delegates/kdepixmapmanipulation.cpp
+++ b/src/delegates/kdepixmapmanipulation.cpp
@@ -1,428 +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
 {
    switch(cat) {
       case CategorizedHistoryModel::SortedProxy::Categories::DATE      :
          break;
       case CategorizedHistoryModel::SortedProxy::Categories::NAME      :
          return QIcon::fromTheme(QStringLiteral("folder-publicshare"));
       case CategorizedHistoryModel::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__   :
          break;
    }
    return QVariant();
 }
 
 QVariant KDEPixmapManipulation::contactSortingCategoryIcon(const CategorizedContactModel::SortedProxy::Categories cat) const
 {
    switch(cat) {
       case CategorizedContactModel::SortedProxy::Categories::NAME        :
          return QIcon::fromTheme(QStringLiteral("folder-publicshare"));
       case CategorizedContactModel::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__     :
          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/desktopview/dockmodel.cpp b/src/desktopview/dockmodel.cpp
index 2fa17668..22dd6431 100644
--- a/src/desktopview/dockmodel.cpp
+++ b/src/desktopview/dockmodel.cpp
@@ -1,139 +1,140 @@
 /***************************************************************************
  *   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 "dockmodel.h"
 
 #include <QtWidgets/QAction>
 
 #include <callmodel.h>
+#include <session.h>
 
 #include "../actioncollection.h"
 
 class DockModelPrivate final : public QObject
 {
     Q_OBJECT
 public:
     QVector<QAction*> m_lEntries;
 
     DockModel* q_ptr;
 public Q_SLOTS:
     void reload();
 };
 
 DockModel::DockModel(QObject* parent) : QAbstractListModel(parent), d_ptr(new DockModelPrivate)
 {
     d_ptr->q_ptr = this;
 
     for (auto tuple : {
         std::make_tuple(ActionCollection::instance()->showBookmarkDockAction(), "/toolbar/bookmark.svg", "bookmark"),
         std::make_tuple(ActionCollection::instance()->showContactDockAction (), "/toolbar/contact.svg" , "contact" ),
         std::make_tuple(ActionCollection::instance()->showTimelineDockAction(), "/toolbar/timeline.svg", "timeline"),
         std::make_tuple(ActionCollection::instance()->showHistoryDockAction (), "/toolbar/history.svg" , "history" ),
         std::make_tuple(ActionCollection::instance()->showDialDockAction    (), "/toolbar/call.svg"    , "call"    ),
     }) {
         connect(std::get<0>(tuple), &QAction::toggled, d_ptr, &DockModelPrivate::reload);
         std::get<0>(tuple)->setProperty("iconpath"  , std::get<1>(tuple));
         std::get<0>(tuple)->setProperty("identifier", std::get<2>(tuple));
     }
 
-    connect(&CallModel::instance(), &CallModel::callStateChanged,
+    connect(Session::instance()->callModel(), &CallModel::callStateChanged,
         d_ptr, &DockModelPrivate::reload);
 
-    connect(&CallModel::instance(), &CallModel::layoutChanged,
+    connect(Session::instance()->callModel(), &CallModel::layoutChanged,
         d_ptr, &DockModelPrivate::reload);
 
     d_ptr->reload();
 }
 
 DockModel::~DockModel()
 {
     delete d_ptr;
 }
 
 QVariant DockModel::data( const QModelIndex& index, int role) const
 {
     if (!index.isValid())
         return {};
 
     auto a = d_ptr->m_lEntries[index.row()];
 
     switch(role) {
         case Qt::DisplayRole:
             return a->text();
         case Qt::DecorationRole:
             return a->property("iconpath");
         case Roles::Identifier:
             return a->property("identifier");
         case Roles::Action:
             return QVariant::fromValue(a);
         case Roles::ActiveCount:
             if (a == ActionCollection::instance()->showDialDockAction())
-                return CallModel::instance().size()
-                    - (CallModel::instance().hasDialingCall() ? 1 : 0);
+                return Session::instance()->callModel()->size()
+                    - (Session::instance()->callModel()->hasDialingCall() ? 1 : 0);
             return 0;
     }
 
     return {};
 }
 
 int DockModel::rowCount( const QModelIndex& parent) const
 {
     return parent.isValid() ? 0 : d_ptr->m_lEntries.size();
 }
 
 QHash<int,QByteArray> DockModel::roleNames() const
 {
     static QHash<int, QByteArray> roles = QAbstractItemModel::roleNames();
     static std::atomic_flag initRoles = ATOMIC_FLAG_INIT;
 
     if (!initRoles.test_and_set()) {
         roles[Roles::ActiveCount] = QByteArray( "activeCount" );
         roles[Roles::Identifier ] = QByteArray( "identifier"  );
         roles[Roles::Action     ] = QByteArray( "action"      );
         roles[Roles::Enabled    ] = QByteArray( "enabled2"    );
     }
 
    return roles;
 }
 
 void DockModelPrivate::reload()
 {
     QVector<QAction*> l;
 
     for (QAction* a : {
         ActionCollection::instance()->showBookmarkDockAction(),
         ActionCollection::instance()->showContactDockAction (),
         ActionCollection::instance()->showTimelineDockAction(),
         ActionCollection::instance()->showHistoryDockAction (),
         ActionCollection::instance()->showDialDockAction    (),
     }) {
         if (a->isChecked())
             l << a;
     }
 
     if (m_lEntries != l) {
         q_ptr->beginResetModel();
         m_lEntries = l;
         q_ptr->endResetModel();
     }
     else
         emit q_ptr->dataChanged(
             q_ptr->index(0, 0), q_ptr->index(m_lEntries.size()-1,0)
         );
 }
 
 #include <dockmodel.moc>
diff --git a/src/dialview/qml/addcall.qml b/src/dialview/qml/addcall.qml
index 55412187..df05d683 100644
--- a/src/dialview/qml/addcall.qml
+++ b/src/dialview/qml/addcall.qml
@@ -1,32 +1,33 @@
 /******************************************************************************
  *   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 Ring 1.0
 import RingQmlWidgets 1.0
+import net.lvindustries.ringqtquick 1.0 as RingQtQuick
 
 OutlineButton {
     id: mainArea
     height: 58
     expandedHeight: 64
     width: parent.width
     label: i18n("Create a call")
-    visible: !CallModel.hasDialingCall
+    visible: !RingSession.callModel.hasDialingCall
     onClicked: {
-        CallModel.selectDialingCall()
+        RingSession.callModel.selectDialingCall()
     }
 }
diff --git a/src/dialview/qml/calldelegate.qml b/src/dialview/qml/calldelegate.qml
index 6ef4417c..644bca97 100644
--- a/src/dialview/qml/calldelegate.qml
+++ b/src/dialview/qml/calldelegate.qml
@@ -1,117 +1,118 @@
 /******************************************************************************
 *   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 Ring 1.0
 import org.kde.playground.kquickitemviews 1.0 as KQuickItemViews
+import net.lvindustries.ringqtquick 1.0 as RingQtQuick
 
 Item {
     id: item
     height: callDelegateItem.visible ? callDelegateItem.height :
         confDelegateLayout.height + 40 + 12
     width: parent.width - 10
     x: 5
-    property bool selected: object == CallModel.selectedCall
+    property bool selected: object == RingSession.callModel.selectedCall
 
     //If it is not a conference, use this delegate
     CallDelegateItem {
         id: callDelegateItem
 
         //Geometry
         width: parent.width
         anchors.margins: 2
     }
 
     Rectangle {
         id: confDelegateItem
 
         //Geometry
         anchors.topMargin: 10
         anchors.margins: 2
         anchors.fill: parent
         visible: false
         y: 10
 
         //Display
         color: item.selected ? activePalette.highlight: "transparent"
         radius: 5
         border.color: inactivePalette.text
         border.width: 2
 
         Component {
             id:confItemDelegate
             CallDelegateItem {
                 width: isConference ? item.width - 40 : item.width - 20
             }
         }
 
         Row {
             y:parent.y
             x:parent.x
             spacing: 4
             height: 20
             width: parent.width
 
             KQuickItemViews.DecorationAdapter {
                 pixmap: decoration
                 height: 20
                 width: 20
             }
 
             Text {
                 text: i18n("Conference")
                 font.bold: true
                 font.underline: true
                 color: activePalette.text
             }
 
             MouseArea {
                 anchors.fill: parent
                 propagateComposedEvents: true
                 onClicked: {
-                    CallModel.selectedCall = object
+                    RingSession.callModel.selectedCall = object
                 }
             }
         }
 
         Column {
             id: confDelegateLayout
             y:30
             width: parent.width - 20
             x: 10
             //anchors.fill: parent
             anchors.margins: 2
             spacing: 4
             Repeater {
                 id:confDelegateRepeater
                 model:VisualDataModel {
                     id:confDelegateVisualDataModel
                 }
             }
         }
     } //Conference delegate
 
     Component.onCompleted: {
         if (isConference == true) {
             callDelegateItem.visible = false
             confDelegateItem.visible = true
-            confDelegateVisualDataModel.model = CallModel
+            confDelegateVisualDataModel.model = RingSession.callModel
             confDelegateVisualDataModel.delegate = confItemDelegate
             confDelegateRepeater.model.rootIndex = confDelegateRepeater.model.modelIndex(index)
         }
     }
 }
diff --git a/src/dialview/qml/calldelegateitem.qml b/src/dialview/qml/calldelegateitem.qml
index 3a5a45ab..d0d521a2 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 == CallModel.selectedCall
+    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: CallModel
+        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
-            CallModel.selectedCall = object
+            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
                 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/calllist.qml b/src/dialview/qml/calllist.qml
index b0db240d..d495087c 100644
--- a/src/dialview/qml/calllist.qml
+++ b/src/dialview/qml/calllist.qml
@@ -1,35 +1,36 @@
 /******************************************************************************
  *   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 Ring 1.0
+import net.lvindustries.ringqtquick 1.0 as RingQtQuick
 
 ListView {
     Component {
         id: callDelegate
         CallDelegate {}
     }
 
     header: MergeCall {}
     footer: AddCall {}
 
     id: callList
     spacing: 10
 
     delegate: callDelegate
-    model: CallModel
+    model: RingSession.callModel
 } //CallList
diff --git a/src/dialview/qml/dialpad.qml b/src/dialview/qml/dialpad.qml
index 76de71f9..72325769 100644
--- a/src/dialview/qml/dialpad.qml
+++ b/src/dialview/qml/dialpad.qml
@@ -1,184 +1,185 @@
 /******************************************************************************
  *   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 net.lvindustries.ringqtquick 1.0 as RingQtQuick
 
 Item {
     id:dialPad
 
     property var buttonsText: Array("1","2","3","4","5","6","7","8","9","*","0","#")
     property var buttonsMap: Array("","abc","def","ghi","jkl","mno","pqrs","tuv","wxyz","","+","","")
 
     property var mapper: {}
 
     Item {
         anchors.margins: 5
 
         //Attributes
         anchors.fill: parent
 
         //Signals
         signal numbrePressed(string number)
 
         //Content
         Grid {
             columns: 3
             spacing: 3
             width:   (height/4)*3
             height: parent.height
             anchors.horizontalCenter: parent.horizontalCenter
             Repeater {
                 model: 12
                 Rectangle {
                     id: key
 
                     property alias state: stateGroup.state
 
                     //Attributes
                     width:  Math.min((parent.width-3.333)/3 -1, dialPad.height/4 - 2)
                     height: dialPad.height/4 - 2
                     color:  activePalette.highlight
                     radius: 999
                     border.width: 0
                     border.color: activePalette.highlightedText
 
                     Behavior on border.width {
                         NumberAnimation { duration: 200 }
                     }
 
                     Rectangle {
                         id: overlay
                         color: activePalette.highlightedText
                         opacity: 0
                         anchors.fill: parent
                         radius: 999
 
                         Behavior on opacity {
                             NumberAnimation { duration: 200 }
                         }
                     }
 
                     //Content
                     Item {
                         anchors.horizontalCenter: parent.horizontalCenter
                         anchors.verticalCenter: parent.verticalCenter
                         height: label.height + ascii.height
 
                         Text {
                             anchors.horizontalCenter: parent.horizontalCenter
                             horizontalAlignment: Text.AlignRight
                             text: dialPad.buttonsText[index]
                             color: activePalette.highlightedText
                             font.bold: true
                             id:label
                         } //Text
 
                         Text {
                             text: dialPad.buttonsMap[index]
                             anchors.top:label.bottom
                             color: activePalette.highlightedText
                             horizontalAlignment: Text.AlignRight
                             anchors.horizontalCenter: parent.horizontalCenter
                             id: ascii
                         }
                     }
 
                     MouseArea {
                         anchors.fill: parent
                         hoverEnabled: true
                         onClicked: {
-                            var call = CallModel.selectedCall
+                            var call = RingSession.callModel.selectedCall
 
                             if (!call)
                                 return
 
                             call.appendText(dialPad.buttonsText[index])
                             call.playDTMF(dialPad.buttonsText[index])
                         }
                         onContainsMouseChanged: {
                             if (stateGroup.state != "played")
                                 stateGroup.state = containsMouse ? "hover" : "normal"
                         }
                     } //MouseArea
 
                     Component.onCompleted: {
                         if (dialPad.mapper == undefined)
                             dialPad.mapper = {}
                         dialPad.mapper[dialPad.buttonsText[index]] = key
                     }
 
                     Timer {
                         id: animTimer
                         running: false
                         interval: 200
                         repeat: false
                         onTriggered: {
                             key.state = "normal"
                         }
                     }
 
                     StateGroup {
                         id: stateGroup
                         states: [
                             State {
                                 name: "normal"
                                 PropertyChanges {
                                     target: overlay
                                     opacity: 0
                                 }
                                 PropertyChanges {
                                     target: key
                                     border.width: 0
                                 }
                             },
                             State {
                                 name: "played"
                                 PropertyChanges {
                                     target: animTimer
                                     running: true
                                 }
                                 PropertyChanges {
                                     target: overlay
                                     opacity: 0.5
                                 }
                                 PropertyChanges {
                                     target: key
                                     border.width: 2
                                 }
                             },
                             State {
                                 name: "hover"
                                 PropertyChanges {
                                     target: overlay
                                     opacity: 0.5
                                 }
                             }
                         ]
                     }
 
                 } //Rectangle
             } //Repeater
         } //Grid
     }
 
     Connections {
-        target: CallModel
+        target: RingSession.callModel
         onDtmfPlayed: {
             dialPad.mapper[code].state = "played"
         }
     }
 }
diff --git a/src/dialview/qml/dialview.qml b/src/dialview/qml/dialview.qml
index 39811671..0b22f512 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
     }
 
     CallList {
         anchors.fill: parent
     }
 
     DialPad {
         width: parent.width
-        visible: CallModel.supportsDTMF
+        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 = CallModel.getIndex(call)
+        var idx = RingSession.callModel.getIndex(call)
 
         if (!idx.valid)
             return
 
-        var directPrev = CallModel.index(idx.row-1, 0, idx.parent)
+        var directPrev = RingSession.callModel.index(idx.row-1, 0, idx.parent)
 
-        var nextCall = CallModel.getCall(directPrev)
+        var nextCall = RingSession.callModel.getCall(directPrev)
 
         if (!nextCall)
             return
 
-        CallModel.selectedCall = nextCall
+        RingSession.callModel.selectedCall = nextCall
 
         dialView.selectCall(nextCall)
     }
 
     function selectNext(call) {
         if (call.state == RingQtQuick.Call.DIALING && completionSelection.selectNext())
             return
 
         completionSelection.clearSelection()
 
-        var idx = CallModel.getIndex(call)
+        var idx = RingSession.callModel.getIndex(call)
 
         if (!idx.valid)
             return
 
-        var directPrev = CallModel.index(idx.row+1, 0, idx.parent)
+        var directPrev = RingSession.callModel.index(idx.row+1, 0, idx.parent)
 
-        var nextCall = CallModel.getCall(directPrev)
+        var nextCall = RingSession.callModel.getCall(directPrev)
 
         if (!nextCall)
             return
 
-        CallModel.selectedCall = nextCall
+        RingSession.callModel.selectedCall = nextCall
 
         dialView.selectCall(nextCall)
     }
 
     function performCall() {
-        var call = CallModel.selectedCall
+        var call = RingSession.callModel.selectedCall
 
         if (!call) {
-            call = CallModel.dialingCall()
-            CallModel.selectedCall = 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
 
         call.performAction(RingQtQuick.Call.ACCEPT)
     }
 
 
     function getCall() {
-        var call = CallModel.selectedCall
+        var call = RingSession.callModel.selectedCall
 
         if (!call) {
-            call = CallModel.dialingCall()
-            CallModel.selectedCall = 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: CallModel
+        target: RingSession.callModel
         onCallAttentionRequest: {
-            CallModel.selectedCall = call
+            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/dialview/qml/mergecall.qml b/src/dialview/qml/mergecall.qml
index 6a632600..0aa8735a 100644
--- a/src/dialview/qml/mergecall.qml
+++ b/src/dialview/qml/mergecall.qml
@@ -1,131 +1,132 @@
 /******************************************************************************
  *   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 Ring 1.0
 import org.kde.kirigami 2.2 as Kirigami
+import net.lvindustries.ringqtquick 1.0 as RingQtQuick
 
 Item {
     id: mainArea
     height: 10
     width: parent.width
     Rectangle {
         id: addCallButton
         clip: true
         anchors.fill: parent
         anchors.margins: 5
         visible: false
         radius: 5
         color: "transparent"
         border.width: 1
         border.color: activePalette.text
         opacity: 0
 
         Rectangle {
             id: background
             anchors.fill: parent
             color: activePalette.text
             opacity: 0
 
             Behavior on opacity {
                 NumberAnimation {duration: 300;  easing.type: Easing.OutQuad }
             }
         }
 
         Behavior on height {
             NumberAnimation {duration: 200;  easing.type: Easing.OutQuad }
         }
 
         Behavior on radius {
             NumberAnimation {duration: 100;  easing.type: Easing.OutQuad }
         }
 
         Text {
             id: label
             opacity: 0
             color: activePalette.text
             text: i18n("Merge all calls")
             font.pointSize: Kirigami.Theme.defaultFont.pointSize*1.6
             anchors.centerIn: parent
             Behavior on opacity {
                 NumberAnimation {duration: 200;  easing.type: Easing.OutQuad }
             }
         }
 
         MouseArea {
             id: mouseGrabber
             anchors.fill: parent
             hoverEnabled: true
             onClicked: {
-                if (CallModel.hasConference)
-                    CallModel.detachAllCalls()
+                if (RingSession.callModel.hasConference)
+                    RingSession.callModel.detachAllCalls()
                 else
-                    CallModel.mergeAllCalls()
+                    RingSession.callModel.mergeAllCalls()
             }
         }
 
         StateGroup {
             id: stateGroup
             states: [
                 State {
                     name: "hover"
                     when: mouseGrabber.containsMouse
                     extend: "active"
                     PropertyChanges {
                         target: addCallButton
                         opacity: 0.8
                     }
                     PropertyChanges {
                         target: background
                         opacity: 0.1
                     }
                 },
                 State {
                     name: "active"
-                    when: CallModel.conferencePossible || CallModel.hasConference
+                    when: RingSession.callModel.conferencePossible || RingQtQuick.session.callModel.hasConference
                     PropertyChanges {
                         target: addCallButton
                         visible: true
                         opacity: 0.5
                         height: 48
                     }
                     PropertyChanges {
                         target: mainArea
                         height: 48
                     }
                     PropertyChanges {
                         target: label
                         opacity: 0.8
                     }
                 },
                 State {
                     name: "hasconference"
                     extend: "active"
-                    when: CallModel.hasConference
+                    when: RingSession.callModel.hasConference
                     PropertyChanges {
                         target: label
                         text: i18n("Detach all calls")
                     }
                     PropertyChanges {
                         target: background
                         opacity: 1
                     }
                 }
             ]
         }
     }
 }
diff --git a/src/main.cpp b/src/main.cpp
index 2b168973..fb3f2b85 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,124 +1,126 @@
 /***************************************************************************
  *   Copyright (C) 2009-2015 by Savoir-Faire Linux                         *
  *   Author : Jérémy Quentin <jeremy.quentin@savoirfairelinux.com>         *
  *            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/>. *
  **************************************************************************/
 
 //Qt
 #include <QtCore/QString>
 #include <QtCore/QtPlugin>
 #include <QtGui/QImage>
+#include <QQmlApplicationEngine>
 
 //KDE
 #include <KDBusService>
 #include <KAboutData>
 #include <KLocalizedString>
 
 //Ring
 #include "ringapplication.h"
 #include "klib/kcfg_settings.h"
 #include "cmd.h"
 #include <QQmlDebuggingEnabler>
 
 #include <QQmlExtensionPlugin>
 
 #ifdef KQUICKITEMVIEWS_USE_STATIC_PLUGIN
 Q_IMPORT_PLUGIN(KQuickItemViews)
 #else
 #include <KQuickItemViews/plugin.h>
 #endif
 
 Q_IMPORT_PLUGIN(RingQtQuick)
 
 constexpr static const char version[] = "3.1.0";
 
 int main(int argc, char **argv)
 {
    try
    {
       //QQmlDebuggingEnabler enabler;
 
       QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
 
       RingApplication app( argc, argv );
 
       KLocalizedString::setApplicationDomain("ring-kde");
 
       //FIXME remove
 #ifdef KQUICKITEMVIEWS_USE_STATIC_PLUGIN
       qobject_cast<QQmlExtensionPlugin*>(qt_static_plugin_KQuickItemViews().instance())->registerTypes("org.kde.playground.kquickitemviews");
 #else
       KQuickItemViews v;
       v.registerTypes("org.kde.playground.kquickitemviews");
 #endif
 
       qobject_cast<QQmlExtensionPlugin*>(qt_static_plugin_RingQtQuick().instance())->registerTypes("net.lvindustries.ringqtquick");
+      qobject_cast<QQmlExtensionPlugin*>(qt_static_plugin_RingQtQuick().instance())->initializeEngine(app.engine(), "net.lvindustries.ringqtquick");
 
       KAboutData about(QStringLiteral("ring-kde"),
          i18n("ring-kde"),
          /*QStringLiteral(*/version/*)*/,
          i18n("RING, a secured and distributed communication software"),
          KAboutLicense::GPL_V3,
          i18n("(C) 2004-2015 Savoir-faire Linux\n2016-2017 Emmanuel Lepage Vallee"),
          QString(),
          QStringLiteral("http://www.ring.cx"),
          QStringLiteral("ring@gnu.org")
       );
       about.setOrganizationDomain(QByteArray("kde.org"));
       about.setProgramLogo(QImage(QStringLiteral(":appicon/icons/64-apps-ring-kde.png")));
 
       about.addAuthor( i18n( "Emmanuel Lepage-Vallée"          ), QString(), QStringLiteral("elv1313@gmail.com"                    ));
       about.addAuthor( i18n( "Alexandre Lision"                ), QString(), QStringLiteral("alexandre.lision@savoirfairelinux.com"));
       about.addCredit( i18n( "Based on the SFLphone teamworks" ), QString(), QString()                                              );
 
       if (!Cmd::parseCmd(argc, argv, about))
          return 0;
 
       KAboutData::setApplicationData(about);
 
 
       app.setOrganizationDomain(QStringLiteral("ring.cx"));
 
       //Only start the application once
 #ifdef Q_OS_LINUX
 #ifndef DISABLE_KDBUS_SERVICE
       KDBusService service(KDBusService::Unique);
       QObject::connect(&service, &KDBusService::activateActionRequested, Cmd::instance(), &Cmd::slotActivateActionRequested);
       QObject::connect(&service, &KDBusService::activateRequested      , Cmd::instance(), &Cmd::slotActivateRequested      );
       QObject::connect(&service, &KDBusService::openRequested          , Cmd::instance(), &Cmd::slotOpenRequested          );
 #endif
 #endif
 
       //The app will have quitted by now if an instance already exist
       app.newInstance();
 
       const int retVal = app.exec();
 
       ConfigurationSkeleton::self()->save();
 
       return retVal;
    }
    catch(const char * msg)
    {
       qDebug() << msg;
    }
    catch(QString& msg)
    {
       qDebug() << msg;
    }
 }
 
 // kate: space-indent on; indent-width 3; replace-tabs on;
diff --git a/src/notification.cpp b/src/notification.cpp
index 3986caf1..1c4e7299 100644
--- a/src/notification.cpp
+++ b/src/notification.cpp
@@ -1,265 +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(&CallModel::instance(), &CallModel::incomingCall, this, &Notification::incomingCall);
+   connect(Session::instance()->callModel(), &CallModel::incomingCall, this, &Notification::incomingCall);
    connect(&AccountModel::instance(), &AccountModel::accountStateChanged, this, &Notification::accountStatus);
    connect(&Media::RecordingModel::instance(), &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/ringapplication.cpp b/src/ringapplication.cpp
index 02378b09..a95eeb11 100644
--- a/src/ringapplication.cpp
+++ b/src/ringapplication.cpp
@@ -1,630 +1,630 @@
 /***************************************************************************
  *   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 <phonedirectorymodel.h>
 #include <categorizedhistorymodel.h>
 #include <categorizedcontactmodel.h>
 #include <ringdevicemodel.h>
 #include <namedirectory.h>
 #include <categorizedbookmarkmodel.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 "callmodel.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 <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 ((!CallModel::instance().isConnected()) || (!CallModel::instance().isValid())) {
+   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 &PeersTimelineModel::instance();
    delete &Media::RecordingModel::instance();
    delete &PersonModel::instance();
-   delete &CallModel::instance();
+   delete Session::instance()->callModel();
    delete &ProfileModel::instance();
    delete &AccountModel::instance();
    delete &PhoneDirectoryModel::instance();
    delete &NumberCategoryModel::instance();
    m_spInstance = nullptr;
 }
 
 RingApplication* RingApplication::instance()
 {
    Q_ASSERT(m_spInstance);
    return m_spInstance;
 }
 
 static void loadNumberCategories()
 {
    auto& model = NumberCategoryModel::instance();
    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();
 
-   CallModel::instance().setAudoCleanDelay(5000);
+   Session::instance()->callModel()->setAudoCleanDelay(5000);
 
    InfoTemplateManager::instance();
 
    /*******************************************
       *           Set the configurator          *
       ******************************************/
 
    PersonModel::instance()             .registerConfigarator<PeerProfileCollection2  >    (new PeerProfileConfigurator   (this));
    PersonModel::instance()             .registerConfigarator<FallbackPersonCollection>    (new FallbackPersonConfigurator(this));
    CategorizedHistoryModel::instance() .registerConfigarator<LocalHistoryCollection  >    (new LocalHistoryConfigurator  (this));
    CategorizedBookmarkModel::instance().registerConfigarator<LocalBookmarkCollection >    (new BookmarkConfigurator      (this));
    Media::RecordingModel::instance()   .registerConfigarator<LocalRecordingCollection>    (new AudioRecordingConfigurator(this,
       AudioRecordingConfigurator::Mode::AUDIO
    ));
    Media::RecordingModel::instance()   .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 = CategorizedHistoryModel::instance().addCollection<LocalHistoryCollection>(LoadOptions::FORCE_ENABLED);
       HistoryImporter::importHistory(histo);
       histo->clear();
    }
 
    //HACK load the Calendar now to speedup everything else
    const int accountCount = AccountModel::instance().size();
    for (int i=0; i < accountCount; i++)
       AccountModel::instance()[i]->calendar();
 
    ProfileModel::instance().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
 
    CategorizedBookmarkModel::instance().addCollection<LocalBookmarkCollection>();
    CategorizedBookmarkModel::instance().setDisplayPopular(
       ConfigurationSkeleton::displayPopularAsBookmark()
    );
 
    PersonModel::instance().addCollection<FallbackPersonCollection>(LoadOptions::FORCE_ENABLED);
    auto ppc = PersonModel::instance().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
 
    ProfileModel::instance();
 
    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 (!AccountModel::instance().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( CallModel                );
          QML_SINGLETON( CategorizedHistoryModel  );
          QML_SINGLETON( AccountModel             );
          QML_SINGLETON( AvailableAccountModel    );
          QML_SINGLETON( CategorizedContactModel  );
          QML_SINGLETON( CategorizedBookmarkModel );
          QML_SINGLETON( NameDirectory            );
          QML_SINGLETON( PeersTimelineModel       );
          QML_SINGLETON( NumberCategoryModel      );
          QML_SINGLETON( PhoneDirectoryModel      );
          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 ((!CallModel::instance().isConnected()) || (!CallModel::instance().isValid())) {
+   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/mediabuttons.qml b/src/timeline/qml/mediabuttons.qml
index bb30b825..abe54884 100644
--- a/src/timeline/qml/mediabuttons.qml
+++ b/src/timeline/qml/mediabuttons.qml
@@ -1,437 +1,437 @@
 /***************************************************************************
  *   Copyright (C) 2017-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.Controls 2.0
 import QtQuick.Layouts 1.0
 import Ring 1.0
 import ContactView 1.0
 
 import RingQmlWidgets 1.0
 import PhotoSelectorPlugin 1.0
 import net.lvindustries.ringqtquick 1.0 as RingQtQuick
 import net.lvindustries.ringqtquick.media 1.0 as RingQtMedia
 
 Grid {
     id: container
     //TODO Qt5.10 deps: use native icons
 
     spacing: 5
     leftPadding: 5
     rows: 1
 
     property real button1IW: button.visible  ? button.implicitWidth  + 5 : 0
     property real button2IW: button2.visible ? button2.implicitWidth + 5 : 0
     property real button3IW: button3.visible ? button3.implicitWidth + 5 : 0
     property real button4IW: button4.visible ? button4.implicitWidth + 5 : 0
 
     // Favor being on one row, but allow 2 rows too
     property real preferredWidth: Math.max(preferredWidth,
         button1IW + button2IW + button3IW + button4IW
     )
 
     property real minimumWidth: (button3.visible ? maximumButtonWidth * 2 : 0) + 15
 
     property real iconifiedWidth: 4*button.implicitHeight + 20
 
     property real maximumButtonWidth: Math.max(maximumButtonWidth, button3.implicitWidth)
 
 
     states: [
         State {
             extend: ""
             name: "2rows"
             when: width > iconifiedWidth && width <= minimumWidth
 
             PropertyChanges {
                 target: container
                 rows: 2
             }
 
             PropertyChanges {
                 target: button
                 width: maximumButtonWidth
             }
 
             PropertyChanges {
                 target: button2
                 width: maximumButtonWidth
             }
 
             PropertyChanges {
                 target: button3
                 width: maximumButtonWidth
             }
 
             PropertyChanges {
                 target: button4
                 width: maximumButtonWidth
             }
         },
         State {
             name: ""
             when: width > minimumWidth
 
             PropertyChanges {
                 target: container
                 rows: 1
             }
 
             PropertyChanges {
                 target: textLabel1
                 visible: true
             }
 
             PropertyChanges {
                 target: textLabel2
                 visible: true
             }
 
             PropertyChanges {
                 target: textLabel3
                 visible: true
             }
 
             PropertyChanges {
                 target: textLabel4
                 visible: true
             }
 
             PropertyChanges {
                 target: button
                 width: undefined
             }
 
             PropertyChanges {
                 target: button2
                 width: undefined
             }
 
             PropertyChanges {
                 target: button3
                 width: undefined
             }
 
             PropertyChanges {
                 target: button4
                 width: undefined
             }
         },
         State {
             name: "iconified"
             extend: ""
             when: width <= iconifiedWidth
 
             PropertyChanges {
                 target: container
                 rows: 1
             }
 
             PropertyChanges {
                 target: textLabel1
                 visible: false
             }
 
             PropertyChanges {
                 target: textLabel2
                 visible: false
             }
 
             PropertyChanges {
                 target: textLabel3
                 visible: false
             }
 
             PropertyChanges {
                 target: textLabel4
                 visible: false
             }
         }
     ]
 
     function getContactMethod(callback) {
 
         if (currentIndividual == null)
             return
 
         if (currentIndividual.requireUserSelection) {
             var component = Qt.createComponent("CMSelector.qml")
             if (component.status == Component.Ready) {
                 var window = component.createObject(applicationWindow().contentItem)
                 window.currentIndividual = currentIndividual
                 window.callback = callback
                 window.open()
             }
             else
                 console.log("ERROR", component.status, component.errorString())
                 return
         }
 
         var cm = currentIndividual.mainContactMethod
 
         if (!cm)
             return
 
         if (callback)
             callback(cm)
 
         return cm
     }
 
     RingQtMedia.AvailabilityTracker {
         id: availabilityTracker
         individual: currentIndividual
     }
 
     Button {
         id: button
         implicitWidth: label.implicitWidth + 20
         visible: availabilityTracker.canCall
 
         checkable: checked
         checked: availabilityTracker.audioCallControlState == RingQtMedia.AvailabilityTracker.CHECKED
 
         onClicked: {
             focus = false
 
             if (checked)
                 return
 
             // Do not create a new call, just switch the media
             if (currentIndividual && currentIndividual.firstActiveCall) {
                 contactHeader.selectVideo()
                 currentIndividual.firstActiveCall.sourceModel.switchTo(0)
                 return
             }
 
             getContactMethod(function(cm) {
                 if (!cm)
                     return
 
                 if (cm.hasInitCall) {
                     contactHeader.selectVideo()
                     return
                 }
 
-                var call = CallModel.dialingCall(cm)
+                var call = RingSession.callModel.dialingCall(cm)
 
                 call.removeMedia(RingQtMedia.Media.VIDEO)
 
                 call.performAction(RingQtQuick.Call.ACCEPT)
             })
 
         }
 
         Row {
             id: label
             anchors.centerIn: parent
             height: parent.height
             Image {
                 height: 22
                 width: 22
                 sourceSize.width: 22
                 sourceSize.height: 22
                 anchors.verticalCenter: parent.verticalCenter
                 source: "image://SymbolicColorizer/:/sharedassets/outline/call.svg"
             }
 
             Text {
                 id: textLabel1
                 anchors.margins: 5
                 height: parent.height
                 verticalAlignment: Text.AlignVCenter
                 color: activePalette.text
                 text: "   " + i18n("Call")
             }
         }
     }
 
     Button {
         id: button2
         implicitWidth: label2.implicitWidth + 20
 
         visible: availabilityTracker.canVideoCall
 
         checkable: checked
         checked: availabilityTracker.videoCallControlState == RingQtMedia.AvailabilityTracker.CHECKED
 
         onClicked: {
             focus = false
 
             if (checked)
                 return
 
             // Do not create a new call, just switch the media
             if (currentIndividual && currentIndividual.firstActiveCall) {
                 contactHeader.selectVideo()
                 currentIndividual.firstActiveCall.sourceModel.switchTo(3)
                 return
             }
 
             getContactMethod(function(cm) {
                 if (!cm)
                     return
 
 
                 if (cm.hasInitCall) {
                     contactHeader.selectVideo()
                     return
                 }
 
-                CallModel.dialingCall(cm)
+                RingSession.callModel.dialingCall(cm)
                     .performAction(RingQtQuick.Call.ACCEPT)
             })
         }
 
         Row {
             id: label2
             anchors.centerIn: parent
             height: parent.height
             Image {
                 height: 22
                 width: 22
                 sourceSize.width: 22
                 sourceSize.height: 22
                 anchors.verticalCenter: parent.verticalCenter
                 source: "image://SymbolicColorizer/:/sharedassets/outline/camera.svg"
             }
 
             Text {
                 id: textLabel2
                 anchors.margins: 5
                 height: parent.height
                 verticalAlignment: Text.AlignVCenter
                 color: activePalette.text
                 text: "   " + i18n("Video")
             }
         }
     }
 
     Button {
         id: button3
         implicitWidth: label3.implicitWidth + 20
         checkable: checked
         checked: availabilityTracker.screenSharingControlState == RingQtMedia.AvailabilityTracker.CHECKED
 
         visible: availabilityTracker.canVideoCall
 
         onClicked: {
             focus = false
 
             if (checked)
                 return
 
             // Do not create a new call, just switch the media
             if (currentIndividual && currentIndividual.firstActiveCall) {
                 contactHeader.selectVideo()
                 currentIndividual.firstActiveCall.sourceModel.switchTo(1)
                 return
             }
 
             getContactMethod(function(cm) {
                 if (!cm)
                     return
 
                 if (cm.hasInitCall) {
                     contactHeader.selectVideo()
                     return
                 }
 
-                CallModel.dialingCall(cm)
+                RingSession.callModel.dialingCall(cm)
                     .performAction(RingQtQuick.Call.ACCEPT)
             })
         }
 
         Row {
             id: label3
             anchors.centerIn: parent
             height: parent.height
             Image {
                 height: 22
                 width: 22
                 sourceSize.width: 22
                 sourceSize.height: 22
                 anchors.verticalCenter: parent.verticalCenter
                 source: "image://SymbolicColorizer/:/sharedassets/outline/screen.svg"
             }
 
             Text {
                 id: textLabel3
                 anchors.margins: 5
                 color: activePalette.text
                 height: parent.height
                 verticalAlignment: Text.AlignVCenter
                 text: "   " + i18n("Screen sharing")
             }
         }
     }
 
     Button {
         id: button4
         implicitWidth: label4.implicitWidth + 20
 
         visible: availabilityTracker.canSendTexts
 
         onClicked: {
             if (currentIndividual == null) return
 
             contactHeader.selectChat()
         }
 
         Row {
             id: label4
             anchors.centerIn: parent
             height: parent.height
             Image {
                 height: 22
                 width: 22
                 sourceSize.width: 22
                 sourceSize.height: 22
                 anchors.verticalCenter: parent.verticalCenter
                 source: "image://SymbolicColorizer/:/sharedassets/outline/chat.svg"
             }
 
             Text {
                 id: textLabel4
                 anchors.margins: 5
                 height: parent.height
                 verticalAlignment: Text.AlignVCenter
                 color: activePalette.text
                 text: "   " + i18n("Chat")
             }
         }
 
     Button {
         id: button5
         implicitWidth: label4.implicitWidth + 20
         text: i18n("Hang up")
 
         visible: availabilityTracker.hangUpControlState == RingQtMedia.AvailabilityTracker.NORMAL
 
         onClicked: {
             if (currentIndividual == null) return
 
             var c = currentIndividual.firstActiveCall
 
             if (!c)
                 return
 
             c.performAction(RingQtQuick.Call.REFUSE)
         }
     }
     }
 }
diff --git a/src/timeline/qml/phonenumbers.qml b/src/timeline/qml/phonenumbers.qml
index 101d6447..b89a3e59 100644
--- a/src/timeline/qml/phonenumbers.qml
+++ b/src/timeline/qml/phonenumbers.qml
@@ -1,308 +1,308 @@
 /***************************************************************************
  *   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
 import QtQuick.Layouts 1.0
 import Ring 1.0
 import RingQmlWidgets 1.0
 import org.kde.kirigami 2.2 as Kirigami
 import org.kde.playground.kquickitemviews 1.0 as KQuickItemViews
 import net.lvindustries.ringqtquick 1.0 as RingQtQuick
 
 ListView {
     id: numbers
 
     property color buttonColor: inactivePalette.text
     property alias model: numbers.model
     property QtObject person: null
     property alias interactive: numbers.interactive
     property bool editing: (model && model.editRow) || !person
     property bool showAdd: true
     property real preferredHeight: numbers.contentHeight + (addButton && addButton.visible ? 0 : -addButton.height)
     signal personCreated(QtObject newPerson)
 
     property var addButton: null
 
     width: parent.width
     anchors.margins: 3
     height: preferredHeight
     clip: true
 
     SystemPalette {
         id: activePalette
         colorGroup: SystemPalette.Active
     }
 
     SystemPalette {
         id: inactivePalette
         colorGroup: SystemPalette.Disabled
     }
 
     Component {
         id: editComponent
 
         RowLayout {
             Layout.fillWidth: true
             Layout.preferredHeight: 40
             ComboBox {
                 id: numbertype
                 model: NumberCategoryModel
                 textRole: "display"
                 onActivated: {
                 }
             }
 
             TextField {
                 Layout.fillWidth: true
                 id: newPhoneNumber
                 text: editUri
             }
 
             CheckBox {
                 id: customAccount
                 checked: obj && obj.account && visible
                 visible: AccountModel.size > 1
             }
 
             ComboBox {
                 id: numberAccount
                 model: AccountModel
                 enabled: customAccount.checked
                 textRole: "display"
                 visible: AccountModel.size > 1
                 currentIndex: (obj && obj.account) ? obj.account.index.row : 2
                 onActivated: {
                 }
             }
 
             Button {
                 id: button
                 text: i18n("Save")
                 onClicked: {
 
                     if (newPhoneNumber.text == "") {
                         console.log("No number added, the field is empty")
                         return
                     }
 
                     var accIdx = customAccount.checked ? numberAccount.index : -1
 
                     var p = numbers.person ? numbers.person : numbers.model.person
 
                     var cm = contactBuilder.updatePhoneNumber(obj,
                         contactViewPage.individual,
                         p, newPhoneNumber.text, numbertype.index, accIdx
                     )
 
                     if (cm && cm.person) {
                         console.log("Setting the person", cm, cm.person)
                         person = cm.person
                         //numbers.model = cm.person.individual
                     }
 
                     if (cm.person) {
                         console.log("Saving", cm.person)
                         cm.person.save()
                     }
 
                     personCreated(cm.person)
 
                     numbers.currentIndex = idx
                     numbers.currentItem.state = ""
                 }
             }
             Button {
                 text: i18n("Cancel")
                 onClicked: {
                     if (cmType == RingQtQuick.ContactMethod.TEMPORARY)
                         numbers.model.editRow = false
 
                     numbers.currentIndex = idx
 
                     if (numbers.currentItem)
                         numbers.currentItem.state = ""
                 }
             }
         }
 
     }
 
     footer: OutlineButton {
         id: btn
         height: fontMetrics.height * 3.5
         expandedHeight: fontMetrics.height * 3.5
         sideMargin: 2
         width: parent.width
         color: numbers.buttonColor
         label: i18n("Add a phone number or GNU Ring identity")
         topPadding: 2
         visible: (numbers.model && !numbers.model.editRow) && numbers.showAdd
         onClicked: {
             if (numbers.model) {
                 contactBuilder.addEmptyPhoneNumber(numbers.person)
                 numbers.model.editRow = true
                 numbers.currentIndex = numbers.count - 1
                 numbers.currentItem.state = "edit"
             }
             else
                 console.log("No contact, not implemented")
         }
 
         Component.onCompleted: {
             numbers.addButton = btn
         }
     }
 
     delegate: Kirigami.SwipeListItem {
         height: readOnly.height
         implicitHeight: readOnly.height
 
         states: [
             State {
                 name: ""
             },
             State {
                 name: "edit"
                 PropertyChanges {
                     target: editorLoader
                     editUri: uri
 
                     active: true
                 }
 
                 PropertyChanges {
                     target: readOnly
                     visible: false
                 }
             }
         ]
 
         actions: [
             Kirigami.Action {
                 iconName: "edit-delete"
                 text: i18n("Delete")
                 onTriggered: {
                     // Cache the person to avoid the race condition where
                     // the delegate is deleted before the end of the callback
                     var p = numbers.model.person
 
                     numbers.model.removePhoneNumber(object)
 
                     if (p)
                         p.save()
                 }
             },
             Kirigami.Action {
                 iconName: "document-edit"
                 text: i18n("Edit")
                 onTriggered: {
                     state = "edit"
                 }
             },
             Kirigami.Action {
                 iconSource: "image://SymbolicColorizer/:/sharedassets/outline/call.svg"
                 text: i18n("Call")
                 visible: canCall
-                onTriggered: CallModel.dialingCall(object).performAction(RingQtQuick.Call.ACCEPT)
+                onTriggered: RingSession.callModel.dialingCall(object).performAction(RingQtQuick.Call.ACCEPT)
             },
             Kirigami.Action {
                 iconSource: "image://SymbolicColorizer/:/sharedassets/outline/camera.svg"
                 text: i18n("Video call")
                 visible: canVideoCall
-                onTriggered: CallModel.dialingCall(object).performAction(RingQtQuick.Call.ACCEPT)
+                onTriggered: RingSession.callModel.dialingCall(object).performAction(RingQtQuick.Call.ACCEPT)
             },
             Kirigami.Action {
                 iconSource: "image://SymbolicColorizer/:/sharedassets/outline/screen.svg"
                 text: i18n("Share screen")
                 visible: canVideoCall
-                onTriggered: CallModel.dialingCall(object).performAction(RingQtQuick.Call.ACCEPT)
+                onTriggered: RingSession.callModel.dialingCall(object).performAction(RingQtQuick.Call.ACCEPT)
             }
         ]
 
         // Wrap in an extra Item to bypass Kirigami limitations regarding
         // the number of elements
         Item {
             height: readOnly.height
             implicitHeight: readOnly.height
 
             Loader {
                 id: editorLoader
                 property RingQtQuick.ContactMethod obj: object
                 property int idx: index
                 property string editUri: object ? object.uri : ""
                 property var cmType: type
                 sourceComponent: editComponent
                 anchors.fill: parent
                 anchors.rightMargin: 0
                 active: false
             }
 
             RowLayout {
                 id: readOnly
                 anchors.leftMargin: 10
                 anchors.fill: parent
                 height: columns.implicitHeight + 30 // 30 == 3*spacing
                 implicitHeight: columns.implicitHeight + 30
                 spacing: 10
 
                 KQuickItemViews.DecorationAdapter {
                     Layout.preferredHeight: 16
                     Layout.preferredWidth: 16
                     Layout.alignment: Qt.AlignVCenter
                     pixmap: decoration
                 }
 
                 ColumnLayout {
                     id: columns
                     Layout.fillWidth: true
                     Row {
                         Layout.fillWidth: true
                         Text {
                             text: display
                             color: activePalette.text
                         }
                         Text {
                             visible: object.registeredName == display
                             text: "✔"
                             color: Kirigami.Theme.positiveTextColor
                             font.bold: true
                         }
                         Text {
                             text: "  ("+categoryName+")"
                             color: inactivePalette.text
                         }
                     }
 
                     Text {
                         text: lastUsed == undefined || lastUsed == "" ? i18n("Never used") :
                             i18n("Used ")+totalCallCount+i18n(" time (Last used on: ") + formattedLastUsed + ")"
                         color: inactivePalette.text
                     }
                 }
 
                 Item {
                     Layout.preferredWidth: 5
                 }
             }
         }
     }
 
     ContactBuilder {
         id: contactBuilder
     }
 }
diff --git a/src/timeline/qml/searchbox.qml b/src/timeline/qml/searchbox.qml
index d35f3677..4dee369f 100644
--- a/src/timeline/qml/searchbox.qml
+++ b/src/timeline/qml/searchbox.qml
@@ -1,174 +1,174 @@
 /***************************************************************************
  *   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.Controls 2.0
 import QtQuick.Layouts 1.0
 import org.kde.kirigami 2.2 as Kirigami
 import net.lvindustries.ringqtquick 1.0 as RingQtQuick
 
 import Ring 1.0
 
 Item {
     id: searchBox
 
     property bool empty: search.text == ""
     property var searchView: null
     property real xPadding: 0
     property alias searchFocus: search.focus
     property alias labelWidth: findLabel.implicitWidth
     height: (search.focus ? textMetric.height*3 : textMetric.height*1.5) + 6
 
     function hide() {
         search.text = ""
         search.focus = false
-        if (CallModel.hasDialingCall)
-            CallModel.dialingCall().performAction(RingQtQuick.Call.REFUSE)
+        if (RingSession.callModel.hasDialingCall)
+            RingSession.callModel.dialingCall().performAction(RingQtQuick.Call.REFUSE)
     }
 
     FontMetrics {
         id: textMetric
         font: search.font
     }
 
     TextField {
         id: search
         width: parent.width - (focus ? 0 : parent.xPadding)
         x: focus ? 0 : parent.xPadding
         y: focus ? textMetric.height*1.5 + 3 : 3
 
 
         font.pointSize: Kirigami.Theme.defaultFont.pointSize*1.4
-        text: CallModel.hasDialingCall ?
-            CallModel.dialingCall().dialNumber : ""
+        text: RingSession.callModel.hasDialingCall ?
+            RingSession.callModel.dialingCall().dialNumber : ""
 
         Behavior on x {
             NumberAnimation {duration: 300}
         }
 
         Behavior on y {
             NumberAnimation {duration: 150}
         }
 
         Behavior on width {
             NumberAnimation {duration: 300}
         }
 
         background : Item {
             height: textMetric.height*1.5
             Rectangle {
                 height: parent.height - 2 // 1px border
                 width: parent.width
                 color: "transparent"
                 border.width: 1
                 border.color: activePalette.text
                 opacity: search.focus ? 0.8 : 0.5
                 radius: search.text == "" && !search.focus ? 99 : 5
 
                 Behavior on opacity {
                     NumberAnimation {duration: 100}
                 }
 
                 Behavior on radius {
                     NumberAnimation {duration: 200;  easing.type: Easing.OutQuad}
                 }
 
                 RowLayout {
                     height: parent.height
 //                     opacity: search.text == "" && !search.focus ? 1 : 0
                     y: search.text == "" && !search.focus ? 0 : -search.height
                     spacing: 5
 
                     Behavior on opacity {
                         NumberAnimation {duration: 100}
                     }
 
                     Behavior on y {
                         NumberAnimation {duration: 200}
                     }
 
                     Item {
                         width: 2
                     }
 
                     Image {
                         width: parent.height - 6
                         height: parent.height - 6
                         anchors.verticalCenter: parent.verticalCenter
                         sourceSize.height: parent.height - 6
                         sourceSize.width: parent.height - 6
                         source: "image://SymbolicColorizer/image://icon/file-search-symbolic"
                     }
                     Text {
                         id: findLabel
                         Layout.fillWidth: true
                         color: activePalette.text
                         text: i18n("Find someone")
                         anchors.verticalCenter: parent.verticalCenter
                         font.pixelSize: parent.height * 0.55
                     }
                 }
             }
         }
 
         onTextChanged: {
             // Cache the text to avoid a binding loop when the dialing call
             // is created for the first time
             var text = search.text
 
-            if (CallModel.hasDialingCall || text != "") {
-                var call = CallModel.dialingCall()
+            if (RingSession.callModel.hasDialingCall || text != "") {
+                var call = RingSession.callModel.dialingCall()
                 call.dialNumber = text
             }
         }
         Keys.onDownPressed: {
             searchView.currentIndex = (searchView.currentIndex == searchView.count - 1) ?
                 0 : searchView.currentIndex + 1
         }
         Keys.onUpPressed: {
             searchView.currentIndex = (searchView.currentIndex == 0) ?
                 searchView.count - 1 : searchView.currentIndex - 1
         }
         Keys.onReturnPressed: {
             if (searchStateGroup.state == "")
                 return
 
             var cm = searchView.currentItem.contactMethod
 
             // Display an error message when the selected element doesn't exist
             if (!searchView.currentItem.isSelectable) {
                 displayNotFoundMessage()
                 return
             }
 
             if (!cm)
                 return
 
             cm = PhoneDirectoryModel.fromTemporary(cm)
 
             contactMethodSelected(cm)
             searchBox.hide()
         }
         Keys.onEscapePressed: {
             searchBox.hide()
         }
         Keys.onPressed: {
             if (event.key == Qt.Key_Backspace && search.text == "")
                 searchBox.hide()
         }
     }
 }
diff --git a/src/timeline/qml/viewcontact.qml b/src/timeline/qml/viewcontact.qml
index 3d0636ce..fa2d110d 100644
--- a/src/timeline/qml/viewcontact.qml
+++ b/src/timeline/qml/viewcontact.qml
@@ -1,430 +1,430 @@
 /***************************************************************************
  *   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
 import QtQuick.Layouts 1.0
 import Ring 1.0
 import org.kde.kirigami 2.2 as Kirigami
 import net.lvindustries.ringqtquick 1.0 as RingQtQuick
 import net.lvindustries.ringqtquick.media 1.0 as RingQtMedia
 
 Item {
     id: viewContact
     property var currentContactMethod: null
     property var timelineModel: null
     property string currentPage: ""
     property var contactHeader: null
     property bool mobile: false
     property var currentIndividual: null
     property var unsortedListView: null
 
     function getDefaultCm() {
         if (currentContactMethod)
             return currentContactMethod
 
         if (currentIndividual)
             return currentIndividual.mainContactMethod
 
         return null
     }
 
     function showVideo() {
         avView.active = true
         if (state == "mobile")
             stackView.push(avPage)
         else
             tabBar.currentIndex = 1
     }
 
     function showNewContent() {
         if (timelinePage.item)
             timelinePage.item.showNewContent()
     }
 
     clip: true
 
     onCurrentContactMethodChanged: {
         if (contactHeader)
             contactHeader.currentContactMethod = currentContactMethod
 
         if (currentContactMethod && currentContactMethod.person)
             personConn.target = currentContactMethod.person
 
         if (currentContactMethod)
             avView.call = currentContactMethod.firstActiveCall
         else if (currentIndividual)
             avView.call = currentIndividual.firstActiveCall
     }
 
     onCurrentIndividualChanged: {
         if (contactHeader)
             contactHeader.currentIndividual = currentIndividual
 
         if (currentIndividual && currentIndividual.person)
             personConn.target = currentIndividual.person
 
         if (currentIndividual != null)
             avView.call = currentIndividual.firstActiveCall
     }
 
     onCurrentPageChanged: {
         if (currentPage == "")
             return
 
         switch(currentPage) {
             case "TIMELINE":
                 tabBar.currentIndex = 0
                 break
             case "MEDIA":
                 tabBar.currentIndex = 1
                 break
             case "CALL_HISTORY":
                 tabBar.currentIndex = 2
                 break
             case "INFORMATION":
                 tabBar.currentIndex = 3
                 break
         }
 
         currentPage = ""
     }
 
     RingQtMedia.AvailabilityTracker {
         id: availabilityTracker
         individual: currentIndividual
     }
 
     Connections {
         target: currentContactMethod
         onContactChanged: {
             if (currentContactMethod.person)
                 personConn.target = currentContactMethod.person
         }
     }
 
     Connections {
         target: currentContactMethod
         onCallAdded: {
             if (currentContactMethod.person)
                 return
 
             avView.call = call && call.lifeCycleState != RingQtQuick.Call.FINISHED ? call : null
         }
     }
 
     Connections {
         id: personConn
         target: currentContactMethod ? currentContactMethod.person : null
         onCallAdded: {
             avView.call = call
         }
     }
 
     ColumnLayout {
         id: columnLayout
         anchors.fill: parent
 
         TabBar {
             Layout.fillWidth: true
             id: tabBar
             currentIndex: swipeView.currentIndex
             TabButton {
                 text: i18n("Chat/Timeline")
             }
             TabButton {
                 text: i18n("Audio/Video")
             }
             TabButton {
                 text: i18n("Calls/Recordings")
             }
             TabButton {
                 text: i18n("Information")
             }
 
             onCurrentIndexChanged: {
                 //TODO deactivate it after a minute in other tabs
                 if (currentIndex == 0) {
                     timelinePage.active = true
                 }
                 if (currentIndex == 2) {
                     callHistory.active = true
                 }
             }
         }
 
         SwipeView {
             id: swipeView
             Layout.fillHeight: true
             Layout.fillWidth: true
 
             background: Rectangle {
                 color: activePalette.base
             }
 
             currentIndex: tabBar.currentIndex
 
             Page {
                 id: chatPage
                 background: Rectangle { color: activePalette.base }
                 Loader {
                     anchors.fill: parent
                     asynchronous: true
                     active: true
                     id: timelinePage
                     property bool showScrollbar: true
 
                     sourceComponent: TimelinePage {
                         showScrollbar: timelinePage.showScrollbar
                         timelineModel: viewContact.timelineModel
                         currentContactMethod: viewContact.currentContactMethod
                         currentIndividual: viewContact.currentIndividual
                         anchors.fill: parent
                     }
                 }
             }
 
             Page {
                 id: avPage
                 background: Rectangle { color: activePalette.base }
                 Loader {
                     id: avView
                     asynchronous: true
                     active: false
                     anchors.fill: parent
 
                     property QtObject call: null
 
                     // QML bug?
                     onCallChanged: {
                         if (active)
                             callViewWidget.call = call
                     }
 
                     CallView {
                         id: callViewWidget
                         mode: "CONVERSATION"
                         anchors.fill: parent
                         call: avView.call
                         onCallWithAudio: {
                             var cm = viewContact.getDefaultCm()
 
                             if (cm && cm.hasInitCall) {
                                 contactHeader.selectVideo()
                                 return
                             }
 
-                            CallModel.dialingCall(cm)
+                            RingSession.callModel.dialingCall(cm)
                                 .performAction(RingQtQuick.Call.ACCEPT)
                         }
                         onCallWithVideo: {
                             var cm = viewContact.getDefaultCm()
 
                             if (cm && cm.hasInitCall) {
                                 contactHeader.selectVideo()
                                 return
                             }
 
-                            CallModel.dialingCall(cm)
+                            RingSession.callModel.dialingCall(cm)
                                 .performAction(RingQtQuick.Call.ACCEPT)
                         }
                         onCallWithScreen: {
                             var cm = viewContact.getDefaultCm()
 
                             if (cm && cm.hasInitCall) {
                                 contactHeader.selectVideo()
                                 return
                             }
 
-                            CallModel.dialingCall(cm)
+                            RingSession.callModel.dialingCall(cm)
                                 .performAction(RingQtQuick.Call.ACCEPT)
                         }
                     }
                 }
             }
 
             Page {
                 id: historyPage
                 background: Rectangle { color: activePalette.base }
                 Loader {
                     anchors.fill: parent
                     id: callHistory
                     asynchronous: true
                     active: false
                     sourceComponent: CallHistory {
                         showScrollbar: timelinePage.showScrollbar
                         timelineModel: viewContact.timelineModel
                         currentContactMethod: viewContact.currentContactMethod
                         currentIndividual: viewContact.currentIndividual
                         anchors.fill: parent
                     }
                 }
             }
 
             Page {
                 id: contactInfoPage
                 background: Rectangle { color: activePalette.base }
                 ContactInfo {
                     id: contactInfo
                     individual: viewContact.currentIndividual
                     anchors.fill: parent
 
                     onSelectChat: {
                         stackView.push(page3)
                     }
 
                     onSelectHistory: {
                         stackView.push(page2)
                     }
                 }
             }
         }
     }
 
     Kirigami.PageRow {
         id: stackView
         visible: false
         background: Rectangle {
             color: activePalette.base
         }
         anchors.fill: parent
 
         Page {
             id: page2
             background: Rectangle {
                 color: activePalette.base
             }
         }
         Page {
             id: page3
             background: Rectangle {
                 color: activePalette.base
             }
         }
         Page {
             id: page4
             background: Rectangle {
                 color: activePalette.base
             }
         }
         Page {
             id: page1
             anchors.margins: 0
             background: Rectangle {
             color: activePalette.base
             }
         }
 
     }
 
     onStateChanged: {
         stackView.clear()
 
         if (state == "mobile")
             stackView.push(page1)
     }
 
     states: [
         State {
             name: ""
             when: !viewContact.mobile
 
             ParentChange {
                 target: contactInfo
                 parent: contactInfoPage
             }
 
             ParentChange {
                 target: callHistory
                 parent: historyPage
             }
 
             ParentChange {
                 target: timelinePage
                 parent: chatPage
             }
 
             PropertyChanges {
                 target: columnLayout
                 visible: true
             }
 
             PropertyChanges {
                 target: stackView
                 visible: false
             }
 
             PropertyChanges {
                 target: contactInfo
                 anchors.fill: contactInfoPage
                 flickable.interactive: false
             }
 
             PropertyChanges {
                 target: timelinePage
                 showScrollbar: true
             }
         },
         State {
             name: "mobile"
             when: viewContact.mobile
 
             ParentChange {
                 target: contactInfo
                 parent: page1
             }
 
             ParentChange {
                 target: callHistory
                 parent: page2
             }
 
             ParentChange {
                 target: timelinePage
                 parent: page3
             }
 
             PropertyChanges {
                 target: columnLayout
                 visible: false
             }
 
             PropertyChanges {
                 target: stackView
                 visible: true
             }
 
             PropertyChanges {
                 target: contactInfo
                 anchors.fill: page1
                 flickable.interactive: true
             }
             PropertyChanges {
                 target: callHistory
                 active: true
             }
             PropertyChanges {
                 target: timelinePage
                 active: true
             }
             PropertyChanges {
                 target: timelinePage
                 showScrollbar: false
             }
         }
     ]
 }