diff --git a/src/colnod/databaseapi.cpp b/src/colnod/databaseapi.cpp
index 0b1fd2a..0befc82 100644
--- a/src/colnod/databaseapi.cpp
+++ b/src/colnod/databaseapi.cpp
@@ -3,9 +3,9 @@
 
 
 DatabaseAPI::DatabaseAPI(serversdk::DatabaseManager *dbMan)
-    :mDbMan(dbMan)
+    :mDbMan(dbMan), utils(std::make_unique<serversdk::DatabaseUtils>(dbMan))
 {
-    utils = std::make_unique<serversdk::DatabaseUtils>(dbMan);
+
 }
 
 bool DatabaseAPI::open()
diff --git a/src/colnod/token.cpp b/src/colnod/token.cpp
index b50bbae..6b6b88b 100644
--- a/src/colnod/token.cpp
+++ b/src/colnod/token.cpp
@@ -103,12 +103,8 @@ void Token::fromSQLRecord(const QSqlQuery& query)
     setId(query.value(0).toString());
     a_authErrors = query.value(1).toInt();
     setDescription(query.value(2).toString());
-    QSet<QString> flags;
-    if (query.value(6).toBool())
-        flags.insert("NoValidity");
-    if (query.value(3).toBool())
-        flags.insert("Enabled");
-    //this->flags = flags;
+    setNoValidity(query.value(6).toBool());
+    setEnabled(query.value(3).toBool());
     QDateTime date = query.value(4).toDateTime();
     setLastUpdate(date);          // WARNING: resolve how lastUpdate should me stored
     setName(query.value(5).toString());