diff --git a/app/main.go b/app/main.go
index 0cf81ea3..96414e15 100644
--- a/app/main.go
+++ b/app/main.go
@@ -120,7 +120,7 @@ func New(opts Opts) (*Application, error) {
 	if err != nil {
 		return nil, err
 	}
-	dataService := service.DataStore{
+	dataService := &service.DataStore{
 		Interface:      boltStore,
 		EditDuration:   5 * time.Minute,
 		Secret:         opts.SecretKey,
@@ -141,14 +141,14 @@ func New(opts Opts) (*Application, error) {
 		RemarkURL: strings.TrimSuffix(opts.RemarkURL, "/"),
 	}
 
-	exporter := &migrator.Remark{DataStore: &dataService}
+	exporter := &migrator.Remark{DataStore: dataService}
 
 	migr := &api.Migrator{
 		Version:        revision,
 		Cache:          loadingCache,
-		NativeImporter: &migrator.Remark{DataStore: &dataService},
-		DisqusImporter: &migrator.Disqus{DataStore: &dataService},
-		NativeExported: &migrator.Remark{DataStore: &dataService},
+		NativeImporter: &migrator.Remark{DataStore: dataService},
+		DisqusImporter: &migrator.Disqus{DataStore: dataService},
+		NativeExported: &migrator.Remark{DataStore: dataService},
 		SecretKey:      opts.SecretKey,
 	}
 
@@ -263,7 +263,7 @@ func makeDirs(dirs ...string) error {
 	return nil
 }
 
-func makeAuthProviders(jwtService *auth.JWT, avatarProxy *proxy.Avatar, ds service.DataStore, opts Opts) []auth.Provider {
+func makeAuthProviders(jwtService *auth.JWT, avatarProxy *proxy.Avatar, ds *service.DataStore, opts Opts) []auth.Provider {
 
 	makeParams := func(cid, secret string) auth.Params {
 		return auth.Params{
diff --git a/app/rest/api/admin.go b/app/rest/api/admin.go
index 45a03f5e..565c1f34 100644
--- a/app/rest/api/admin.go
+++ b/app/rest/api/admin.go
@@ -21,7 +21,7 @@ import (
 
 // admin provides router for all requests available for admin users only
 type admin struct {
-	dataService   service.DataStore
+	dataService   *service.DataStore
 	exporter      migrator.Exporter
 	cache         cache.LoadingCache
 	authenticator auth.Authenticator
diff --git a/app/rest/api/rest.go b/app/rest/api/rest.go
index fb41b01a..7e69c36a 100644
--- a/app/rest/api/rest.go
+++ b/app/rest/api/rest.go
@@ -31,7 +31,7 @@ import (
 // Rest is a rest access server
 type Rest struct {
 	Version         string
-	DataService     service.DataStore
+	DataService     *service.DataStore
 	Authenticator   auth.Authenticator
 	Exporter        migrator.Exporter
 	Cache           cache.LoadingCache
diff --git a/app/rest/api/rest_test.go b/app/rest/api/rest_test.go
index 90b00b65..f678a5bc 100644
--- a/app/rest/api/rest_test.go
+++ b/app/rest/api/rest_test.go
@@ -53,7 +53,7 @@ func TestRest_Shutdown(t *testing.T) {
 func prep(t *testing.T) (srv *Rest, ts *httptest.Server) {
 	b, err := engine.NewBoltDB(bolt.Options{}, engine.BoltSite{FileName: testDb, SiteID: "radio-t"})
 	require.Nil(t, err)
-	dataStore := service.DataStore{Interface: b, EditDuration: 5 * time.Minute, MaxCommentSize: 4000, Secret: "123456"}
+	dataStore := &service.DataStore{Interface: b, EditDuration: 5 * time.Minute, MaxCommentSize: 4000, Secret: "123456"}
 	srv = &Rest{
 		DataService: dataStore,
 		Authenticator: auth.Authenticator{
@@ -63,7 +63,7 @@ func prep(t *testing.T) (srv *Rest, ts *httptest.Server) {
 			AdminEmail: "admin@remark-42.com",
 			JWTService: auth.NewJWT("12345", false, time.Minute),
 		},
-		Exporter:    &migrator.Remark{DataStore: &dataStore},
+		Exporter:    &migrator.Remark{DataStore: dataStore},
 		Cache:       &mockCache{},
 		WebRoot:     "/tmp",
 		RemarkURL:   "https://demo.remark42.com",