diff --git a/store/rdbms/federation_exposed_modules.gen.go b/store/rdbms/federation_exposed_modules.gen.go
index 56d4dc341..f82d13e38 100644
--- a/store/rdbms/federation_exposed_modules.gen.go
+++ b/store/rdbms/federation_exposed_modules.gen.go
@@ -223,7 +223,7 @@ func (s Store) QueryFederationExposedModules(
 // It returns federation module
 func (s Store) LookupFederationExposedModuleByID(ctx context.Context, id uint64) (*types.ExposedModule, error) {
 	return s.execLookupFederationExposedModule(ctx, squirrel.Eq{
-		s.preprocessColumn("cmd.id", ""): s.preprocessValue(id, ""),
+		s.preprocessColumn("cmd.id", ""): store.PreprocessValue(id, ""),
 	})
 }
 
@@ -260,7 +260,7 @@ func (s Store) partialFederationExposedModuleUpdate(ctx context.Context, onlyCol
 		err = s.execUpdateFederationExposedModules(
 			ctx,
 			squirrel.Eq{
-				s.preprocessColumn("cmd.id", ""): s.preprocessValue(res.ID, ""),
+				s.preprocessColumn("cmd.id", ""): store.PreprocessValue(res.ID, ""),
 			},
 			s.internalFederationExposedModuleEncoder(res).Skip("id").Only(onlyColumns...))
 		if err != nil {
@@ -293,7 +293,7 @@ func (s Store) DeleteFederationExposedModule(ctx context.Context, rr ...*types.E
 	for _, res := range rr {
 
 		err = s.execDeleteFederationExposedModules(ctx, squirrel.Eq{
-			s.preprocessColumn("cmd.id", ""): s.preprocessValue(res.ID, ""),
+			s.preprocessColumn("cmd.id", ""): store.PreprocessValue(res.ID, ""),
 		})
 		if err != nil {
 			return s.config.ErrorHandler(err)
@@ -306,7 +306,7 @@ func (s Store) DeleteFederationExposedModule(ctx context.Context, rr ...*types.E
 // DeleteFederationExposedModuleByID Deletes row from the federation_module_exposed table
 func (s Store) DeleteFederationExposedModuleByID(ctx context.Context, ID uint64) error {
 	return s.execDeleteFederationExposedModules(ctx, squirrel.Eq{
-		s.preprocessColumn("cmd.id", ""): s.preprocessValue(ID, ""),
+		s.preprocessColumn("cmd.id", ""): store.PreprocessValue(ID, ""),
 	})
 }
 
diff --git a/store/rdbms/federation_module_mappings.gen.go b/store/rdbms/federation_module_mappings.gen.go
index 796542c3c..c31910455 100644
--- a/store/rdbms/federation_module_mappings.gen.go
+++ b/store/rdbms/federation_module_mappings.gen.go
@@ -231,9 +231,9 @@ func (s Store) QueryFederationModuleMappings(
 // It returns module mapping
 func (s Store) LookupFederationModuleMappingByFederationModuleIDComposeModuleIDComposeNamespaceID(ctx context.Context, federation_module_id uint64, compose_module_id uint64, compose_namespace_id uint64) (*types.ModuleMapping, error) {
 	return s.execLookupFederationModuleMapping(ctx, squirrel.Eq{
-		s.preprocessColumn("cmd.rel_federation_module", ""): s.preprocessValue(federation_module_id, ""),
-		s.preprocessColumn("cmd.rel_compose_module", ""):    s.preprocessValue(compose_module_id, ""),
-		s.preprocessColumn("cmd.rel_compose_namespace", ""): s.preprocessValue(compose_namespace_id, ""),
+		s.preprocessColumn("cmd.rel_federation_module", ""): store.PreprocessValue(federation_module_id, ""),
+		s.preprocessColumn("cmd.rel_compose_module", ""):    store.PreprocessValue(compose_module_id, ""),
+		s.preprocessColumn("cmd.rel_compose_namespace", ""): store.PreprocessValue(compose_namespace_id, ""),
 	})
 }
 
@@ -242,7 +242,7 @@ func (s Store) LookupFederationModuleMappingByFederationModuleIDComposeModuleIDC
 // It returns module mapping
 func (s Store) LookupFederationModuleMappingByFederationModuleID(ctx context.Context, federation_module_id uint64) (*types.ModuleMapping, error) {
 	return s.execLookupFederationModuleMapping(ctx, squirrel.Eq{
-		s.preprocessColumn("cmd.rel_federation_module", ""): s.preprocessValue(federation_module_id, ""),
+		s.preprocessColumn("cmd.rel_federation_module", ""): store.PreprocessValue(federation_module_id, ""),
 	})
 }
 
@@ -279,7 +279,7 @@ func (s Store) partialFederationModuleMappingUpdate(ctx context.Context, onlyCol
 		err = s.execUpdateFederationModuleMappings(
 			ctx,
 			squirrel.Eq{
-				s.preprocessColumn("cmd.rel_federation_module", ""): s.preprocessValue(res.FederationModuleID, ""), s.preprocessColumn("cmd.rel_compose_module", ""): s.preprocessValue(res.ComposeModuleID, ""), s.preprocessColumn("cmd.rel_compose_namespace", ""): s.preprocessValue(res.ComposeNamespaceID, ""),
+				s.preprocessColumn("cmd.rel_federation_module", ""): store.PreprocessValue(res.FederationModuleID, ""), s.preprocessColumn("cmd.rel_compose_module", ""): store.PreprocessValue(res.ComposeModuleID, ""), s.preprocessColumn("cmd.rel_compose_namespace", ""): store.PreprocessValue(res.ComposeNamespaceID, ""),
 			},
 			s.internalFederationModuleMappingEncoder(res).Skip("rel_federation_module", "rel_compose_module", "rel_compose_namespace").Only(onlyColumns...))
 		if err != nil {
@@ -312,7 +312,7 @@ func (s Store) DeleteFederationModuleMapping(ctx context.Context, rr ...*types.M
 	for _, res := range rr {
 
 		err = s.execDeleteFederationModuleMappings(ctx, squirrel.Eq{
-			s.preprocessColumn("cmd.rel_federation_module", ""): s.preprocessValue(res.FederationModuleID, ""), s.preprocessColumn("cmd.rel_compose_module", ""): s.preprocessValue(res.ComposeModuleID, ""), s.preprocessColumn("cmd.rel_compose_namespace", ""): s.preprocessValue(res.ComposeNamespaceID, ""),
+			s.preprocessColumn("cmd.rel_federation_module", ""): store.PreprocessValue(res.FederationModuleID, ""), s.preprocessColumn("cmd.rel_compose_module", ""): store.PreprocessValue(res.ComposeModuleID, ""), s.preprocessColumn("cmd.rel_compose_namespace", ""): store.PreprocessValue(res.ComposeNamespaceID, ""),
 		})
 		if err != nil {
 			return s.config.ErrorHandler(err)
@@ -325,9 +325,9 @@ func (s Store) DeleteFederationModuleMapping(ctx context.Context, rr ...*types.M
 // DeleteFederationModuleMappingByFederationModuleIDComposeModuleIDComposeNamespaceID Deletes row from the federation_module_mapping table
 func (s Store) DeleteFederationModuleMappingByFederationModuleIDComposeModuleIDComposeNamespaceID(ctx context.Context, federationModuleID uint64, composeModuleID uint64, composeNamespaceID uint64) error {
 	return s.execDeleteFederationModuleMappings(ctx, squirrel.Eq{
-		s.preprocessColumn("cmd.rel_federation_module", ""): s.preprocessValue(federationModuleID, ""),
-		s.preprocessColumn("cmd.rel_compose_module", ""):    s.preprocessValue(composeModuleID, ""),
-		s.preprocessColumn("cmd.rel_compose_namespace", ""): s.preprocessValue(composeNamespaceID, ""),
+		s.preprocessColumn("cmd.rel_federation_module", ""): store.PreprocessValue(federationModuleID, ""),
+		s.preprocessColumn("cmd.rel_compose_module", ""):    store.PreprocessValue(composeModuleID, ""),
+		s.preprocessColumn("cmd.rel_compose_namespace", ""): store.PreprocessValue(composeNamespaceID, ""),
 	})
 }
 
diff --git a/store/rdbms/federation_nodes.gen.go b/store/rdbms/federation_nodes.gen.go
index 3b33b328a..b9191cbe6 100644
--- a/store/rdbms/federation_nodes.gen.go
+++ b/store/rdbms/federation_nodes.gen.go
@@ -99,15 +99,15 @@ func (s Store) QueryFederationNodes(
 // It returns federation node
 func (s Store) LookupFederationNodeByID(ctx context.Context, id uint64) (*types.Node, error) {
 	return s.execLookupFederationNode(ctx, squirrel.Eq{
-		s.preprocessColumn("fdn.id", ""): s.preprocessValue(id, ""),
+		s.preprocessColumn("fdn.id", ""): store.PreprocessValue(id, ""),
 	})
 }
 
 // LookupFederationNodeByBaseURLSharedNodeID searches for node by shared-node-id and base-url
 func (s Store) LookupFederationNodeByBaseURLSharedNodeID(ctx context.Context, base_url string, shared_node_id uint64) (*types.Node, error) {
 	return s.execLookupFederationNode(ctx, squirrel.Eq{
-		s.preprocessColumn("fdn.base_url", ""):       s.preprocessValue(base_url, ""),
-		s.preprocessColumn("fdn.shared_node_id", ""): s.preprocessValue(shared_node_id, ""),
+		s.preprocessColumn("fdn.base_url", ""):       store.PreprocessValue(base_url, ""),
+		s.preprocessColumn("fdn.shared_node_id", ""): store.PreprocessValue(shared_node_id, ""),
 	})
 }
 
@@ -144,7 +144,7 @@ func (s Store) partialFederationNodeUpdate(ctx context.Context, onlyColumns []st
 		err = s.execUpdateFederationNodes(
 			ctx,
 			squirrel.Eq{
-				s.preprocessColumn("fdn.id", ""): s.preprocessValue(res.ID, ""),
+				s.preprocessColumn("fdn.id", ""): store.PreprocessValue(res.ID, ""),
 			},
 			s.internalFederationNodeEncoder(res).Skip("id").Only(onlyColumns...))
 		if err != nil {
@@ -177,7 +177,7 @@ func (s Store) DeleteFederationNode(ctx context.Context, rr ...*types.Node) (err
 	for _, res := range rr {
 
 		err = s.execDeleteFederationNodes(ctx, squirrel.Eq{
-			s.preprocessColumn("fdn.id", ""): s.preprocessValue(res.ID, ""),
+			s.preprocessColumn("fdn.id", ""): store.PreprocessValue(res.ID, ""),
 		})
 		if err != nil {
 			return s.config.ErrorHandler(err)
@@ -190,7 +190,7 @@ func (s Store) DeleteFederationNode(ctx context.Context, rr ...*types.Node) (err
 // DeleteFederationNodeByID Deletes row from the federation_nodes table
 func (s Store) DeleteFederationNodeByID(ctx context.Context, ID uint64) error {
 	return s.execDeleteFederationNodes(ctx, squirrel.Eq{
-		s.preprocessColumn("fdn.id", ""): s.preprocessValue(ID, ""),
+		s.preprocessColumn("fdn.id", ""): store.PreprocessValue(ID, ""),
 	})
 }
 
diff --git a/store/rdbms/federation_shared_modules.gen.go b/store/rdbms/federation_shared_modules.gen.go
index 8c1327459..0ab4e32e6 100644
--- a/store/rdbms/federation_shared_modules.gen.go
+++ b/store/rdbms/federation_shared_modules.gen.go
@@ -223,7 +223,7 @@ func (s Store) QueryFederationSharedModules(
 // It returns shared federation module
 func (s Store) LookupFederationSharedModuleByID(ctx context.Context, id uint64) (*types.SharedModule, error) {
 	return s.execLookupFederationSharedModule(ctx, squirrel.Eq{
-		s.preprocessColumn("cmd.id", ""): s.preprocessValue(id, ""),
+		s.preprocessColumn("cmd.id", ""): store.PreprocessValue(id, ""),
 	})
 }
 
@@ -260,7 +260,7 @@ func (s Store) partialFederationSharedModuleUpdate(ctx context.Context, onlyColu
 		err = s.execUpdateFederationSharedModules(
 			ctx,
 			squirrel.Eq{
-				s.preprocessColumn("cmd.id", ""): s.preprocessValue(res.ID, ""),
+				s.preprocessColumn("cmd.id", ""): store.PreprocessValue(res.ID, ""),
 			},
 			s.internalFederationSharedModuleEncoder(res).Skip("id").Only(onlyColumns...))
 		if err != nil {
@@ -293,7 +293,7 @@ func (s Store) DeleteFederationSharedModule(ctx context.Context, rr ...*types.Sh
 	for _, res := range rr {
 
 		err = s.execDeleteFederationSharedModules(ctx, squirrel.Eq{
-			s.preprocessColumn("cmd.id", ""): s.preprocessValue(res.ID, ""),
+			s.preprocessColumn("cmd.id", ""): store.PreprocessValue(res.ID, ""),
 		})
 		if err != nil {
 			return s.config.ErrorHandler(err)
@@ -306,7 +306,7 @@ func (s Store) DeleteFederationSharedModule(ctx context.Context, rr ...*types.Sh
 // DeleteFederationSharedModuleByID Deletes row from the federation_module_shared table
 func (s Store) DeleteFederationSharedModuleByID(ctx context.Context, ID uint64) error {
 	return s.execDeleteFederationSharedModules(ctx, squirrel.Eq{
-		s.preprocessColumn("cmd.id", ""): s.preprocessValue(ID, ""),
+		s.preprocessColumn("cmd.id", ""): store.PreprocessValue(ID, ""),
 	})
 }