diff --git a/server/app/setup.go b/server/app/setup.go
index 6f72698..6880471 100644
--- a/server/app/setup.go
+++ b/server/app/setup.go
@@ -57,8 +57,14 @@ func Setup(p params.ParamsType, cfg *Config) (*App, error) {
 	//mapblock renderer
 	a.Mapblockrenderer = mapblockrenderer.NewMapBlockRenderer(a.BlockAccessor, a.Colormapping)
 
-	//tile database
-	a.Objectdb, err = mapobjectdb.NewSqliteAccessor("mapserver.sqlite")
+	//mapserver database
+	if a.Worldconfig.MapObjectConnection != nil {
+		//TODO: Psql connection
+
+	} else {
+		a.Objectdb, err = mapobjectdb.NewSqliteAccessor("mapserver.sqlite")
+
+	}
 
 	if err != nil {
 		return nil, err
diff --git a/server/worldconfig/parse.go b/server/worldconfig/parse.go
index eb7d536..b2f11e9 100644
--- a/server/worldconfig/parse.go
+++ b/server/worldconfig/parse.go
@@ -19,6 +19,7 @@ const (
 	CONFIG_PLAYER_BACKEND         string = "player_backend"
 	CONFIG_PSQL_CONNECTION        string = "pgsql_connection"
 	CONFIG_PSQL_PLAYER_CONNECTION string = "pgsql_player_connection"
+	CONFIG_PSQL_MAPSERVER         string = "pgsql_mapserver_connection"
 )
 
 type PsqlConfig struct {
@@ -35,6 +36,7 @@ type WorldConfig struct {
 
 	PsqlConnection       *PsqlConfig
 	PsqlPlayerConnection *PsqlConfig
+	MapObjectConnection  *PsqlConfig
 }
 
 func parseConnectionString(str string) *PsqlConfig {
@@ -90,6 +92,8 @@ func Parse(filename string) WorldConfig {
 			cfg.PsqlConnection = parseConnectionString(valueStr)
 		case CONFIG_PSQL_PLAYER_CONNECTION:
 			cfg.PsqlPlayerConnection = parseConnectionString(valueStr)
+		case CONFIG_PSQL_MAPSERVER:
+			cfg.MapObjectConnection = parseConnectionString(valueStr)
 		}
 
 	}