diff --git a/cmd/gnmi-telemetry/telemetry.go b/cmd/gnmi-telemetry/telemetry.go
index a749593fa97ec83cf245d8825b4e9811e9ca0b49..b89717f91a560005430781338d57c886826172e2 100644
--- a/cmd/gnmi-telemetry/telemetry.go
+++ b/cmd/gnmi-telemetry/telemetry.go
@@ -22,7 +22,8 @@ func main() {
 		RespChan: make(chan *gpb.SubscribeResponse),
 	}
 	device := nucleus.Device{
-		SBI: sbi,
+		GoStruct: sbi.Schema().Root,
+		SBI:      sbi,
 		Config: nucleus.DeviceConfig{
 			Uuid:     uuid.New(),
 			Address:  "localhost:9339",
diff --git a/cmd/gnmi/gnmi.go b/cmd/gnmi/gnmi.go
index d2be72c93fa8f7d98a0da753d9601d0d6ecf0418..29136c2493a64379c0c7df291a6a433eaa49a600 100644
--- a/cmd/gnmi/gnmi.go
+++ b/cmd/gnmi/gnmi.go
@@ -17,7 +17,8 @@ func main() {
 	log.SetLevel(log.DebugLevel)
 	sbi := &nucleus.AristaOC{}
 	device := &nucleus.Device{
-		SBI: sbi,
+		GoStruct: sbi.Schema().Root,
+		SBI:      sbi,
 		Config: nucleus.DeviceConfig{
 			Uuid: uuid.New(),
 		},