diff --git a/compose/rest/request/page.go b/compose/rest/request/page.go
index b54234811..82ccf326c 100644
--- a/compose/rest/request/page.go
+++ b/compose/rest/request/page.go
@@ -11,16 +11,15 @@ package request
 import (
 	"encoding/json"
 	"fmt"
-	"io"
-	"mime/multipart"
-	"net/http"
-	"strings"
-
 	"github.com/cortezaproject/corteza-server/pkg/label"
 	"github.com/cortezaproject/corteza-server/pkg/locale"
 	"github.com/cortezaproject/corteza-server/pkg/payload"
 	"github.com/go-chi/chi/v5"
 	sqlxTypes "github.com/jmoiron/sqlx/types"
+	"io"
+	"mime/multipart"
+	"net/http"
+	"strings"
 )
 
 // dummy vars to prevent
diff --git a/pkg/codegen/assets/store_rdbms.gen.go.tpl b/pkg/codegen/assets/store_rdbms.gen.go.tpl
index 4d525f06c..e490437af 100644
--- a/pkg/codegen/assets/store_rdbms.gen.go.tpl
+++ b/pkg/codegen/assets/store_rdbms.gen.go.tpl
@@ -556,20 +556,11 @@ func (s Store) execDelete{{ export $.Types.Plural }}(ctx context.Context, cnd sq
 func (s Store) internal{{ export $.Types.Singular }}RowScanner({{ template "extraArgsDefFirst" . }}row rowScanner) (res *{{ $.Types.GoType }}, err error) {
 	res = &{{ $.Types.GoType }}{}
 
-	if _, has := s.config.RowScanners[{{ printf "%q" (unexport $.Types.Singular) }}]; has {
-		scanner := s.config.RowScanners[{{ printf "%q" (unexport $.Types.Singular) }}].(func({{ template "extraArgsDefFirst" . }}_ rowScanner, _ *{{ $.Types.GoType }}) error)
-		err = scanner({{ template "extraArgsCallFirst" . }}row, res)
-	} else {
-	{{- if .RDBMS.CustomRowScanner }}
-		err = s.scan{{ $.Types.Singular }}Row({{ template "extraArgsCallFirst" . }}row, res)
-	{{- else }}
-		err = row.Scan(
-		{{- range $.RDBMS.Columns }}
-			&res.{{ .Field }},
-		{{- end }}
-		)
+	err = row.Scan(
+	{{- range $.RDBMS.Columns }}
+		&res.{{ .Field }},
 	{{- end }}
-	}
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/pkg/codegen/store.go b/pkg/codegen/store.go
index ee6e6f3fa..0636b243a 100644
--- a/pkg/codegen/store.go
+++ b/pkg/codegen/store.go
@@ -82,7 +82,6 @@ type (
 		Alias string `yaml:"alias,omitempty"`
 		Table string `yaml:"table,omitempty"`
 
-		CustomRowScanner        bool `yaml:"customRowScanner"`
 		CustomFilterConverter   bool `yaml:"customFilterConverter"`
 		CustomSortConverter     bool `yaml:"customSortConverter"`
 		CustomCursorCollector   bool `yaml:"customCursorCollector"`
@@ -221,7 +220,6 @@ func procStore(mm ...string) ([]*storeDef, error) {
 			Source: m,
 
 			RDBMS: storeTypeRdbmsDef{
-				CustomRowScanner:      false,
 				CustomFilterConverter: false,
 				CustomEncoder:         false,
 			},
diff --git a/store/rdbms/actionlog.gen.go b/store/rdbms/actionlog.gen.go
index a197fdd74..2a4cb4c01 100644
--- a/store/rdbms/actionlog.gen.go
+++ b/store/rdbms/actionlog.gen.go
@@ -135,12 +135,20 @@ func (s Store) execCreateActionlogs(ctx context.Context, payload store.Payload)
 func (s Store) internalActionlogRowScanner(row rowScanner) (res *actionlog.Action, err error) {
 	res = &actionlog.Action{}
 
-	if _, has := s.config.RowScanners["actionlog"]; has {
-		scanner := s.config.RowScanners["actionlog"].(func(_ rowScanner, _ *actionlog.Action) error)
-		err = scanner(row, res)
-	} else {
-		err = s.scanActionlogRow(row, res)
-	}
+	err = row.Scan(
+		&res.ID,
+		&res.Timestamp,
+		&res.RequestOrigin,
+		&res.RequestID,
+		&res.ActorIPAddr,
+		&res.ActorID,
+		&res.Resource,
+		&res.Action,
+		&res.Error,
+		&res.Severity,
+		&res.Description,
+		&res.Meta,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/apigw_filter.gen.go b/store/rdbms/apigw_filter.gen.go
index 92cd8cbb0..972cc0774 100644
--- a/store/rdbms/apigw_filter.gen.go
+++ b/store/rdbms/apigw_filter.gen.go
@@ -404,26 +404,21 @@ func (s Store) execDeleteApigwFilters(ctx context.Context, cnd squirrel.Sqlizer)
 func (s Store) internalApigwFilterRowScanner(row rowScanner) (res *types.ApigwFilter, err error) {
 	res = &types.ApigwFilter{}
 
-	if _, has := s.config.RowScanners["apigwFilter"]; has {
-		scanner := s.config.RowScanners["apigwFilter"].(func(_ rowScanner, _ *types.ApigwFilter) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.ID,
-			&res.Route,
-			&res.Weight,
-			&res.Kind,
-			&res.Ref,
-			&res.Enabled,
-			&res.Params,
-			&res.CreatedBy,
-			&res.UpdatedBy,
-			&res.DeletedBy,
-			&res.CreatedAt,
-			&res.UpdatedAt,
-			&res.DeletedAt,
-		)
-	}
+	err = row.Scan(
+		&res.ID,
+		&res.Route,
+		&res.Weight,
+		&res.Kind,
+		&res.Ref,
+		&res.Enabled,
+		&res.Params,
+		&res.CreatedBy,
+		&res.UpdatedBy,
+		&res.DeletedBy,
+		&res.CreatedAt,
+		&res.UpdatedAt,
+		&res.DeletedAt,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/apigw_route.gen.go b/store/rdbms/apigw_route.gen.go
index e3b39f056..a9287f25c 100644
--- a/store/rdbms/apigw_route.gen.go
+++ b/store/rdbms/apigw_route.gen.go
@@ -404,25 +404,20 @@ func (s Store) execDeleteApigwRoutes(ctx context.Context, cnd squirrel.Sqlizer)
 func (s Store) internalApigwRouteRowScanner(row rowScanner) (res *types.ApigwRoute, err error) {
 	res = &types.ApigwRoute{}
 
-	if _, has := s.config.RowScanners["apigwRoute"]; has {
-		scanner := s.config.RowScanners["apigwRoute"].(func(_ rowScanner, _ *types.ApigwRoute) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.ID,
-			&res.Endpoint,
-			&res.Method,
-			&res.Enabled,
-			&res.Group,
-			&res.Meta,
-			&res.CreatedBy,
-			&res.UpdatedBy,
-			&res.DeletedBy,
-			&res.CreatedAt,
-			&res.UpdatedAt,
-			&res.DeletedAt,
-		)
-	}
+	err = row.Scan(
+		&res.ID,
+		&res.Endpoint,
+		&res.Method,
+		&res.Enabled,
+		&res.Group,
+		&res.Meta,
+		&res.CreatedBy,
+		&res.UpdatedBy,
+		&res.DeletedBy,
+		&res.CreatedAt,
+		&res.UpdatedAt,
+		&res.DeletedAt,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/applications.gen.go b/store/rdbms/applications.gen.go
index 16b9ed87b..8132b440a 100644
--- a/store/rdbms/applications.gen.go
+++ b/store/rdbms/applications.gen.go
@@ -432,22 +432,17 @@ func (s Store) execDeleteApplications(ctx context.Context, cnd squirrel.Sqlizer)
 func (s Store) internalApplicationRowScanner(row rowScanner) (res *types.Application, err error) {
 	res = &types.Application{}
 
-	if _, has := s.config.RowScanners["application"]; has {
-		scanner := s.config.RowScanners["application"].(func(_ rowScanner, _ *types.Application) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.ID,
-			&res.Name,
-			&res.OwnerID,
-			&res.Enabled,
-			&res.Weight,
-			&res.Unify,
-			&res.CreatedAt,
-			&res.UpdatedAt,
-			&res.DeletedAt,
-		)
-	}
+	err = row.Scan(
+		&res.ID,
+		&res.Name,
+		&res.OwnerID,
+		&res.Enabled,
+		&res.Weight,
+		&res.Unify,
+		&res.CreatedAt,
+		&res.UpdatedAt,
+		&res.DeletedAt,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/attachments.gen.go b/store/rdbms/attachments.gen.go
index 2e4aed635..c6be21a36 100644
--- a/store/rdbms/attachments.gen.go
+++ b/store/rdbms/attachments.gen.go
@@ -246,23 +246,18 @@ func (s Store) execDeleteAttachments(ctx context.Context, cnd squirrel.Sqlizer)
 func (s Store) internalAttachmentRowScanner(row rowScanner) (res *types.Attachment, err error) {
 	res = &types.Attachment{}
 
-	if _, has := s.config.RowScanners["attachment"]; has {
-		scanner := s.config.RowScanners["attachment"].(func(_ rowScanner, _ *types.Attachment) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.ID,
-			&res.OwnerID,
-			&res.Kind,
-			&res.Url,
-			&res.PreviewUrl,
-			&res.Name,
-			&res.Meta,
-			&res.CreatedAt,
-			&res.UpdatedAt,
-			&res.DeletedAt,
-		)
-	}
+	err = row.Scan(
+		&res.ID,
+		&res.OwnerID,
+		&res.Kind,
+		&res.Url,
+		&res.PreviewUrl,
+		&res.Name,
+		&res.Meta,
+		&res.CreatedAt,
+		&res.UpdatedAt,
+		&res.DeletedAt,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/auth_clients.gen.go b/store/rdbms/auth_clients.gen.go
index db6b31f64..ac02a4408 100644
--- a/store/rdbms/auth_clients.gen.go
+++ b/store/rdbms/auth_clients.gen.go
@@ -443,32 +443,27 @@ func (s Store) execDeleteAuthClients(ctx context.Context, cnd squirrel.Sqlizer)
 func (s Store) internalAuthClientRowScanner(row rowScanner) (res *types.AuthClient, err error) {
 	res = &types.AuthClient{}
 
-	if _, has := s.config.RowScanners["authClient"]; has {
-		scanner := s.config.RowScanners["authClient"].(func(_ rowScanner, _ *types.AuthClient) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.ID,
-			&res.Handle,
-			&res.Meta,
-			&res.Secret,
-			&res.Scope,
-			&res.ValidGrant,
-			&res.RedirectURI,
-			&res.Trusted,
-			&res.Enabled,
-			&res.ValidFrom,
-			&res.ExpiresAt,
-			&res.Security,
-			&res.OwnedBy,
-			&res.CreatedBy,
-			&res.UpdatedBy,
-			&res.DeletedBy,
-			&res.CreatedAt,
-			&res.UpdatedAt,
-			&res.DeletedAt,
-		)
-	}
+	err = row.Scan(
+		&res.ID,
+		&res.Handle,
+		&res.Meta,
+		&res.Secret,
+		&res.Scope,
+		&res.ValidGrant,
+		&res.RedirectURI,
+		&res.Trusted,
+		&res.Enabled,
+		&res.ValidFrom,
+		&res.ExpiresAt,
+		&res.Security,
+		&res.OwnedBy,
+		&res.CreatedBy,
+		&res.UpdatedBy,
+		&res.DeletedBy,
+		&res.CreatedAt,
+		&res.UpdatedAt,
+		&res.DeletedAt,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/auth_confirmed_clients.gen.go b/store/rdbms/auth_confirmed_clients.gen.go
index 7d058cd30..0f6ec2391 100644
--- a/store/rdbms/auth_confirmed_clients.gen.go
+++ b/store/rdbms/auth_confirmed_clients.gen.go
@@ -237,16 +237,11 @@ func (s Store) execDeleteAuthConfirmedClients(ctx context.Context, cnd squirrel.
 func (s Store) internalAuthConfirmedClientRowScanner(row rowScanner) (res *types.AuthConfirmedClient, err error) {
 	res = &types.AuthConfirmedClient{}
 
-	if _, has := s.config.RowScanners["authConfirmedClient"]; has {
-		scanner := s.config.RowScanners["authConfirmedClient"].(func(_ rowScanner, _ *types.AuthConfirmedClient) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.UserID,
-			&res.ClientID,
-			&res.ConfirmedAt,
-		)
-	}
+	err = row.Scan(
+		&res.UserID,
+		&res.ClientID,
+		&res.ConfirmedAt,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/auth_oa2tokens.gen.go b/store/rdbms/auth_oa2tokens.gen.go
index 6b0e857f8..a9c3f5a57 100644
--- a/store/rdbms/auth_oa2tokens.gen.go
+++ b/store/rdbms/auth_oa2tokens.gen.go
@@ -190,24 +190,19 @@ func (s Store) execDeleteAuthOa2tokens(ctx context.Context, cnd squirrel.Sqlizer
 func (s Store) internalAuthOa2tokenRowScanner(row rowScanner) (res *types.AuthOa2token, err error) {
 	res = &types.AuthOa2token{}
 
-	if _, has := s.config.RowScanners["authOa2token"]; has {
-		scanner := s.config.RowScanners["authOa2token"].(func(_ rowScanner, _ *types.AuthOa2token) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.ID,
-			&res.Code,
-			&res.Access,
-			&res.Refresh,
-			&res.ExpiresAt,
-			&res.CreatedAt,
-			&res.Data,
-			&res.ClientID,
-			&res.UserID,
-			&res.RemoteAddr,
-			&res.UserAgent,
-		)
-	}
+	err = row.Scan(
+		&res.ID,
+		&res.Code,
+		&res.Access,
+		&res.Refresh,
+		&res.ExpiresAt,
+		&res.CreatedAt,
+		&res.Data,
+		&res.ClientID,
+		&res.UserID,
+		&res.RemoteAddr,
+		&res.UserAgent,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/auth_sessions.gen.go b/store/rdbms/auth_sessions.gen.go
index 27fe8c420..c13b1ffce 100644
--- a/store/rdbms/auth_sessions.gen.go
+++ b/store/rdbms/auth_sessions.gen.go
@@ -234,20 +234,15 @@ func (s Store) execDeleteAuthSessions(ctx context.Context, cnd squirrel.Sqlizer)
 func (s Store) internalAuthSessionRowScanner(row rowScanner) (res *types.AuthSession, err error) {
 	res = &types.AuthSession{}
 
-	if _, has := s.config.RowScanners["authSession"]; has {
-		scanner := s.config.RowScanners["authSession"].(func(_ rowScanner, _ *types.AuthSession) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.ID,
-			&res.Data,
-			&res.UserID,
-			&res.RemoteAddr,
-			&res.UserAgent,
-			&res.CreatedAt,
-			&res.ExpiresAt,
-		)
-	}
+	err = row.Scan(
+		&res.ID,
+		&res.Data,
+		&res.UserID,
+		&res.RemoteAddr,
+		&res.UserAgent,
+		&res.CreatedAt,
+		&res.ExpiresAt,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/automation_sessions.gen.go b/store/rdbms/automation_sessions.gen.go
index d35f5e165..12c69540b 100644
--- a/store/rdbms/automation_sessions.gen.go
+++ b/store/rdbms/automation_sessions.gen.go
@@ -432,27 +432,22 @@ func (s Store) execDeleteAutomationSessions(ctx context.Context, cnd squirrel.Sq
 func (s Store) internalAutomationSessionRowScanner(row rowScanner) (res *types.Session, err error) {
 	res = &types.Session{}
 
-	if _, has := s.config.RowScanners["automationSession"]; has {
-		scanner := s.config.RowScanners["automationSession"].(func(_ rowScanner, _ *types.Session) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.ID,
-			&res.WorkflowID,
-			&res.EventType,
-			&res.ResourceType,
-			&res.Status,
-			&res.Input,
-			&res.Output,
-			&res.Stacktrace,
-			&res.CreatedBy,
-			&res.CreatedAt,
-			&res.PurgeAt,
-			&res.CompletedAt,
-			&res.SuspendedAt,
-			&res.Error,
-		)
-	}
+	err = row.Scan(
+		&res.ID,
+		&res.WorkflowID,
+		&res.EventType,
+		&res.ResourceType,
+		&res.Status,
+		&res.Input,
+		&res.Output,
+		&res.Stacktrace,
+		&res.CreatedBy,
+		&res.CreatedAt,
+		&res.PurgeAt,
+		&res.CompletedAt,
+		&res.SuspendedAt,
+		&res.Error,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/automation_triggers.gen.go b/store/rdbms/automation_triggers.gen.go
index 4f8357ec7..c8d5f0c32 100644
--- a/store/rdbms/automation_triggers.gen.go
+++ b/store/rdbms/automation_triggers.gen.go
@@ -432,29 +432,24 @@ func (s Store) execDeleteAutomationTriggers(ctx context.Context, cnd squirrel.Sq
 func (s Store) internalAutomationTriggerRowScanner(row rowScanner) (res *types.Trigger, err error) {
 	res = &types.Trigger{}
 
-	if _, has := s.config.RowScanners["automationTrigger"]; has {
-		scanner := s.config.RowScanners["automationTrigger"].(func(_ rowScanner, _ *types.Trigger) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.ID,
-			&res.WorkflowID,
-			&res.StepID,
-			&res.Enabled,
-			&res.ResourceType,
-			&res.EventType,
-			&res.Meta,
-			&res.Constraints,
-			&res.Input,
-			&res.OwnedBy,
-			&res.CreatedBy,
-			&res.UpdatedBy,
-			&res.DeletedBy,
-			&res.CreatedAt,
-			&res.UpdatedAt,
-			&res.DeletedAt,
-		)
-	}
+	err = row.Scan(
+		&res.ID,
+		&res.WorkflowID,
+		&res.StepID,
+		&res.Enabled,
+		&res.ResourceType,
+		&res.EventType,
+		&res.Meta,
+		&res.Constraints,
+		&res.Input,
+		&res.OwnedBy,
+		&res.CreatedBy,
+		&res.UpdatedBy,
+		&res.DeletedBy,
+		&res.CreatedAt,
+		&res.UpdatedAt,
+		&res.DeletedAt,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/automation_workflows.gen.go b/store/rdbms/automation_workflows.gen.go
index 5ba90853d..d8d600bf0 100644
--- a/store/rdbms/automation_workflows.gen.go
+++ b/store/rdbms/automation_workflows.gen.go
@@ -443,31 +443,26 @@ func (s Store) execDeleteAutomationWorkflows(ctx context.Context, cnd squirrel.S
 func (s Store) internalAutomationWorkflowRowScanner(row rowScanner) (res *types.Workflow, err error) {
 	res = &types.Workflow{}
 
-	if _, has := s.config.RowScanners["automationWorkflow"]; has {
-		scanner := s.config.RowScanners["automationWorkflow"].(func(_ rowScanner, _ *types.Workflow) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.ID,
-			&res.Handle,
-			&res.Meta,
-			&res.Enabled,
-			&res.Trace,
-			&res.KeepSessions,
-			&res.Scope,
-			&res.Steps,
-			&res.Paths,
-			&res.Issues,
-			&res.RunAs,
-			&res.OwnedBy,
-			&res.CreatedBy,
-			&res.UpdatedBy,
-			&res.DeletedBy,
-			&res.CreatedAt,
-			&res.UpdatedAt,
-			&res.DeletedAt,
-		)
-	}
+	err = row.Scan(
+		&res.ID,
+		&res.Handle,
+		&res.Meta,
+		&res.Enabled,
+		&res.Trace,
+		&res.KeepSessions,
+		&res.Scope,
+		&res.Steps,
+		&res.Paths,
+		&res.Issues,
+		&res.RunAs,
+		&res.OwnedBy,
+		&res.CreatedBy,
+		&res.UpdatedBy,
+		&res.DeletedBy,
+		&res.CreatedAt,
+		&res.UpdatedAt,
+		&res.DeletedAt,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/compose_attachments.gen.go b/store/rdbms/compose_attachments.gen.go
index 441c13876..5e8f6a8e7 100644
--- a/store/rdbms/compose_attachments.gen.go
+++ b/store/rdbms/compose_attachments.gen.go
@@ -246,24 +246,19 @@ func (s Store) execDeleteComposeAttachments(ctx context.Context, cnd squirrel.Sq
 func (s Store) internalComposeAttachmentRowScanner(row rowScanner) (res *types.Attachment, err error) {
 	res = &types.Attachment{}
 
-	if _, has := s.config.RowScanners["composeAttachment"]; has {
-		scanner := s.config.RowScanners["composeAttachment"].(func(_ rowScanner, _ *types.Attachment) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.ID,
-			&res.NamespaceID,
-			&res.Kind,
-			&res.Url,
-			&res.PreviewUrl,
-			&res.Name,
-			&res.Meta,
-			&res.OwnerID,
-			&res.CreatedAt,
-			&res.UpdatedAt,
-			&res.DeletedAt,
-		)
-	}
+	err = row.Scan(
+		&res.ID,
+		&res.NamespaceID,
+		&res.Kind,
+		&res.Url,
+		&res.PreviewUrl,
+		&res.Name,
+		&res.Meta,
+		&res.OwnerID,
+		&res.CreatedAt,
+		&res.UpdatedAt,
+		&res.DeletedAt,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/compose_charts.gen.go b/store/rdbms/compose_charts.gen.go
index f0bb825a9..450696c21 100644
--- a/store/rdbms/compose_charts.gen.go
+++ b/store/rdbms/compose_charts.gen.go
@@ -442,21 +442,16 @@ func (s Store) execDeleteComposeCharts(ctx context.Context, cnd squirrel.Sqlizer
 func (s Store) internalComposeChartRowScanner(row rowScanner) (res *types.Chart, err error) {
 	res = &types.Chart{}
 
-	if _, has := s.config.RowScanners["composeChart"]; has {
-		scanner := s.config.RowScanners["composeChart"].(func(_ rowScanner, _ *types.Chart) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.ID,
-			&res.Handle,
-			&res.Name,
-			&res.Config,
-			&res.NamespaceID,
-			&res.CreatedAt,
-			&res.UpdatedAt,
-			&res.DeletedAt,
-		)
-	}
+	err = row.Scan(
+		&res.ID,
+		&res.Handle,
+		&res.Name,
+		&res.Config,
+		&res.NamespaceID,
+		&res.CreatedAt,
+		&res.UpdatedAt,
+		&res.DeletedAt,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/compose_module_fields.gen.go b/store/rdbms/compose_module_fields.gen.go
index 861da4f23..58c787d80 100644
--- a/store/rdbms/compose_module_fields.gen.go
+++ b/store/rdbms/compose_module_fields.gen.go
@@ -237,29 +237,24 @@ func (s Store) execDeleteComposeModuleFields(ctx context.Context, cnd squirrel.S
 func (s Store) internalComposeModuleFieldRowScanner(row rowScanner) (res *types.ModuleField, err error) {
 	res = &types.ModuleField{}
 
-	if _, has := s.config.RowScanners["composeModuleField"]; has {
-		scanner := s.config.RowScanners["composeModuleField"].(func(_ rowScanner, _ *types.ModuleField) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.ID,
-			&res.Name,
-			&res.ModuleID,
-			&res.Place,
-			&res.Kind,
-			&res.Label,
-			&res.Options,
-			&res.Private,
-			&res.Required,
-			&res.Visible,
-			&res.Multi,
-			&res.DefaultValue,
-			&res.Expressions,
-			&res.CreatedAt,
-			&res.UpdatedAt,
-			&res.DeletedAt,
-		)
-	}
+	err = row.Scan(
+		&res.ID,
+		&res.Name,
+		&res.ModuleID,
+		&res.Place,
+		&res.Kind,
+		&res.Label,
+		&res.Options,
+		&res.Private,
+		&res.Required,
+		&res.Visible,
+		&res.Multi,
+		&res.DefaultValue,
+		&res.Expressions,
+		&res.CreatedAt,
+		&res.UpdatedAt,
+		&res.DeletedAt,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/compose_modules.gen.go b/store/rdbms/compose_modules.gen.go
index 6f06a360b..0809208c9 100644
--- a/store/rdbms/compose_modules.gen.go
+++ b/store/rdbms/compose_modules.gen.go
@@ -452,21 +452,16 @@ func (s Store) execDeleteComposeModules(ctx context.Context, cnd squirrel.Sqlize
 func (s Store) internalComposeModuleRowScanner(row rowScanner) (res *types.Module, err error) {
 	res = &types.Module{}
 
-	if _, has := s.config.RowScanners["composeModule"]; has {
-		scanner := s.config.RowScanners["composeModule"].(func(_ rowScanner, _ *types.Module) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.ID,
-			&res.Handle,
-			&res.Name,
-			&res.Meta,
-			&res.NamespaceID,
-			&res.CreatedAt,
-			&res.UpdatedAt,
-			&res.DeletedAt,
-		)
-	}
+	err = row.Scan(
+		&res.ID,
+		&res.Handle,
+		&res.Name,
+		&res.Meta,
+		&res.NamespaceID,
+		&res.CreatedAt,
+		&res.UpdatedAt,
+		&res.DeletedAt,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/compose_namespaces.gen.go b/store/rdbms/compose_namespaces.gen.go
index 6886ca74e..0d7ce79b5 100644
--- a/store/rdbms/compose_namespaces.gen.go
+++ b/store/rdbms/compose_namespaces.gen.go
@@ -441,21 +441,16 @@ func (s Store) execDeleteComposeNamespaces(ctx context.Context, cnd squirrel.Sql
 func (s Store) internalComposeNamespaceRowScanner(row rowScanner) (res *types.Namespace, err error) {
 	res = &types.Namespace{}
 
-	if _, has := s.config.RowScanners["composeNamespace"]; has {
-		scanner := s.config.RowScanners["composeNamespace"].(func(_ rowScanner, _ *types.Namespace) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.ID,
-			&res.Name,
-			&res.Slug,
-			&res.Enabled,
-			&res.Meta,
-			&res.CreatedAt,
-			&res.UpdatedAt,
-			&res.DeletedAt,
-		)
-	}
+	err = row.Scan(
+		&res.ID,
+		&res.Name,
+		&res.Slug,
+		&res.Enabled,
+		&res.Meta,
+		&res.CreatedAt,
+		&res.UpdatedAt,
+		&res.DeletedAt,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/compose_pages.gen.go b/store/rdbms/compose_pages.gen.go
index 8c96aa943..f5bba651d 100644
--- a/store/rdbms/compose_pages.gen.go
+++ b/store/rdbms/compose_pages.gen.go
@@ -452,27 +452,22 @@ func (s Store) execDeleteComposePages(ctx context.Context, cnd squirrel.Sqlizer)
 func (s Store) internalComposePageRowScanner(row rowScanner) (res *types.Page, err error) {
 	res = &types.Page{}
 
-	if _, has := s.config.RowScanners["composePage"]; has {
-		scanner := s.config.RowScanners["composePage"].(func(_ rowScanner, _ *types.Page) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.ID,
-			&res.SelfID,
-			&res.NamespaceID,
-			&res.ModuleID,
-			&res.Handle,
-			&res.Title,
-			&res.Description,
-			&res.Config,
-			&res.Blocks,
-			&res.Visible,
-			&res.Weight,
-			&res.CreatedAt,
-			&res.UpdatedAt,
-			&res.DeletedAt,
-		)
-	}
+	err = row.Scan(
+		&res.ID,
+		&res.SelfID,
+		&res.NamespaceID,
+		&res.ModuleID,
+		&res.Handle,
+		&res.Title,
+		&res.Description,
+		&res.Config,
+		&res.Blocks,
+		&res.Visible,
+		&res.Weight,
+		&res.CreatedAt,
+		&res.UpdatedAt,
+		&res.DeletedAt,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/compose_record_values.gen.go b/store/rdbms/compose_record_values.gen.go
index 07a33f857..bb1961804 100644
--- a/store/rdbms/compose_record_values.gen.go
+++ b/store/rdbms/compose_record_values.gen.go
@@ -231,19 +231,14 @@ func (s Store) execDeleteComposeRecordValues(ctx context.Context, cnd squirrel.S
 func (s Store) internalComposeRecordValueRowScanner(_mod *types.Module, row rowScanner) (res *types.RecordValue, err error) {
 	res = &types.RecordValue{}
 
-	if _, has := s.config.RowScanners["composeRecordValue"]; has {
-		scanner := s.config.RowScanners["composeRecordValue"].(func(_mod *types.Module, _ rowScanner, _ *types.RecordValue) error)
-		err = scanner(_mod, row, res)
-	} else {
-		err = row.Scan(
-			&res.RecordID,
-			&res.Name,
-			&res.Place,
-			&res.Value,
-			&res.Ref,
-			&res.DeletedAt,
-		)
-	}
+	err = row.Scan(
+		&res.RecordID,
+		&res.Name,
+		&res.Place,
+		&res.Value,
+		&res.Ref,
+		&res.DeletedAt,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/compose_records.gen.go b/store/rdbms/compose_records.gen.go
index 72e9c2796..6f40dcc53 100644
--- a/store/rdbms/compose_records.gen.go
+++ b/store/rdbms/compose_records.gen.go
@@ -370,23 +370,18 @@ func (s Store) execDeleteComposeRecords(ctx context.Context, cnd squirrel.Sqlize
 func (s Store) internalComposeRecordRowScanner(_mod *types.Module, row rowScanner) (res *types.Record, err error) {
 	res = &types.Record{}
 
-	if _, has := s.config.RowScanners["composeRecord"]; has {
-		scanner := s.config.RowScanners["composeRecord"].(func(_mod *types.Module, _ rowScanner, _ *types.Record) error)
-		err = scanner(_mod, row, res)
-	} else {
-		err = row.Scan(
-			&res.ID,
-			&res.ModuleID,
-			&res.NamespaceID,
-			&res.OwnedBy,
-			&res.CreatedBy,
-			&res.UpdatedBy,
-			&res.DeletedBy,
-			&res.CreatedAt,
-			&res.UpdatedAt,
-			&res.DeletedAt,
-		)
-	}
+	err = row.Scan(
+		&res.ID,
+		&res.ModuleID,
+		&res.NamespaceID,
+		&res.OwnedBy,
+		&res.CreatedBy,
+		&res.UpdatedBy,
+		&res.DeletedBy,
+		&res.CreatedAt,
+		&res.UpdatedAt,
+		&res.DeletedAt,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/credentials.gen.go b/store/rdbms/credentials.gen.go
index c865d64fa..6616b024a 100644
--- a/store/rdbms/credentials.gen.go
+++ b/store/rdbms/credentials.gen.go
@@ -236,24 +236,19 @@ func (s Store) execDeleteCredentials(ctx context.Context, cnd squirrel.Sqlizer)
 func (s Store) internalCredentialsRowScanner(row rowScanner) (res *types.Credentials, err error) {
 	res = &types.Credentials{}
 
-	if _, has := s.config.RowScanners["credentials"]; has {
-		scanner := s.config.RowScanners["credentials"].(func(_ rowScanner, _ *types.Credentials) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.ID,
-			&res.OwnerID,
-			&res.Kind,
-			&res.Label,
-			&res.Credentials,
-			&res.Meta,
-			&res.LastUsedAt,
-			&res.ExpiresAt,
-			&res.CreatedAt,
-			&res.UpdatedAt,
-			&res.DeletedAt,
-		)
-	}
+	err = row.Scan(
+		&res.ID,
+		&res.OwnerID,
+		&res.Kind,
+		&res.Label,
+		&res.Credentials,
+		&res.Meta,
+		&res.LastUsedAt,
+		&res.ExpiresAt,
+		&res.CreatedAt,
+		&res.UpdatedAt,
+		&res.DeletedAt,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/federation_exposed_modules.gen.go b/store/rdbms/federation_exposed_modules.gen.go
index 741d070f9..583bbae30 100644
--- a/store/rdbms/federation_exposed_modules.gen.go
+++ b/store/rdbms/federation_exposed_modules.gen.go
@@ -432,26 +432,21 @@ func (s Store) execDeleteFederationExposedModules(ctx context.Context, cnd squir
 func (s Store) internalFederationExposedModuleRowScanner(row rowScanner) (res *types.ExposedModule, err error) {
 	res = &types.ExposedModule{}
 
-	if _, has := s.config.RowScanners["federationExposedModule"]; has {
-		scanner := s.config.RowScanners["federationExposedModule"].(func(_ rowScanner, _ *types.ExposedModule) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.ID,
-			&res.Handle,
-			&res.Name,
-			&res.NodeID,
-			&res.ComposeModuleID,
-			&res.ComposeNamespaceID,
-			&res.Fields,
-			&res.CreatedBy,
-			&res.UpdatedBy,
-			&res.DeletedBy,
-			&res.CreatedAt,
-			&res.UpdatedAt,
-			&res.DeletedAt,
-		)
-	}
+	err = row.Scan(
+		&res.ID,
+		&res.Handle,
+		&res.Name,
+		&res.NodeID,
+		&res.ComposeModuleID,
+		&res.ComposeNamespaceID,
+		&res.Fields,
+		&res.CreatedBy,
+		&res.UpdatedBy,
+		&res.DeletedBy,
+		&res.CreatedAt,
+		&res.UpdatedAt,
+		&res.DeletedAt,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/federation_module_mappings.gen.go b/store/rdbms/federation_module_mappings.gen.go
index 421948a3e..5194a94e4 100644
--- a/store/rdbms/federation_module_mappings.gen.go
+++ b/store/rdbms/federation_module_mappings.gen.go
@@ -459,17 +459,12 @@ func (s Store) execDeleteFederationModuleMappings(ctx context.Context, cnd squir
 func (s Store) internalFederationModuleMappingRowScanner(row rowScanner) (res *types.ModuleMapping, err error) {
 	res = &types.ModuleMapping{}
 
-	if _, has := s.config.RowScanners["federationModuleMapping"]; has {
-		scanner := s.config.RowScanners["federationModuleMapping"].(func(_ rowScanner, _ *types.ModuleMapping) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.FederationModuleID,
-			&res.ComposeModuleID,
-			&res.ComposeNamespaceID,
-			&res.FieldMapping,
-		)
-	}
+	err = row.Scan(
+		&res.FederationModuleID,
+		&res.ComposeModuleID,
+		&res.ComposeNamespaceID,
+		&res.FieldMapping,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/federation_nodes.gen.go b/store/rdbms/federation_nodes.gen.go
index d0abe9fba..590e6b0b9 100644
--- a/store/rdbms/federation_nodes.gen.go
+++ b/store/rdbms/federation_nodes.gen.go
@@ -261,27 +261,22 @@ func (s Store) execDeleteFederationNodes(ctx context.Context, cnd squirrel.Sqliz
 func (s Store) internalFederationNodeRowScanner(row rowScanner) (res *types.Node, err error) {
 	res = &types.Node{}
 
-	if _, has := s.config.RowScanners["federationNode"]; has {
-		scanner := s.config.RowScanners["federationNode"].(func(_ rowScanner, _ *types.Node) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.ID,
-			&res.Name,
-			&res.SharedNodeID,
-			&res.BaseURL,
-			&res.Status,
-			&res.Contact,
-			&res.PairToken,
-			&res.AuthToken,
-			&res.CreatedBy,
-			&res.UpdatedBy,
-			&res.DeletedBy,
-			&res.CreatedAt,
-			&res.UpdatedAt,
-			&res.DeletedAt,
-		)
-	}
+	err = row.Scan(
+		&res.ID,
+		&res.Name,
+		&res.SharedNodeID,
+		&res.BaseURL,
+		&res.Status,
+		&res.Contact,
+		&res.PairToken,
+		&res.AuthToken,
+		&res.CreatedBy,
+		&res.UpdatedBy,
+		&res.DeletedBy,
+		&res.CreatedAt,
+		&res.UpdatedAt,
+		&res.DeletedAt,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/federation_nodes_sync.gen.go b/store/rdbms/federation_nodes_sync.gen.go
index 1c0e0d39b..2d6bf9650 100644
--- a/store/rdbms/federation_nodes_sync.gen.go
+++ b/store/rdbms/federation_nodes_sync.gen.go
@@ -444,18 +444,13 @@ func (s Store) execDeleteFederationNodesSyncs(ctx context.Context, cnd squirrel.
 func (s Store) internalFederationNodesSyncRowScanner(row rowScanner) (res *types.NodeSync, err error) {
 	res = &types.NodeSync{}
 
-	if _, has := s.config.RowScanners["federationNodesSync"]; has {
-		scanner := s.config.RowScanners["federationNodesSync"].(func(_ rowScanner, _ *types.NodeSync) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.NodeID,
-			&res.ModuleID,
-			&res.SyncType,
-			&res.SyncStatus,
-			&res.TimeOfAction,
-		)
-	}
+	err = row.Scan(
+		&res.NodeID,
+		&res.ModuleID,
+		&res.SyncType,
+		&res.SyncStatus,
+		&res.TimeOfAction,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/federation_shared_modules.gen.go b/store/rdbms/federation_shared_modules.gen.go
index 3f63e1322..af4ee169a 100644
--- a/store/rdbms/federation_shared_modules.gen.go
+++ b/store/rdbms/federation_shared_modules.gen.go
@@ -432,25 +432,20 @@ func (s Store) execDeleteFederationSharedModules(ctx context.Context, cnd squirr
 func (s Store) internalFederationSharedModuleRowScanner(row rowScanner) (res *types.SharedModule, err error) {
 	res = &types.SharedModule{}
 
-	if _, has := s.config.RowScanners["federationSharedModule"]; has {
-		scanner := s.config.RowScanners["federationSharedModule"].(func(_ rowScanner, _ *types.SharedModule) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.ID,
-			&res.NodeID,
-			&res.Handle,
-			&res.Name,
-			&res.ExternalFederationModuleID,
-			&res.Fields,
-			&res.CreatedBy,
-			&res.UpdatedBy,
-			&res.DeletedBy,
-			&res.CreatedAt,
-			&res.UpdatedAt,
-			&res.DeletedAt,
-		)
-	}
+	err = row.Scan(
+		&res.ID,
+		&res.NodeID,
+		&res.Handle,
+		&res.Name,
+		&res.ExternalFederationModuleID,
+		&res.Fields,
+		&res.CreatedBy,
+		&res.UpdatedBy,
+		&res.DeletedBy,
+		&res.CreatedAt,
+		&res.UpdatedAt,
+		&res.DeletedAt,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/flags.gen.go b/store/rdbms/flags.gen.go
index a24cc344b..0b7a4615c 100644
--- a/store/rdbms/flags.gen.go
+++ b/store/rdbms/flags.gen.go
@@ -269,18 +269,13 @@ func (s Store) execDeleteFlags(ctx context.Context, cnd squirrel.Sqlizer) error
 func (s Store) internalFlagRowScanner(row rowScanner) (res *types.Flag, err error) {
 	res = &types.Flag{}
 
-	if _, has := s.config.RowScanners["flag"]; has {
-		scanner := s.config.RowScanners["flag"].(func(_ rowScanner, _ *types.Flag) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.Kind,
-			&res.ResourceID,
-			&res.OwnedBy,
-			&res.Name,
-			&res.Active,
-		)
-	}
+	err = row.Scan(
+		&res.Kind,
+		&res.ResourceID,
+		&res.OwnedBy,
+		&res.Name,
+		&res.Active,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/labels.gen.go b/store/rdbms/labels.gen.go
index 1837c572d..6c57e06f0 100644
--- a/store/rdbms/labels.gen.go
+++ b/store/rdbms/labels.gen.go
@@ -240,17 +240,12 @@ func (s Store) execDeleteLabels(ctx context.Context, cnd squirrel.Sqlizer) error
 func (s Store) internalLabelRowScanner(row rowScanner) (res *types.Label, err error) {
 	res = &types.Label{}
 
-	if _, has := s.config.RowScanners["label"]; has {
-		scanner := s.config.RowScanners["label"].(func(_ rowScanner, _ *types.Label) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.Kind,
-			&res.ResourceID,
-			&res.Name,
-			&res.Value,
-		)
-	}
+	err = row.Scan(
+		&res.Kind,
+		&res.ResourceID,
+		&res.Name,
+		&res.Value,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/queue.gen.go b/store/rdbms/queue.gen.go
index 3539e564f..ec72a2883 100644
--- a/store/rdbms/queue.gen.go
+++ b/store/rdbms/queue.gen.go
@@ -422,23 +422,18 @@ func (s Store) execDeleteQueues(ctx context.Context, cnd squirrel.Sqlizer) error
 func (s Store) internalQueueRowScanner(row rowScanner) (res *types.Queue, err error) {
 	res = &types.Queue{}
 
-	if _, has := s.config.RowScanners["queue"]; has {
-		scanner := s.config.RowScanners["queue"].(func(_ rowScanner, _ *types.Queue) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.ID,
-			&res.Consumer,
-			&res.Queue,
-			&res.Meta,
-			&res.CreatedBy,
-			&res.UpdatedBy,
-			&res.DeletedBy,
-			&res.CreatedAt,
-			&res.UpdatedAt,
-			&res.DeletedAt,
-		)
-	}
+	err = row.Scan(
+		&res.ID,
+		&res.Consumer,
+		&res.Queue,
+		&res.Meta,
+		&res.CreatedBy,
+		&res.UpdatedBy,
+		&res.DeletedBy,
+		&res.CreatedAt,
+		&res.UpdatedAt,
+		&res.DeletedAt,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/queue_message.gen.go b/store/rdbms/queue_message.gen.go
index 4b8f1265c..2ef8f3720 100644
--- a/store/rdbms/queue_message.gen.go
+++ b/store/rdbms/queue_message.gen.go
@@ -380,18 +380,13 @@ func (s Store) execDeleteQueueMessages(ctx context.Context, cnd squirrel.Sqlizer
 func (s Store) internalQueueMessageRowScanner(row rowScanner) (res *types.QueueMessage, err error) {
 	res = &types.QueueMessage{}
 
-	if _, has := s.config.RowScanners["queueMessage"]; has {
-		scanner := s.config.RowScanners["queueMessage"].(func(_ rowScanner, _ *types.QueueMessage) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.ID,
-			&res.Queue,
-			&res.Payload,
-			&res.Processed,
-			&res.Created,
-		)
-	}
+	err = row.Scan(
+		&res.ID,
+		&res.Queue,
+		&res.Payload,
+		&res.Processed,
+		&res.Created,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/rbac_rules.gen.go b/store/rdbms/rbac_rules.gen.go
index e5ea40299..9c4a7d5c8 100644
--- a/store/rdbms/rbac_rules.gen.go
+++ b/store/rdbms/rbac_rules.gen.go
@@ -228,17 +228,12 @@ func (s Store) execDeleteRbacRules(ctx context.Context, cnd squirrel.Sqlizer) er
 func (s Store) internalRbacRuleRowScanner(row rowScanner) (res *rbac.Rule, err error) {
 	res = &rbac.Rule{}
 
-	if _, has := s.config.RowScanners["rbacRule"]; has {
-		scanner := s.config.RowScanners["rbacRule"].(func(_ rowScanner, _ *rbac.Rule) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.RoleID,
-			&res.Resource,
-			&res.Operation,
-			&res.Access,
-		)
-	}
+	err = row.Scan(
+		&res.RoleID,
+		&res.Resource,
+		&res.Operation,
+		&res.Access,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/rdbms_config.go b/store/rdbms/rdbms_config.go
index 27da34b85..d51701d0e 100644
--- a/store/rdbms/rdbms_config.go
+++ b/store/rdbms/rdbms_config.go
@@ -87,9 +87,6 @@ type (
 
 		ErrorHandler store.ErrorHandler
 
-		// Implementations can override internal RDBMS row scanners
-		RowScanners map[string]interface{}
-
 		// Different store backend implementation might handle upsert differently...
 		UpsertBuilder func(*Config, string, store.Payload, ...string) (squirrel.InsertBuilder, error)
 
diff --git a/store/rdbms/reminders.gen.go b/store/rdbms/reminders.gen.go
index 4be037980..822735d5f 100644
--- a/store/rdbms/reminders.gen.go
+++ b/store/rdbms/reminders.gen.go
@@ -432,26 +432,21 @@ func (s Store) execDeleteReminders(ctx context.Context, cnd squirrel.Sqlizer) er
 func (s Store) internalReminderRowScanner(row rowScanner) (res *types.Reminder, err error) {
 	res = &types.Reminder{}
 
-	if _, has := s.config.RowScanners["reminder"]; has {
-		scanner := s.config.RowScanners["reminder"].(func(_ rowScanner, _ *types.Reminder) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.ID,
-			&res.Resource,
-			&res.Payload,
-			&res.SnoozeCount,
-			&res.AssignedTo,
-			&res.AssignedBy,
-			&res.AssignedAt,
-			&res.DismissedBy,
-			&res.DismissedAt,
-			&res.RemindAt,
-			&res.CreatedAt,
-			&res.UpdatedAt,
-			&res.DeletedAt,
-		)
-	}
+	err = row.Scan(
+		&res.ID,
+		&res.Resource,
+		&res.Payload,
+		&res.SnoozeCount,
+		&res.AssignedTo,
+		&res.AssignedBy,
+		&res.AssignedAt,
+		&res.DismissedBy,
+		&res.DismissedAt,
+		&res.RemindAt,
+		&res.CreatedAt,
+		&res.UpdatedAt,
+		&res.DeletedAt,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/reports.gen.go b/store/rdbms/reports.gen.go
index 7d32245aa..c229740b2 100644
--- a/store/rdbms/reports.gen.go
+++ b/store/rdbms/reports.gen.go
@@ -11,6 +11,7 @@ package rdbms
 import (
 	"context"
 	"database/sql"
+
 	"github.com/Masterminds/squirrel"
 	"github.com/cortezaproject/corteza-server/pkg/errors"
 	"github.com/cortezaproject/corteza-server/pkg/filter"
@@ -443,26 +444,21 @@ func (s Store) execDeleteReports(ctx context.Context, cnd squirrel.Sqlizer) erro
 func (s Store) internalReportRowScanner(row rowScanner) (res *types.Report, err error) {
 	res = &types.Report{}
 
-	if _, has := s.config.RowScanners["report"]; has {
-		scanner := s.config.RowScanners["report"].(func(_ rowScanner, _ *types.Report) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.ID,
-			&res.Handle,
-			&res.Meta,
-			&res.Scenarios,
-			&res.Sources,
-			&res.Blocks,
-			&res.OwnedBy,
-			&res.CreatedBy,
-			&res.UpdatedBy,
-			&res.DeletedBy,
-			&res.CreatedAt,
-			&res.UpdatedAt,
-			&res.DeletedAt,
-		)
-	}
+	err = row.Scan(
+		&res.ID,
+		&res.Handle,
+		&res.Meta,
+		&res.Scenarios,
+		&res.Sources,
+		&res.Blocks,
+		&res.OwnedBy,
+		&res.CreatedBy,
+		&res.UpdatedBy,
+		&res.DeletedBy,
+		&res.CreatedAt,
+		&res.UpdatedAt,
+		&res.DeletedAt,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/resource_translation.gen.go b/store/rdbms/resource_translation.gen.go
index a484ec21d..300fe8c53 100644
--- a/store/rdbms/resource_translation.gen.go
+++ b/store/rdbms/resource_translation.gen.go
@@ -421,25 +421,20 @@ func (s Store) execDeleteResourceTranslations(ctx context.Context, cnd squirrel.
 func (s Store) internalResourceTranslationRowScanner(row rowScanner) (res *types.ResourceTranslation, err error) {
 	res = &types.ResourceTranslation{}
 
-	if _, has := s.config.RowScanners["resourceTranslation"]; has {
-		scanner := s.config.RowScanners["resourceTranslation"].(func(_ rowScanner, _ *types.ResourceTranslation) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.ID,
-			&res.Lang,
-			&res.Resource,
-			&res.K,
-			&res.Message,
-			&res.OwnedBy,
-			&res.CreatedBy,
-			&res.UpdatedBy,
-			&res.DeletedBy,
-			&res.CreatedAt,
-			&res.UpdatedAt,
-			&res.DeletedAt,
-		)
-	}
+	err = row.Scan(
+		&res.ID,
+		&res.Lang,
+		&res.Resource,
+		&res.K,
+		&res.Message,
+		&res.OwnedBy,
+		&res.CreatedBy,
+		&res.UpdatedBy,
+		&res.DeletedBy,
+		&res.CreatedAt,
+		&res.UpdatedAt,
+		&res.DeletedAt,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/role_members.gen.go b/store/rdbms/role_members.gen.go
index 095a97321..6f1ea406d 100644
--- a/store/rdbms/role_members.gen.go
+++ b/store/rdbms/role_members.gen.go
@@ -229,15 +229,10 @@ func (s Store) execDeleteRoleMembers(ctx context.Context, cnd squirrel.Sqlizer)
 func (s Store) internalRoleMemberRowScanner(row rowScanner) (res *types.RoleMember, err error) {
 	res = &types.RoleMember{}
 
-	if _, has := s.config.RowScanners["roleMember"]; has {
-		scanner := s.config.RowScanners["roleMember"].(func(_ rowScanner, _ *types.RoleMember) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.UserID,
-			&res.RoleID,
-		)
-	}
+	err = row.Scan(
+		&res.UserID,
+		&res.RoleID,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/roles.gen.go b/store/rdbms/roles.gen.go
index eba29f9ab..2f5704829 100644
--- a/store/rdbms/roles.gen.go
+++ b/store/rdbms/roles.gen.go
@@ -456,21 +456,16 @@ func (s Store) execDeleteRoles(ctx context.Context, cnd squirrel.Sqlizer) error
 func (s Store) internalRoleRowScanner(row rowScanner) (res *types.Role, err error) {
 	res = &types.Role{}
 
-	if _, has := s.config.RowScanners["role"]; has {
-		scanner := s.config.RowScanners["role"].(func(_ rowScanner, _ *types.Role) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.ID,
-			&res.Name,
-			&res.Handle,
-			&res.Meta,
-			&res.CreatedAt,
-			&res.UpdatedAt,
-			&res.ArchivedAt,
-			&res.DeletedAt,
-		)
-	}
+	err = row.Scan(
+		&res.ID,
+		&res.Name,
+		&res.Handle,
+		&res.Meta,
+		&res.CreatedAt,
+		&res.UpdatedAt,
+		&res.ArchivedAt,
+		&res.DeletedAt,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/settings.gen.go b/store/rdbms/settings.gen.go
index 729b71b6f..e90051154 100644
--- a/store/rdbms/settings.gen.go
+++ b/store/rdbms/settings.gen.go
@@ -247,18 +247,13 @@ func (s Store) execDeleteSettings(ctx context.Context, cnd squirrel.Sqlizer) err
 func (s Store) internalSettingRowScanner(row rowScanner) (res *types.SettingValue, err error) {
 	res = &types.SettingValue{}
 
-	if _, has := s.config.RowScanners["setting"]; has {
-		scanner := s.config.RowScanners["setting"].(func(_ rowScanner, _ *types.SettingValue) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.Name,
-			&res.OwnedBy,
-			&res.Value,
-			&res.UpdatedBy,
-			&res.UpdatedAt,
-		)
-	}
+	err = row.Scan(
+		&res.Name,
+		&res.OwnedBy,
+		&res.Value,
+		&res.UpdatedBy,
+		&res.UpdatedAt,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/templates.gen.go b/store/rdbms/templates.gen.go
index 193d37813..fd40799b9 100644
--- a/store/rdbms/templates.gen.go
+++ b/store/rdbms/templates.gen.go
@@ -443,25 +443,20 @@ func (s Store) execDeleteTemplates(ctx context.Context, cnd squirrel.Sqlizer) er
 func (s Store) internalTemplateRowScanner(row rowScanner) (res *types.Template, err error) {
 	res = &types.Template{}
 
-	if _, has := s.config.RowScanners["template"]; has {
-		scanner := s.config.RowScanners["template"].(func(_ rowScanner, _ *types.Template) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.ID,
-			&res.Handle,
-			&res.Language,
-			&res.Type,
-			&res.Partial,
-			&res.Meta,
-			&res.Template,
-			&res.OwnerID,
-			&res.CreatedAt,
-			&res.UpdatedAt,
-			&res.DeletedAt,
-			&res.LastUsedAt,
-		)
-	}
+	err = row.Scan(
+		&res.ID,
+		&res.Handle,
+		&res.Language,
+		&res.Type,
+		&res.Partial,
+		&res.Meta,
+		&res.Template,
+		&res.OwnerID,
+		&res.CreatedAt,
+		&res.UpdatedAt,
+		&res.DeletedAt,
+		&res.LastUsedAt,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)
diff --git a/store/rdbms/users.gen.go b/store/rdbms/users.gen.go
index 6da2ff7a2..94c4912b6 100644
--- a/store/rdbms/users.gen.go
+++ b/store/rdbms/users.gen.go
@@ -465,25 +465,20 @@ func (s Store) execDeleteUsers(ctx context.Context, cnd squirrel.Sqlizer) error
 func (s Store) internalUserRowScanner(row rowScanner) (res *types.User, err error) {
 	res = &types.User{}
 
-	if _, has := s.config.RowScanners["user"]; has {
-		scanner := s.config.RowScanners["user"].(func(_ rowScanner, _ *types.User) error)
-		err = scanner(row, res)
-	} else {
-		err = row.Scan(
-			&res.ID,
-			&res.Email,
-			&res.EmailConfirmed,
-			&res.Username,
-			&res.Name,
-			&res.Handle,
-			&res.Meta,
-			&res.Kind,
-			&res.CreatedAt,
-			&res.UpdatedAt,
-			&res.SuspendedAt,
-			&res.DeletedAt,
-		)
-	}
+	err = row.Scan(
+		&res.ID,
+		&res.Email,
+		&res.EmailConfirmed,
+		&res.Username,
+		&res.Name,
+		&res.Handle,
+		&res.Meta,
+		&res.Kind,
+		&res.CreatedAt,
+		&res.UpdatedAt,
+		&res.SuspendedAt,
+		&res.DeletedAt,
+	)
 
 	if err == sql.ErrNoRows {
 		return nil, store.ErrNotFound.Stack(1)