--- a/server/main.cpp	Tue Apr 25 12:44:18 2017 +0200
+++ b/server/main.cpp	Wed Jun 07 20:44:37 2017 +0200
@@ -18,25 +18,26 @@
 
 #include <iostream>
 
+#include <malikania/server/database.hpp>
 #include <malikania/server/server.hpp>
 
 int main()
 {
-    mlk::server::server_settings sv_params;
+    mlk::server::settings sv_params{
+        3320,
+        "/home/markand/null/server.crt",
+        "/home/markand/null/server.key",
+    };
 
-    sv_params.port = 3320;
-    sv_params.certificate = "/home/markand/null/server.crt";
-    sv_params.key = "/home/markand/null/server.key";
-
-    mlk::server::database_settings db_params;
-
-    db_params["type"] = "sqlite";
-    db_params["path"] = "/home/markand/kingdom.db";
+    mlk::server::database db({
+        { "type", "sqlite" },
+        { "path", "/home/markand/kingdom.db" }
+    });
 
     boost::asio::io_service service;
 
     try {
-        mlk::server::server server(service, sv_params, db_params);
+        mlk::server::server server(service, db, sv_params);
 
         for (;;) {
             service.run();