diff --git a/core/include/Catalogue/CatalogueController.h b/core/include/Catalogue/CatalogueController.h
index 3bea8b6..b503555 100644
--- a/core/include/Catalogue/CatalogueController.h
+++ b/core/include/Catalogue/CatalogueController.h
@@ -32,25 +32,28 @@ public:
     virtual ~CatalogueController();
 
     // DB
-    QStringList getRepositories() const;
+    //    QStringList getRepositories() const;
     void addDB(const QString &dbPath);
     void saveDB(const QString &destinationPath, const QString &repository);
 
     // Event
-    bool createEvent(const QString &name);
+    //    bool createEvent(const QString &name);
     std::list<std::shared_ptr<DBEvent> > retrieveEvents(const QString &repository) const;
     std::list<std::shared_ptr<DBEvent> > retrieveAllEvents() const;
-    void updateEvent(std::shared_ptr<DBEvent> event);
-    void trashEvent(std::shared_ptr<DBEvent> event);
-    void removeEvent(std::shared_ptr<DBEvent> event);
-    void restore(QUuid eventId);
-    void saveEvent(std::shared_ptr<DBEvent> event);
+    std::list<std::shared_ptr<DBEvent> >
+    retrieveEventsFromCatalogue(const QString &repository,
+                                std::shared_ptr<DBCatalogue> catalogue) const;
+    //    void updateEvent(std::shared_ptr<DBEvent> event);
+    //    void trashEvent(std::shared_ptr<DBEvent> event);
+    //    void removeEvent(std::shared_ptr<DBEvent> event);
+    //    void restore(QUuid eventId);
+    //    void saveEvent(std::shared_ptr<DBEvent> event);
 
     // Catalogue
-    bool createCatalogue(const QString &name, QVector<QUuid> eventList);
-    void getCatalogues(const QString &repository) const;
-    void removeEvent(QUuid catalogueId, const QString &repository);
-    void saveCatalogue(std::shared_ptr<DBEvent> event);
+    //    bool createCatalogue(const QString &name, QVector<QUuid> eventList);
+    std::list<std::shared_ptr<DBCatalogue> > getCatalogues(const QString &repository) const;
+    //    void removeEvent(QUuid catalogueId, const QString &repository);
+    //    void saveCatalogue(std::shared_ptr<DBEvent> event);
 
 public slots:
     /// Manage init/end of the controller
diff --git a/core/src/Catalogue/CatalogueController.cpp b/core/src/Catalogue/CatalogueController.cpp
index 03c40f2..3c995db 100644
--- a/core/src/Catalogue/CatalogueController.cpp
+++ b/core/src/Catalogue/CatalogueController.cpp
@@ -102,6 +102,29 @@ std::list<std::shared_ptr<DBEvent> > CatalogueController::retrieveAllEvents() co
     return eventsShared;
 }
 
+std::list<std::shared_ptr<DBEvent> >
+CatalogueController::retrieveEventsFromCatalogue(const QString &repository,
+                                                 std::shared_ptr<DBCatalogue> catalogue) const
+{
+    auto eventsShared = std::list<std::shared_ptr<DBEvent> >{};
+    auto events = impl->m_CatalogueDao.getCatalogueEvents(*catalogue);
+    for (auto event : events) {
+        eventsShared.push_back(std::make_shared<DBEvent>(event));
+    }
+    return eventsShared;
+}
+
+std::list<std::shared_ptr<DBCatalogue> >
+CatalogueController::getCatalogues(const QString &repository) const
+{
+    auto cataloguesShared = std::list<std::shared_ptr<DBCatalogue> >{};
+    auto catalogues = impl->m_CatalogueDao.getCatalogues(repository);
+    for (auto catalogue : catalogues) {
+        cataloguesShared.push_back(std::make_shared<DBCatalogue>(catalogue));
+    }
+    return cataloguesShared;
+}
+
 void CatalogueController::initialize()
 {
     qCDebug(LOG_CatalogueController()) << tr("CatalogueController init")