diff --git a/lib/database/main.go b/lib/database/main.go
index b7d4c11..c493264 100644
--- a/lib/database/main.go
+++ b/lib/database/main.go
@@ -1,16 +1,14 @@
 package database
 
 import (
-	"errors"
-
 	"github.com/jinzhu/gorm"
 	_ "github.com/jinzhu/gorm/dialects/sqlite"
 	_ "github.com/jinzhu/gorm/dialects/postgres"
 )
 
 var (
-	Write *gorm.Database
-	Read  *gorm.Database
+	Write *gorm.DB
+	Read  *gorm.DB
 	config *Config
 	models []interface{}
 )
@@ -22,7 +20,7 @@ type Config struct {
 	ReadConnection string
 }
 
-func Open(c Config) (err errors.Error) {
+func Open(c Config) (err error) {
 	config = &c
 	Write, err = gorm.Open(config.Type, config.Connection)
 	if err != nil {
diff --git a/lib/database/main_test.go b/lib/database/main_test.go
index 5d73fd9..f0f56b3 100644
--- a/lib/database/main_test.go
+++ b/lib/database/main_test.go
@@ -1,3 +1,2 @@
 package database
 
-
diff --git a/models/config.go b/models/config.go
index dcffaa8..3fe5bb7 100644
--- a/models/config.go
+++ b/models/config.go
@@ -12,11 +12,7 @@ import (
 //Config the config File of this daemon
 type Config struct {
 	WebserverBind string
-	Database struct {
-		Type string
-		Connection string
-		ReadConnection string
-	}
+	Database database.Config
 }
 
 // ReadConfigFile reads a config model from path of a yml file