diff --git a/module-db/Interface/ContactRecord.cpp b/module-db/Interface/ContactRecord.cpp
index 4321fcf18..23266c764 100644
--- a/module-db/Interface/ContactRecord.cpp
+++ b/module-db/Interface/ContactRecord.cpp
@@ -11,12 +11,16 @@
 
 #include "ContactRecord.hpp"
 
-#include "../Databases/ContactsDB.hpp"
+ContactRecordInterface::ContactRecordInterface() {
+    contactDB = std::make_unique<ContactsDB>();
+}
+
+ContactRecordInterface::~ContactRecordInterface() {
+
+}
 
 
 bool ContactRecordInterface::Add(const ContactRecord& rec) {
-    auto contactDB = std::make_unique<ContactsDB>();
-
 
     bool ret = contactDB->contacts.Add(ContactsTableRow{.type=rec.contactType,
             .isOnWhitelist=rec.isOnBlacklist,
@@ -102,7 +106,6 @@ bool ContactRecordInterface::Add(const ContactRecord& rec) {
 }
 
 bool ContactRecordInterface::RemoveByID(uint32_t id) {
-    auto contactDB = std::make_unique<ContactsDB>();
 
     auto contact =  contactDB->contacts.GetByID(id);
     if(contact.ID == 0){
@@ -139,7 +142,6 @@ bool ContactRecordInterface::Update(const ContactRecord &rec) {
 
 ContactRecord ContactRecordInterface::GetByID(uint32_t id) {
 
-    auto contactDB = std::make_unique<ContactsDB>();
     ContactRecord rec;
 
     auto contact = contactDB->contacts.GetByID(id);
@@ -193,7 +195,6 @@ ContactRecord ContactRecordInterface::GetByID(uint32_t id) {
 }
 
 uint32_t ContactRecordInterface::GetCount() {
-    auto contactDB = std::make_unique<ContactsDB>();
 
     return contactDB->contacts.GetCount();
 }
@@ -201,8 +202,6 @@ uint32_t ContactRecordInterface::GetCount() {
 std::unique_ptr<std::vector<ContactRecord>> ContactRecordInterface::GetLimitOffset(uint32_t offset, uint32_t limit) {
     auto records =  std::make_unique<std::vector<ContactRecord>>();
 
-    auto contactDB = std::make_unique<ContactsDB>();
-
     auto ret = contactDB->contacts.GetLimitOffset(offset,limit);
 
     for(const auto &w : ret){
@@ -259,7 +258,6 @@ std::unique_ptr<std::vector<ContactRecord>> ContactRecordInterface::GetLimitOffs
                                                                                           ContactRecordField field,
                                                                                           const char *str) {
     auto records =  std::make_unique<std::vector<ContactRecord>>();
-    auto contactDB = std::make_unique<ContactsDB>();
 
     switch(field){
         case ContactRecordField ::PrimaryName:
diff --git a/module-db/Interface/ContactRecord.hpp b/module-db/Interface/ContactRecord.hpp
index 9609b68f1..6a1bb6308 100644
--- a/module-db/Interface/ContactRecord.hpp
+++ b/module-db/Interface/ContactRecord.hpp
@@ -13,6 +13,7 @@
 #define PUREPHONE_CONTACTRECORD_HPP
 
 #include "Record.hpp"
+#include "../Databases/ContactsDB.hpp"
 #include "utf8/UTF8.hpp"
 #include "../Common/Common.hpp"
 
@@ -52,6 +53,9 @@ class ContactRecordInterface : public RecordInterface<ContactRecord, ContactReco
 
 public:
 
+    ContactRecordInterface();
+    ~ContactRecordInterface();
+
     bool Add(const ContactRecord &rec) override final;
 
     bool RemoveByID(uint32_t id) override final;
@@ -66,6 +70,9 @@ public:
 
     std::unique_ptr<std::vector<ContactRecord>>
     GetLimitOffsetByField(uint32_t offset, uint32_t limit, ContactRecordField field, const char *str) override final;
+
+private:
+    std::unique_ptr<ContactsDB> contactDB;
 };
 
 
diff --git a/module-db/Interface/SMSRecord.cpp b/module-db/Interface/SMSRecord.cpp
index 4113d7d8a..6d7fbf59b 100644
--- a/module-db/Interface/SMSRecord.cpp
+++ b/module-db/Interface/SMSRecord.cpp
@@ -13,6 +13,13 @@
 #include "ContactRecord.hpp"
 #include "ThreadRecord.hpp"
 
+SMSRecordInterface::SMSRecordInterface() {
+    smsDB = std::make_unique<SmsDB>();
+}
+
+SMSRecordInterface::~SMSRecordInterface() {
+
+}
 
 bool SMSRecordInterface::Add(const SMSRecord &rec) {
 
diff --git a/module-db/Interface/SMSRecord.hpp b/module-db/Interface/SMSRecord.hpp
index 75fab14e3..028a8bd86 100644
--- a/module-db/Interface/SMSRecord.hpp
+++ b/module-db/Interface/SMSRecord.hpp
@@ -40,6 +40,9 @@ enum class SMSRecordField{
 class SMSRecordInterface : public RecordInterface<SMSRecord,SMSRecordField > {
 public:
 
+    SMSRecordInterface();
+    ~SMSRecordInterface();
+
     bool Add(const SMSRecord& rec) override final;
     bool RemoveByID(uint32_t id) override final;
     bool RemoveByField(SMSRecordField field,const char* str) override final;
diff --git a/module-db/Interface/ThreadRecord.cpp b/module-db/Interface/ThreadRecord.cpp
index bbe986736..e39bb8f27 100644
--- a/module-db/Interface/ThreadRecord.cpp
+++ b/module-db/Interface/ThreadRecord.cpp
@@ -10,12 +10,18 @@
 
 
 #include "ThreadRecord.hpp"
-#include "../Databases/SmsDB.hpp"
 #include "SMSRecord.hpp"
 
-bool ThreadRecordInterface::Add(const ThreadRecord &rec) {
-    auto smsDB = std::make_unique<SmsDB>();
 
+ThreadRecordInterface::ThreadRecordInterface() {
+    smsDB = std::make_unique<SmsDB>();
+}
+
+ThreadRecordInterface::~ThreadRecordInterface() {
+
+}
+
+bool ThreadRecordInterface::Add(const ThreadRecord &rec) {
     auto ret = smsDB->threads.Add(ThreadsTableRow{
             .date = rec.date,
             .msgCount=rec.msgCount,
@@ -30,7 +36,6 @@ bool ThreadRecordInterface::Add(const ThreadRecord &rec) {
 }
 
 bool ThreadRecordInterface::RemoveByID(uint32_t id) {
-    auto smsDB = std::make_unique<SmsDB>();
 
     auto ret = smsDB->threads.RemoveByID(id);
     if (ret == false) {
@@ -42,8 +47,6 @@ bool ThreadRecordInterface::RemoveByID(uint32_t id) {
 }
 
 bool ThreadRecordInterface::Update(const ThreadRecord &rec) {
-    auto smsDB = std::make_unique<SmsDB>();
-
     return smsDB->threads.Update(ThreadsTableRow{
             .ID = rec.dbID,
             .date = rec.date,
@@ -58,14 +61,11 @@ bool ThreadRecordInterface::Update(const ThreadRecord &rec) {
 }
 
 uint32_t ThreadRecordInterface::GetCount() {
-    auto smsDB = std::make_unique<SmsDB>();
 
     return smsDB->threads.GetCount();
 }
 
 std::unique_ptr<std::vector<ThreadRecord>> ThreadRecordInterface::GetLimitOffset(uint32_t offset, uint32_t limit) {
-    auto smsDB = std::make_unique<SmsDB>();
-
     auto records = std::make_unique<std::vector<ThreadRecord>>();
 
     auto ret = smsDB->threads.GetLimitOffset(offset, limit);
@@ -88,7 +88,6 @@ std::unique_ptr<std::vector<ThreadRecord>> ThreadRecordInterface::GetLimitOffset
 std::unique_ptr<std::vector<ThreadRecord>> ThreadRecordInterface::GetLimitOffsetByField(uint32_t offset, uint32_t limit,
                                                                                         ThreadRecordField field,
                                                                                         const char *str) {
-    auto smsDB = std::make_unique<SmsDB>();
     auto records = std::make_unique<std::vector<ThreadRecord>>();
 
     switch (field) {
@@ -115,7 +114,6 @@ std::unique_ptr<std::vector<ThreadRecord>> ThreadRecordInterface::GetLimitOffset
 }
 
 ThreadRecord ThreadRecordInterface::GetByID(uint32_t id) {
-    auto smsDB = std::make_unique<SmsDB>();
 
     auto rec = smsDB->threads.GetByID(id);
 
diff --git a/module-db/Interface/ThreadRecord.hpp b/module-db/Interface/ThreadRecord.hpp
index 165d6b763..5d0dd2b20 100644
--- a/module-db/Interface/ThreadRecord.hpp
+++ b/module-db/Interface/ThreadRecord.hpp
@@ -15,6 +15,7 @@
 #include "Record.hpp"
 #include <stdint.h>
 #include "utf8/UTF8.hpp"
+#include "../Databases/SmsDB.hpp"
 #include "../Common/Common.hpp"
 
 
@@ -35,6 +36,9 @@ enum class ThreadRecordField{
 class ThreadRecordInterface : public RecordInterface<ThreadRecord,ThreadRecordField>{
 public:
 
+    ThreadRecordInterface();
+    ~ThreadRecordInterface();
+
     bool Add(const ThreadRecord& rec) override final;
     bool RemoveByID(uint32_t id) override final;
     bool Update(const ThreadRecord& rec) override final;
@@ -45,6 +49,9 @@ public:
     std::unique_ptr<std::vector<ThreadRecord>> GetLimitOffset(uint32_t offset,uint32_t limit) override final;
 
     std::unique_ptr<std::vector<ThreadRecord>> GetLimitOffsetByField(uint32_t offset,uint32_t limit,ThreadRecordField field, const char* str) override final;
+private:
+    std::unique_ptr<SmsDB> smsDB;
+
 };
 
 
diff --git a/module-db/tests/unittest.cpp b/module-db/tests/unittest.cpp
index 38f5fdd26..71b5e2940 100755
--- a/module-db/tests/unittest.cpp
+++ b/module-db/tests/unittest.cpp
@@ -90,7 +90,6 @@ TEST_CASE( "Create and destroy simple database" ) {
     {
         Database testDB("test.db");
 
-        const char* name = "Mati Patus6";
         auto queryRes = testDB.Query("SELECT * from artists;");
 
         REQUIRE(queryRes->GetFieldCount() == 2);
diff --git a/module-services/service-eink/CMakeLists.txt b/module-services/service-eink/CMakeLists.txt
index 6776c2590..aa7c22b49 100644
--- a/module-services/service-eink/CMakeLists.txt
+++ b/module-services/service-eink/CMakeLists.txt
@@ -33,9 +33,5 @@ target_sources( ${PROJECT_NAME}
 	PRIVATE
 		"${CMAKE_CURRENT_LIST_DIR}/ServiceEink.cpp"
 		"${CMAKE_CURRENT_LIST_DIR}/messages/ImageMessage.cpp"
-	PUBLIC
-		"${CMAKE_CURRENT_LIST_DIR}/ServiceEink.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/messages/EinkMessage.hpp"
-		"${CMAKE_CURRENT_LIST_DIR}/messages/ImageMessage.cpp"
 )
 
diff --git a/source/main.cpp b/source/main.cpp
index c38fc8d7e..a014d35a0 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -175,7 +175,7 @@ int SystemStart(sys::SystemManager* sysmgr)
 
     vfs.Init();
     auto ret = sysmgr->CreateService(std::make_shared<sgui::ServiceGUI>("ServiceGUI", 480, 600 ),sysmgr);
-    //ret |= sysmgr->CreateService(std::make_shared<ServiceEink>("ServiceEink"),sysmgr);
+    ret |= sysmgr->CreateService(std::make_shared<ServiceEink>("ServiceEink"),sysmgr);
     ret |= sysmgr->CreateService(std::make_shared<EventManager>("EventManager"),sysmgr);
     ret |= sysmgr->CreateService(std::make_shared<ServiceDB>(),sysmgr);
     ret |= sysmgr->CreateService(std::make_shared<BlinkyService>("Blinky"),sysmgr);