diff --git a/plugins/maxim/go.mod b/plugins/maxim/go.mod
index e73681f26d..b6b262554e 100644
--- a/plugins/maxim/go.mod
+++ b/plugins/maxim/go.mod
@@ -3,7 +3,7 @@ module github.com/maximhq/bifrost/plugins/maxim
 go 1.24.1
 
 require (
-	github.com/maximhq/bifrost/core v1.1.5
+	github.com/maximhq/bifrost/core v1.1.8
 	github.com/maximhq/maxim-go v0.1.3
 )
 
diff --git a/plugins/maxim/go.sum b/plugins/maxim/go.sum
index 6416dc69b6..b380e7154c 100644
--- a/plugins/maxim/go.sum
+++ b/plugins/maxim/go.sum
@@ -46,8 +46,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mark3labs/mcp-go v0.32.0 h1:fgwmbfL2gbd67obg57OfV2Dnrhs1HtSdlY/i5fn7MU8=
 github.com/mark3labs/mcp-go v0.32.0/go.mod h1:rXqOudj/djTORU/ThxYx8fqEVj/5pvTuuebQ2RC7uk4=
-github.com/maximhq/bifrost/core v1.1.5 h1:Nm9XlS9Nso+pn+U5/btsJD8qRDYGQ1BBOjgqWT3PYSc=
-github.com/maximhq/bifrost/core v1.1.5/go.mod h1:yMRCncTgKYBIrECSRVxMbY3BL8CjLbipJlc644jryxc=
+github.com/maximhq/bifrost/core v1.1.8 h1:nFuK85OkYSnjZBYB7E+taf01tqtgCkq4udpQPB8l0GI=
+github.com/maximhq/bifrost/core v1.1.8/go.mod h1:yMRCncTgKYBIrECSRVxMbY3BL8CjLbipJlc644jryxc=
 github.com/maximhq/maxim-go v0.1.3 h1:nVzdz3hEjZVxmWHARWIM+Yrn1Jp50qrsK4BA/sz2jj8=
 github.com/maximhq/maxim-go v0.1.3/go.mod h1:0+UTWM7UZwNNE5VnljLtr/vpRGtYP8r/2q9WDwlLWFw=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
diff --git a/plugins/mocker/go.mod b/plugins/mocker/go.mod
index 017c189dd5..0bab6c0a8d 100644
--- a/plugins/mocker/go.mod
+++ b/plugins/mocker/go.mod
@@ -4,7 +4,7 @@ go 1.24.1
 
 require (
 	github.com/jaswdr/faker/v2 v2.5.0
-	github.com/maximhq/bifrost/core v1.1.5
+	github.com/maximhq/bifrost/core v1.1.8
 )
 
 require (
diff --git a/plugins/mocker/go.sum b/plugins/mocker/go.sum
index 73629fd310..3c1f1a22c5 100644
--- a/plugins/mocker/go.sum
+++ b/plugins/mocker/go.sum
@@ -48,8 +48,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mark3labs/mcp-go v0.32.0 h1:fgwmbfL2gbd67obg57OfV2Dnrhs1HtSdlY/i5fn7MU8=
 github.com/mark3labs/mcp-go v0.32.0/go.mod h1:rXqOudj/djTORU/ThxYx8fqEVj/5pvTuuebQ2RC7uk4=
-github.com/maximhq/bifrost/core v1.1.5 h1:Nm9XlS9Nso+pn+U5/btsJD8qRDYGQ1BBOjgqWT3PYSc=
-github.com/maximhq/bifrost/core v1.1.5/go.mod h1:yMRCncTgKYBIrECSRVxMbY3BL8CjLbipJlc644jryxc=
+github.com/maximhq/bifrost/core v1.1.8 h1:nFuK85OkYSnjZBYB7E+taf01tqtgCkq4udpQPB8l0GI=
+github.com/maximhq/bifrost/core v1.1.8/go.mod h1:yMRCncTgKYBIrECSRVxMbY3BL8CjLbipJlc644jryxc=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
diff --git a/plugins/mocker/main.go b/plugins/mocker/main.go
index 1b32ff09a1..cad0189408 100644
--- a/plugins/mocker/main.go
+++ b/plugins/mocker/main.go
@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"github.com/jaswdr/faker/v2"
+	bifrost "github.com/maximhq/bifrost/core"
 	"github.com/maximhq/bifrost/core/schemas"
 )
 
