diff --git a/cmd/mbased/main.go b/cmd/mbased/main.go
index 6c6490a..6715c39 100644
--- a/cmd/mbased/main.go
+++ b/cmd/mbased/main.go
@@ -1,40 +1,19 @@
+/*
+ * Copyright 2026 Oleg Borodin <onborodin@gmail.com>
+ */
 package main
 
 import (
 	"os"
 
-	"mbase/app/server"
 	"mbase/pkg/logger"
+	"mbase/app/starter"
 )
 
-func run() error {
-	var err error
-	srv, err := server.NewServer()
-	if err != nil {
-		return err
-	}
-	err = srv.Configure()
-	if err != nil {
-		return err
-	}
-	err = srv.Daemonize()
-	if err != nil {
-		return err
-	}
-	err = srv.Build()
-	if err != nil {
-		return err
-	}
-	err = srv.Run()
-	if err != nil {
-		return err
-	}
-	return err
-}
-
 func main() {
-	log := logger.NewLogger("main")
-	err := run()
+	log := logger.NewLoggerWithSubject("main")
+	sta := starter.NewStarter()
+	err := sta.Exec()
 	if err != nil {
 		log.Errorf("%v", err)
 		os.Exit(1)
diff --git a/cmd/mbasedump/rest.go b/cmd/mbasedump/rest.go
index 7a54ece..08b6b72 100644
--- a/cmd/mbasedump/rest.go
+++ b/cmd/mbasedump/rest.go
@@ -86,7 +86,7 @@ func (util *Util) restoreDatabase(params restoreDatabaseParams) (restoreDatabase
 		}
 	}
 	for _, grant := range dump.Grants {
-		log.Infof("Insert grant %s for account %d", grant.Operation, grant.AccountID)
+		log.Infof("Insert grant %s for account %d", grant.Grantname, grant.AccountID)
 		err = db.InsertGrant(ctx, &grant)
 		if err != nil {
 			log.Errorf("Insert account error: %v", err)