diff --git a/domain/gql/fields/fields.go b/domain/gql/fields/fields.go
index 2d7000d..bd5b5d1 100644
--- a/domain/gql/fields/fields.go
+++ b/domain/gql/fields/fields.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/chris-ramon/golang-scaffolding/domain/auth/mappers"
 	"github.com/chris-ramon/golang-scaffolding/domain/gql/types"
+	"github.com/chris-ramon/golang-scaffolding/domain/gql/util"
 	usersMappers "github.com/chris-ramon/golang-scaffolding/domain/users/mappers"
 	"github.com/chris-ramon/golang-scaffolding/pkg/ctxutil"
 )
@@ -21,7 +22,7 @@ var CurrentUserField = &graphql.Field{
 	Name: "CurrentUser",
 	Type: types.CurrentUserType,
 	Resolve: func(p graphql.ResolveParams) (interface{}, error) {
-		srvs, err := servicesFromResolveParams(p)
+		srvs, err := util.ServicesFromResolveParams(p)
 		if err != nil {
 			return nil, err
 		}
@@ -54,17 +55,17 @@ var AuthUserField = &graphql.Field{
 		},
 	},
 	Resolve: func(p graphql.ResolveParams) (interface{}, error) {
-		srvs, err := servicesFromResolveParams(p)
+		srvs, err := util.ServicesFromResolveParams(p)
 		if err != nil {
 			return nil, err
 		}
 
-		username, err := fieldFromArgs[string](p.Args, "username")
+		username, err := util.FieldFromArgs[string](p.Args, "username")
 		if err != nil {
 			return nil, err
 		}
 
-		password, err := fieldFromArgs[string](p.Args, "password")
+		password, err := util.FieldFromArgs[string](p.Args, "password")
 		if err != nil {
 			return nil, err
 		}
@@ -82,7 +83,7 @@ var UsersField = &graphql.Field{
 	Name: "Users",
 	Type: graphql.NewList(types.UserType),
 	Resolve: func(p graphql.ResolveParams) (interface{}, error) {
-		srvs, err := servicesFromResolveParams(p)
+		srvs, err := util.ServicesFromResolveParams(p)
 		if err != nil {
 			return nil, err
 		}
diff --git a/domain/gql/fields/util.go b/domain/gql/util/util.go
similarity index 77%
rename from domain/gql/fields/util.go
rename to domain/gql/util/util.go
index 83ed0e7..4d4b3b5 100644
--- a/domain/gql/fields/util.go
+++ b/domain/gql/util/util.go
@@ -1,4 +1,4 @@
-package fields
+package util
 
 import (
 	"errors"
@@ -8,7 +8,7 @@ import (
 	"github.com/chris-ramon/golang-scaffolding/domain/internal/services"
 )
 
-func servicesFromResolveParams(p graphql.ResolveParams) (*services.Services, error) {
+func ServicesFromResolveParams(p graphql.ResolveParams) (*services.Services, error) {
 	rootValue := p.Info.RootValue.(map[string]interface{})
 	srvs, ok := rootValue["services"].(*services.Services)
 
@@ -19,7 +19,7 @@ func servicesFromResolveParams(p graphql.ResolveParams) (*services.Services, err
 	return srvs, nil
 }
 
-func fieldFromArgs[T any](args map[string]interface{}, fieldName string) (T, error) {
+func FieldFromArgs[T any](args map[string]interface{}, fieldName string) (T, error) {
 	field, ok := args[fieldName].(T)
 
 	if !ok {