diff --git a/cmd/africastalking/main.go b/cmd/africastalking/main.go
index c24c4b1..cc5124d 100644
--- a/cmd/africastalking/main.go
+++ b/cmd/africastalking/main.go
@@ -17,6 +17,7 @@ import (
 	"git.defalsify.org/vise.git/resource"
 
 	"git.grassecon.net/urdt/ussd/internal/handlers"
+	"git.grassecon.net/urdt/ussd/internal/handlers/server"
 	httpserver "git.grassecon.net/urdt/ussd/internal/http"
 	"git.grassecon.net/urdt/ussd/internal/storage"
 )
@@ -127,7 +128,8 @@ func main() {
 		os.Exit(1)
 	}
 
-	hl, err := lhs.GetHandler()
+	accountService := server.AccountService{}
+	hl, err := lhs.GetHandler(&accountService)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
diff --git a/cmd/async/main.go b/cmd/async/main.go
index 09236fd..2d4e083 100644
--- a/cmd/async/main.go
+++ b/cmd/async/main.go
@@ -14,6 +14,7 @@ import (
 	"git.defalsify.org/vise.git/resource"
 
 	"git.grassecon.net/urdt/ussd/internal/handlers"
+	"git.grassecon.net/urdt/ussd/internal/handlers/server"
 	"git.grassecon.net/urdt/ussd/internal/storage"
 )
 
@@ -95,7 +96,9 @@ func main() {
 	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdataStore)
 
-	hl, err := lhs.GetHandler()
+	accountService := server.AccountService{}
+
+	hl, err := lhs.GetHandler(&accountService)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
diff --git a/cmd/http/main.go b/cmd/http/main.go
index 6b868ed..8864135 100644
--- a/cmd/http/main.go
+++ b/cmd/http/main.go
@@ -16,6 +16,7 @@ import (
 	"git.defalsify.org/vise.git/resource"
 
 	"git.grassecon.net/urdt/ussd/internal/handlers"
+	"git.grassecon.net/urdt/ussd/internal/handlers/server"
 	httpserver "git.grassecon.net/urdt/ussd/internal/http"
 	"git.grassecon.net/urdt/ussd/internal/storage"
 )
@@ -88,7 +89,8 @@ func main() {
 		os.Exit(1)
 	}
 
-	hl, err := lhs.GetHandler()
+	accountService := server.AccountService{}
+	hl, err := lhs.GetHandler(&accountService)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
diff --git a/cmd/main.go b/cmd/main.go
index 9db5e0a..c8055bc 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -11,6 +11,7 @@ import (
 	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"
 	"git.grassecon.net/urdt/ussd/internal/handlers"
+	"git.grassecon.net/urdt/ussd/internal/handlers/server"
 	"git.grassecon.net/urdt/ussd/internal/storage"
 )
 
@@ -84,8 +85,8 @@ func main() {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
-
-	hl, err := lhs.GetHandler()
+	accountService := server.AccountService{}
+	hl, err := lhs.GetHandler(&accountService)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)