@@ -734,14 +735,16 @@ func (p *MockerPlugin) generateSuccessShortCircuit(req *schemas.BifrostRequest,
 	// Create mock response with proper structure
 	mockResponse := &schemas.BifrostResponse{
 		Model: req.Model,
-		Usage: usage,
+		Usage: &usage,
 		Choices: []schemas.BifrostResponseChoice{
 			{
 				Index: 0,
-				Message: schemas.BifrostMessage{
-					Role: schemas.ModelChatMessageRoleAssistant,
-					Content: schemas.MessageContent{
-						ContentStr: &message,
+				BifrostNonStreamResponseChoice: &schemas.BifrostNonStreamResponseChoice{
+					Message: schemas.BifrostMessage{
+						Role: schemas.ModelChatMessageRoleAssistant,
+						Content: schemas.MessageContent{
+							ContentStr: &message,
+						},
 					},
 				},
 				FinishReason: finishReason,
@@ -891,7 +894,7 @@ func (p *MockerPlugin) handleDefaultBehavior(req *schemas.BifrostRequest) (*sche
 		return req, &schemas.PluginShortCircuit{
 			Response: &schemas.BifrostResponse{
 				Model: req.Model,
-				Usage: schemas.LLMUsage{
+				Usage: &schemas.LLMUsage{
 					PromptTokens:     5,
 					CompletionTokens: 10,
 					TotalTokens:      15,
@@ -899,10 +902,12 @@ func (p *MockerPlugin) handleDefaultBehavior(req *schemas.BifrostRequest) (*sche
 				Choices: []schemas.BifrostResponseChoice{
 					{
 						Index: 0,
-						Message: schemas.BifrostMessage{
-							Role: schemas.ModelChatMessageRoleAssistant,
-							Content: schemas.MessageContent{
-								ContentStr: func() *string { s := "Mock plugin default response"; return &s }(),
+						BifrostNonStreamResponseChoice: &schemas.BifrostNonStreamResponseChoice{
+							Message: schemas.BifrostMessage{
+								Role: schemas.ModelChatMessageRoleAssistant,
+								Content: schemas.MessageContent{
+									ContentStr: bifrost.Ptr("Mock plugin default response"),
+								},
 							},
 						},
 						FinishReason: &finishReason,
diff --git a/tests/core-providers/go.mod b/tests/core-providers/go.mod
index 3931f907c9..bfb845fb66 100644
--- a/tests/core-providers/go.mod
+++ b/tests/core-providers/go.mod
@@ -3,7 +3,7 @@ module github.com/maximhq/bifrost/tests/core-providers
 go 1.24.1
 
 require (
-	github.com/maximhq/bifrost/core v1.1.5
+	github.com/maximhq/bifrost/core v1.1.8
 	github.com/stretchr/testify v1.10.0
 )
 
@@ -38,5 +38,3 @@ require (
 	golang.org/x/text v0.24.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
-
-replace github.com/maximhq/bifrost/core => ../../core
diff --git a/tests/core-providers/go.sum b/tests/core-providers/go.sum
index baed34d884..73d709cdd9 100644
--- a/tests/core-providers/go.sum
+++ b/tests/core-providers/go.sum
@@ -46,8 +46,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/mark3labs/mcp-go v0.32.0 h1:fgwmbfL2gbd67obg57OfV2Dnrhs1HtSdlY/i5fn7MU8=
 github.com/mark3labs/mcp-go v0.32.0/go.mod h1:rXqOudj/djTORU/ThxYx8fqEVj/5pvTuuebQ2RC7uk4=
-github.com/maximhq/bifrost/core v1.1.5 h1:Nm9XlS9Nso+pn+U5/btsJD8qRDYGQ1BBOjgqWT3PYSc=
-github.com/maximhq/bifrost/core v1.1.5/go.mod h1:yMRCncTgKYBIrECSRVxMbY3BL8CjLbipJlc644jryxc=
+github.com/maximhq/bifrost/core v1.1.8 h1:nFuK85OkYSnjZBYB7E+taf01tqtgCkq4udpQPB8l0GI=
+github.com/maximhq/bifrost/core v1.1.8/go.mod h1:yMRCncTgKYBIrECSRVxMbY3BL8CjLbipJlc644jryxc=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
diff --git a/transports/go.mod b/transports/go.mod
index ef264a5518..102c6e5f04 100644
--- a/transports/go.mod
+++ b/transports/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/fasthttp/websocket v1.5.12
 	github.com/google/uuid v1.6.0
 	github.com/mattn/go-sqlite3 v1.14.28
-	github.com/maximhq/bifrost/core v1.1.7
+	github.com/maximhq/bifrost/core v1.1.8
 	github.com/maximhq/bifrost/plugins/maxim v1.0.6
 	github.com/prometheus/client_golang v1.22.0
 	github.com/valyala/fasthttp v1.62.0
diff --git a/transports/go.sum b/transports/go.sum
index 18707deaaf..9d5ad4d882 100644
--- a/transports/go.sum
+++ b/transports/go.sum
@@ -79,6 +79,8 @@ github.com/mark3labs/mcp-go v0.32.0 h1:fgwmbfL2gbd67obg57OfV2Dnrhs1HtSdlY/i5fn7M
 github.com/mark3labs/mcp-go v0.32.0/go.mod h1:rXqOudj/djTORU/ThxYx8fqEVj/5pvTuuebQ2RC7uk4=
 github.com/mattn/go-sqlite3 v1.14.28 h1:ThEiQrnbtumT+QMknw63Befp/ce/nUPgBPMlRFEum7A=
 github.com/mattn/go-sqlite3 v1.14.28/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
+github.com/maximhq/bifrost/core v1.1.8 h1:nFuK85OkYSnjZBYB7E+taf01tqtgCkq4udpQPB8l0GI=
+github.com/maximhq/bifrost/core v1.1.8/go.mod h1:yMRCncTgKYBIrECSRVxMbY3BL8CjLbipJlc644jryxc=
 github.com/maximhq/bifrost/plugins/maxim v1.0.6 h1:m1tWjbmxW9Lz4mDhXclQhZdFt/TrRPbZwFcoWY9ZAEk=
 github.com/maximhq/bifrost/plugins/maxim v1.0.6/go.mod h1:+D/E498VB4JNTEzG4fYyFJf9WQaq/9FgYrmzl49mLNc=
 github.com/maximhq/maxim-go v0.1.3 h1:nVzdz3hEjZVxmWHARWIM+Yrn1Jp50qrsK4BA/sz2jj8=