diff --git a/cmd/accumulated/run/schema_gen.go b/cmd/accumulated/run/schema_gen.go
index d0d1fffe8..4065f94a1 100644
--- a/cmd/accumulated/run/schema_gen.go
+++ b/cmd/accumulated/run/schema_gen.go
@@ -112,7 +112,7 @@ func init() {
 		Transients: []*schema.Field{
 			{
 				Name: "key",
-				Type: schema.ExternalTypeReference[address.Address](),
+				Type: schema.TypeReferenceFor[address.Address](),
 			},
 		},
 	}).SetGoType()
@@ -130,7 +130,7 @@ func init() {
 		Transients: []*schema.Field{
 			{
 				Name: "key",
-				Type: schema.ExternalTypeReference[address.Address](),
+				Type: schema.TypeReferenceFor[address.Address](),
 			},
 		},
 	}).SetGoType()
@@ -201,7 +201,7 @@ func init() {
 			},
 			{
 				Name: "fs",
-				Type: schema.ExternalTypeReference[fs.FS](),
+				Type: schema.TypeReferenceFor[fs.FS](),
 			},
 		},
 	}).SetGoType()
@@ -316,13 +316,13 @@ func init() {
 			},
 			{
 				Name: "Listen",
-				Type: schema.ExternalTypeReference[p2p.Multiaddr](),
+				Type: schema.TypeReferenceFor[p2p.Multiaddr](),
 			},
 			{
 				Name: "BootstrapPeers",
 				Type: &schema.ArrayType{
 					TypeBase: schema.TypeBase{},
-					Elem:     schema.ExternalTypeReference[p2p.Multiaddr](),
+					Elem:     schema.TypeReferenceFor[p2p.Multiaddr](),
 				},
 			},
 			{
@@ -345,7 +345,7 @@ func init() {
 				Name: "Partition",
 				Type: &schema.PointerType{
 					TypeBase: schema.TypeBase{},
-					Elem:     schema.ExternalTypeReference[protocol.PartitionInfo](),
+					Elem:     schema.TypeReferenceFor[protocol.PartitionInfo](),
 				},
 			},
 			{
@@ -385,7 +385,7 @@ func init() {
 			}).ResolveTo(&deferredTypes, "CoreValidatorMode"),
 			{
 				Name: "Listen",
-				Type: schema.ExternalTypeReference[p2p.Multiaddr](),
+				Type: schema.TypeReferenceFor[p2p.Multiaddr](),
 			},
 			{
 				Name: "BVN",
@@ -406,14 +406,14 @@ func init() {
 				Name: "DnBootstrapPeers",
 				Type: &schema.ArrayType{
 					TypeBase: schema.TypeBase{},
-					Elem:     schema.ExternalTypeReference[p2p.Multiaddr](),
+					Elem:     schema.TypeReferenceFor[p2p.Multiaddr](),
 				},
 			},
 			{
 				Name: "BvnBootstrapPeers",
 				Type: &schema.ArrayType{
 					TypeBase: schema.TypeBase{},
-					Elem:     schema.ExternalTypeReference[p2p.Multiaddr](),
+					Elem:     schema.TypeReferenceFor[p2p.Multiaddr](),
 				},
 			},
 			{
@@ -488,7 +488,7 @@ func init() {
 		Fields: []*schema.Field{
 			{
 				Name: "Listen",
-				Type: schema.ExternalTypeReference[p2p.Multiaddr](),
+				Type: schema.TypeReferenceFor[p2p.Multiaddr](),
 			},
 			{
 				Name: "Bvns",
@@ -507,7 +507,7 @@ func init() {
 				Name: "Globals",
 				Type: &schema.PointerType{
 					TypeBase: schema.TypeBase{},
-					Elem:     schema.ExternalTypeReference[network.GlobalValues](),
+					Elem:     schema.TypeReferenceFor[network.GlobalValues](),
 				},
 			},
 			{
@@ -554,7 +554,7 @@ func init() {
 				Name: "Account",
 				Type: &schema.PointerType{
 					TypeBase: schema.TypeBase{},
-					Elem:     schema.ExternalTypeReference[url.URL](),
+					Elem:     schema.TypeReferenceFor[url.URL](),
 				},
 			},
 			(&schema.Field{
@@ -564,7 +564,7 @@ func init() {
 				Name: "Router",
 				Type: &schema.PointerType{
 					TypeBase: schema.TypeBase{},
-					Elem:     schema.ExternalTypeReference[RouterServiceRef](),
+					Elem:     schema.TypeReferenceFor[RouterServiceRef](),
 				},
 			},
 		},
@@ -577,7 +577,7 @@ func init() {
 		Fields: []*schema.Field{
 			{
 				Name: "Listen",
-				Type: schema.ExternalTypeReference[p2p.Multiaddr](),
+				Type: schema.TypeReferenceFor[p2p.Multiaddr](),
 			},
 		},
 	}).SetGoType()
@@ -592,7 +592,7 @@ func init() {
 				Description: "are the addresses and schemes to listen on",
 				Type: &schema.ArrayType{
 					TypeBase: schema.TypeBase{},
-					Elem:     schema.ExternalTypeReference[p2p.Multiaddr](),
+					Elem:     schema.TypeReferenceFor[p2p.Multiaddr](),
 				},
 			},
 			{
@@ -610,7 +610,7 @@ func init() {
 				Optional:    true,
 				Type: &schema.PointerType{
 					TypeBase: schema.TypeBase{},
-					Elem:     schema.ExternalTypeReference[encoding.Duration](),
+					Elem:     schema.TypeReferenceFor[encoding.Duration](),
 				},
 			},
 			{
@@ -635,7 +635,7 @@ func init() {
 		Fields: []*schema.Field{
 			{
 				Name: "ID",
-				Type: schema.ExternalTypeReference[p2p.PeerID](),
+				Type: schema.TypeReferenceFor[p2p.PeerID](),
 			},
 			{
 				Name: "Partitions",
@@ -648,7 +648,7 @@ func init() {
 				Name: "Addresses",
 				Type: &schema.ArrayType{
 					TypeBase: schema.TypeBase{},
-					Elem:     schema.ExternalTypeReference[p2p.Multiaddr](),
+					Elem:     schema.TypeReferenceFor[p2p.Multiaddr](),
 				},
 			},
 		},
@@ -690,7 +690,7 @@ func init() {
 				Name: "Router",
 				Type: &schema.PointerType{
 					TypeBase: schema.TypeBase{},
-					Elem:     schema.ExternalTypeReference[RouterServiceRef](),
+					Elem:     schema.TypeReferenceFor[RouterServiceRef](),
 				},
 			},
 			{
@@ -715,7 +715,7 @@ func init() {
 			(&schema.Field{}).ResolveTo(&deferredTypes, "HttpListener"),
 			{
 				Name: "PprofListen",
-				Type: schema.ExternalTypeReference[p2p.Multiaddr](),
+				Type: schema.TypeReferenceFor[p2p.Multiaddr](),
 			},
 			{
 				Name: "Monitoring",
@@ -782,7 +782,7 @@ func init() {
 		Fields: []*schema.Field{
 			{
 				Name: "Level",
-				Type: schema.ExternalTypeReference[slog.Level](),
+				Type: schema.TypeReferenceFor[slog.Level](),
 			},
 			{
 				Name: "Modules",
@@ -859,7 +859,7 @@ func init() {
 				Description: "is rate at which to poll memory usage",
 				Type: &schema.PointerType{
 					TypeBase: schema.TypeBase{},
-					Elem:     schema.ExternalTypeReference[encoding.Duration](),
+					Elem:     schema.TypeReferenceFor[encoding.Duration](),
 				},
 			},
 			{
@@ -921,14 +921,14 @@ func init() {
 				Name: "Listen",
 				Type: &schema.ArrayType{
 					TypeBase: schema.TypeBase{},
-					Elem:     schema.ExternalTypeReference[p2p.Multiaddr](),
+					Elem:     schema.TypeReferenceFor[p2p.Multiaddr](),
 				},
 			},
 			{
 				Name: "BootstrapPeers",
 				Type: &schema.ArrayType{
 					TypeBase: schema.TypeBase{},
-					Elem:     schema.ExternalTypeReference[p2p.Multiaddr](),
+					Elem:     schema.TypeReferenceFor[p2p.Multiaddr](),
 				},
 			},
 			(&schema.Field{
@@ -949,12 +949,12 @@ func init() {
 				Name: "DiscoveryMode",
 				Type: &schema.PointerType{
 					TypeBase: schema.TypeBase{},
-					Elem:     schema.ExternalTypeReference[DhtMode](),
+					Elem:     schema.TypeReferenceFor[DhtMode](),
 				},
 			},
 			{
 				Name: "External",
-				Type: schema.ExternalTypeReference[p2p.Multiaddr](),
+				Type: schema.TypeReferenceFor[p2p.Multiaddr](),
 			},
 		},
 	}).SetGoType()
@@ -1017,14 +1017,14 @@ func init() {
 				Name: "Seed",
 				Type: &schema.PointerType{
 					TypeBase: schema.TypeBase{},
-					Elem:     schema.ExternalTypeReference[record.Key](),
+					Elem:     schema.TypeReferenceFor[record.Key](),
 				},
 			},
 		},
 		Transients: []*schema.Field{
 			{
 				Name: "key",
-				Type: schema.ExternalTypeReference[address.Address](),
+				Type: schema.TypeReferenceFor[address.Address](),
 			},
 		},
 	}).SetGoType()
@@ -1073,7 +1073,7 @@ func init() {
 				Optional: true,
 				Type: &schema.PointerType{
 					TypeBase: schema.TypeBase{},
-					Elem:     schema.ExternalTypeReference[StorageOrRef](),
+					Elem:     schema.TypeReferenceFor[StorageOrRef](),
 				},
 			},
 		},
@@ -1280,7 +1280,7 @@ func init() {
 				Optional: true,
 				Type: &schema.PointerType{
 					TypeBase: schema.TypeBase{},
-					Elem:     schema.ExternalTypeReference[StorageOrRef](),
+					Elem:     schema.TypeReferenceFor[StorageOrRef](),
 				},
 			},
 			{
@@ -1294,7 +1294,7 @@ func init() {
 				Optional:    true,
 				Type: &schema.PointerType{
 					TypeBase: schema.TypeBase{},
-					Elem:     schema.ExternalTypeReference[network.CronSchedule](),
+					Elem:     schema.TypeReferenceFor[network.CronSchedule](),
 				},
 			},
 			{
@@ -1499,7 +1499,7 @@ func init() {
 			},
 			{
 				Name: "Rate",
-				Type: schema.ExternalTypeReference[encoding.Duration](),
+				Type: schema.TypeReferenceFor[encoding.Duration](),
 			},
 		},
 	}).SetGoType()
@@ -1511,7 +1511,7 @@ func init() {
 		Transients: []*schema.Field{
 			{
 				Name: "key",
-				Type: schema.ExternalTypeReference[address.Address](),
+				Type: schema.TypeReferenceFor[address.Address](),
 			},
 		},
 	}).SetGoType()
diff --git a/go.mod b/go.mod
index e0ead6e24..18cd9d59e 100644
--- a/go.mod
+++ b/go.mod
@@ -72,7 +72,7 @@ require (
 	github.com/sergi/go-diff v1.2.0
 	github.com/ulikunitz/xz v0.5.11
 	github.com/vektra/mockery/v2 v2.42.3
-	gitlab.com/accumulatenetwork/core/schema v0.1.1-0.20240629174449-71c192527ce6
+	gitlab.com/accumulatenetwork/core/schema v0.2.1-0.20240711192735-5b3657ff1135
 	gitlab.com/firelizzard/go-script v0.0.0-20240404234115-d5f0a716003d
 	go.opentelemetry.io/otel v1.27.0
 	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.27.0
diff --git a/go.sum b/go.sum
index 569db31e5..eab1726e9 100644
--- a/go.sum
+++ b/go.sum
@@ -1170,8 +1170,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-gitlab.com/accumulatenetwork/core/schema v0.1.1-0.20240629174449-71c192527ce6 h1:YEbkTdnXuNX3UoAqFlwpS0zEWxwey+e7LQ3hPKIoM6Y=
-gitlab.com/accumulatenetwork/core/schema v0.1.1-0.20240629174449-71c192527ce6/go.mod h1:FTl7W44SWhDenzAtvKkLu30Cin8DAr249mH4eg7BNLY=
+gitlab.com/accumulatenetwork/core/schema v0.2.1-0.20240711192735-5b3657ff1135 h1:DawYWpRLfW7HeTaN1k4idFrv1B+esoNAHjWbtGRqi80=
+gitlab.com/accumulatenetwork/core/schema v0.2.1-0.20240711192735-5b3657ff1135/go.mod h1:FTl7W44SWhDenzAtvKkLu30Cin8DAr249mH4eg7BNLY=
 gitlab.com/bosi/decorder v0.4.1 h1:VdsdfxhstabyhZovHafFw+9eJ6eU0d2CkFNJcZz/NU4=
 gitlab.com/bosi/decorder v0.4.1/go.mod h1:jecSqWUew6Yle1pCr2eLWTensJMmsxHsBwt+PVbkAqA=
 gitlab.com/ethan.reesor/vscode-notebooks/go-playbooks v0.0.0-20220417214602-1121b9fae118 h1:UnyYFTz6dWVMBzLUyqHPIQwMrdpiuE+CE7p/5kUfvmk=
diff --git a/pkg/database/bpt/schema_gen.go b/pkg/database/bpt/schema_gen.go
index 69405477a..ba6f95b7e 100644
--- a/pkg/database/bpt/schema_gen.go
+++ b/pkg/database/bpt/schema_gen.go
@@ -14,7 +14,7 @@ var (
 	sbranch     schema.Methods[*branch, *branch, *schema.CompositeType]
 	semptyNode  schema.Methods[*emptyNode, *emptyNode, *schema.CompositeType]
 	sleaf       schema.Methods[*leaf, *leaf, *schema.CompositeType]
-	snode       schema.Methods[node, *node, *schema.UnionType]
+	snode       schema.UnionMethods[node, nodeType]
 	snodeType   schema.EnumMethods[nodeType]
 	sstateData  schema.Methods[*stateData, *stateData, *schema.CompositeType]
 )
@@ -67,7 +67,7 @@ func init() {
 				Name: "bpt",
 				Type: &schema.PointerType{
 					TypeBase: schema.TypeBase{},
-					Elem:     schema.ExternalTypeReference[BPT](),
+					Elem:     schema.TypeReferenceFor[BPT](),
 				},
 			},
 			{
@@ -79,7 +79,7 @@ func init() {
 			},
 			{
 				Name: "status",
-				Type: schema.ExternalTypeReference[branchStatus](),
+				Type: schema.TypeReferenceFor[branchStatus](),
 			},
 			(&schema.Field{
 				Name: "Left",
@@ -119,7 +119,7 @@ func init() {
 				Name: "Key",
 				Type: &schema.PointerType{
 					TypeBase: schema.TypeBase{},
-					Elem:     schema.ExternalTypeReference[record.Key](),
+					Elem:     schema.TypeReferenceFor[record.Key](),
 				},
 			},
 			{
@@ -138,7 +138,7 @@ func init() {
 		},
 	}).SetGoType()
 
-	snode = schema.WithMethods[node, *node](
+	snode = schema.WithUnionMethods[node, nodeType](
 		&schema.UnionType{
 			TypeBase: schema.TypeBase{
 				Name: "node",
diff --git a/pkg/database/keyvalue/block/schema_gen.go b/pkg/database/keyvalue/block/schema_gen.go
index 7a6de6acd..24550a699 100644
--- a/pkg/database/keyvalue/block/schema_gen.go
+++ b/pkg/database/keyvalue/block/schema_gen.go
@@ -12,7 +12,7 @@ import (
 var (
 	sblockID         schema.Methods[*blockID, *blockID, *schema.CompositeType]
 	sendBlockEntry   schema.Methods[*endBlockEntry, *endBlockEntry, *schema.CompositeType]
-	sentry           schema.Methods[entry, *entry, *schema.UnionType]
+	sentry           schema.UnionMethods[entry, entryType]
 	sentryType       schema.EnumMethods[entryType]
 	sfileHeader      schema.Methods[*fileHeader, *fileHeader, *schema.CompositeType]
 	srecordEntry     schema.Methods[*recordEntry, *recordEntry, *schema.CompositeType]
@@ -45,7 +45,7 @@ func init() {
 		},
 	}).SetGoType()
 
-	sentry = schema.WithMethods[entry, *entry](
+	sentry = schema.WithUnionMethods[entry, entryType](
 		&schema.UnionType{
 			TypeBase: schema.TypeBase{
 				Name: "entry",
@@ -105,7 +105,7 @@ func init() {
 				Name: "Key",
 				Type: &schema.PointerType{
 					TypeBase: schema.TypeBase{},
-					Elem:     schema.ExternalTypeReference[record.Key](),
+					Elem:     schema.TypeReferenceFor[record.Key](),
 				},
 			},
 			{
diff --git a/pkg/database/keyvalue/block/types_gen.go b/pkg/database/keyvalue/block/types_gen.go
index da563d4c1..2998b1b82 100644
--- a/pkg/database/keyvalue/block/types_gen.go
+++ b/pkg/database/keyvalue/block/types_gen.go
@@ -14,7 +14,7 @@ type blockID struct {
 }
 
 var wblockID = widget.ForComposite(widget.Fields[blockID]{
-	{Name: "iD", ID: 1, Widget: widget.ForUint(func(v *blockID) *uint64 { return &v.ID })},
+	{Name: "id", ID: 1, Widget: widget.ForUint(func(v *blockID) *uint64 { return &v.ID })},
 	{Name: "part", ID: 2, Widget: widget.ForUint(func(v *blockID) *uint64 { return &v.Part })},
 }, widget.Identity[*blockID])