diff --git a/.release-manifest.json b/.release-manifest.json
index 2f8696b..62be672 100644
--- a/.release-manifest.json
+++ b/.release-manifest.json
@@ -1,13 +1,13 @@
 {
-    "crates/rust-mcp-sdk": "0.3.3",
-    "crates/rust-mcp-macros": "0.3.0",
+    "crates/rust-mcp-sdk": "0.4.0",
+    "crates/rust-mcp-macros": "0.4.0",
     "crates/rust-mcp-transport": "0.3.2",
-    "examples/hello-world-mcp-server": "0.1.15",
-    "examples/hello-world-mcp-server-core": "0.1.6",
-    "examples/simple-mcp-client": "0.1.15",
-    "examples/simple-mcp-client-core": "0.1.15",
-    "examples/hello-world-server-core-sse": "0.1.6",
-    "examples/hello-world-server-sse": "0.1.15",
-    "examples/simple-mcp-client-core-sse": "0.1.6",
-    "examples/simple-mcp-client-sse": "0.1.6"
+    "examples/hello-world-mcp-server": "0.1.16",
+    "examples/hello-world-mcp-server-core": "0.1.7",
+    "examples/simple-mcp-client": "0.1.16",
+    "examples/simple-mcp-client-core": "0.1.16",
+    "examples/hello-world-server-core-sse": "0.1.7",
+    "examples/hello-world-server-sse": "0.1.16",
+    "examples/simple-mcp-client-core-sse": "0.1.7",
+    "examples/simple-mcp-client-sse": "0.1.7"
 }
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index 14e8f99..e9451dd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -677,7 +677,7 @@ checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3"
 
 [[package]]
 name = "hello-world-mcp-server"
-version = "0.1.15"
+version = "0.1.16"
 dependencies = [
  "async-trait",
  "futures",
@@ -691,7 +691,7 @@ dependencies = [
 
 [[package]]
 name = "hello-world-mcp-server-core"
-version = "0.1.6"
+version = "0.1.7"
 dependencies = [
  "async-trait",
  "futures",
@@ -703,7 +703,7 @@ dependencies = [
 
 [[package]]
 name = "hello-world-server-core-sse"
-version = "0.1.6"
+version = "0.1.7"
 dependencies = [
  "async-trait",
  "futures",
@@ -717,7 +717,7 @@ dependencies = [
 
 [[package]]
 name = "hello-world-server-sse"
-version = "0.1.15"
+version = "0.1.16"
 dependencies = [
  "async-trait",
  "futures",
@@ -1612,7 +1612,7 @@ dependencies = [
 
 [[package]]
 name = "rust-mcp-macros"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1634,7 +1634,7 @@ dependencies = [
 
 [[package]]
 name = "rust-mcp-sdk"
-version = "0.3.3"
+version = "0.4.0"
 dependencies = [
  "async-trait",
  "axum",
@@ -1896,7 +1896,7 @@ dependencies = [
 
 [[package]]
 name = "simple-mcp-client"
-version = "0.1.15"
+version = "0.1.16"
 dependencies = [
  "async-trait",
  "colored",
@@ -1910,7 +1910,7 @@ dependencies = [
 
 [[package]]
 name = "simple-mcp-client-core"
-version = "0.1.15"
+version = "0.1.16"
 dependencies = [
  "async-trait",
  "colored",
@@ -1924,7 +1924,7 @@ dependencies = [
 
 [[package]]
 name = "simple-mcp-client-core-sse"
-version = "0.1.6"
+version = "0.1.7"
 dependencies = [
  "async-trait",
  "colored",
@@ -1940,7 +1940,7 @@ dependencies = [
 
 [[package]]
 name = "simple-mcp-client-sse"
-version = "0.1.6"
+version = "0.1.7"
 dependencies = [
  "async-trait",
  "colored",
diff --git a/Cargo.toml b/Cargo.toml
index cc42bed..9eaa408 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,7 +18,7 @@ members = [
 # Workspace member crates
 rust-mcp-transport = { version = "0.3.2", path = "crates/rust-mcp-transport", default-features = false }
 rust-mcp-sdk = { path = "crates/rust-mcp-sdk", default-features = false }
-rust-mcp-macros = { version = "0.3.0", path = "crates/rust-mcp-macros" }
+rust-mcp-macros = { version = "0.4.0", path = "crates/rust-mcp-macros" }
 
 # External crates
 rust-mcp-schema = { version = "0.5" }
diff --git a/crates/rust-mcp-macros/CHANGELOG.md b/crates/rust-mcp-macros/CHANGELOG.md
index 45df334..04ebd34 100644
--- a/crates/rust-mcp-macros/CHANGELOG.md
+++ b/crates/rust-mcp-macros/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## [0.4.0](https://github.com/rust-mcp-stack/rust-mcp-sdk/compare/rust-mcp-macros-v0.3.0...rust-mcp-macros-v0.4.0) (2025-05-28)
+
+
+### ⚠ BREAKING CHANGES
+
+* make rust-mcp-sdk the sole dependency ([#43](https://github.com/rust-mcp-stack/rust-mcp-sdk/issues/43))
+
+### 🚀 Features
+
+* Make rust-mcp-sdk the sole dependency ([#43](https://github.com/rust-mcp-stack/rust-mcp-sdk/issues/43)) ([d1973ca](https://github.com/rust-mcp-stack/rust-mcp-sdk/commit/d1973ca037c1c6367261bb48a9a4ec89c3a448ac))
+
 ## [0.3.0](https://github.com/rust-mcp-stack/rust-mcp-sdk/compare/rust-mcp-macros-v0.2.1...rust-mcp-macros-v0.3.0) (2025-05-23)
 
 
diff --git a/crates/rust-mcp-macros/Cargo.toml b/crates/rust-mcp-macros/Cargo.toml
index 67e1246..56fea05 100644
--- a/crates/rust-mcp-macros/Cargo.toml
+++ b/crates/rust-mcp-macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rust-mcp-macros"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Ali Hashemi"]
 categories = ["data-structures", "parser-implementations", "parsing"]
 description = "A procedural macro that derives the MCPToolSchema implementation for structs or enums, generating a tool_input_schema function used with rust_mcp_schema::Tool."
diff --git a/crates/rust-mcp-sdk/CHANGELOG.md b/crates/rust-mcp-sdk/CHANGELOG.md
index caf0580..f08a098 100644
--- a/crates/rust-mcp-sdk/CHANGELOG.md
+++ b/crates/rust-mcp-sdk/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## [0.4.0](https://github.com/rust-mcp-stack/rust-mcp-sdk/compare/rust-mcp-sdk-v0.3.3...rust-mcp-sdk-v0.4.0) (2025-05-28)
+
+
+### ⚠ BREAKING CHANGES
+
+* make rust-mcp-sdk the sole dependency ([#43](https://github.com/rust-mcp-stack/rust-mcp-sdk/issues/43))
+
+### 🚀 Features
+
+* Make rust-mcp-sdk the sole dependency ([#43](https://github.com/rust-mcp-stack/rust-mcp-sdk/issues/43)) ([d1973ca](https://github.com/rust-mcp-stack/rust-mcp-sdk/commit/d1973ca037c1c6367261bb48a9a4ec89c3a448ac))
+
 ## [0.3.3](https://github.com/rust-mcp-stack/rust-mcp-sdk/compare/rust-mcp-sdk-v0.3.2...rust-mcp-sdk-v0.3.3) (2025-05-25)
 
 
diff --git a/crates/rust-mcp-sdk/Cargo.toml b/crates/rust-mcp-sdk/Cargo.toml
index 9605ebe..86bf204 100644
--- a/crates/rust-mcp-sdk/Cargo.toml
+++ b/crates/rust-mcp-sdk/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rust-mcp-sdk"
-version = "0.3.3"
+version = "0.4.0"
 authors = ["Ali Hashemi"]
 categories = ["data-structures", "parser-implementations", "parsing"]
 description = "An asynchronous SDK and framework for building MCP-Servers and MCP-Clients, leveraging the rust-mcp-schema for type safe MCP Schema Objects."
diff --git a/examples/hello-world-mcp-server-core/Cargo.toml b/examples/hello-world-mcp-server-core/Cargo.toml
index 6c36374..e94492b 100644
--- a/examples/hello-world-mcp-server-core/Cargo.toml
+++ b/examples/hello-world-mcp-server-core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hello-world-mcp-server-core"
-version = "0.1.6"
+version = "0.1.7"
 edition = "2021"
 publish = false
 license = "MIT"
diff --git a/examples/hello-world-mcp-server/Cargo.toml b/examples/hello-world-mcp-server/Cargo.toml
index 5abcf5a..f4eda12 100644
--- a/examples/hello-world-mcp-server/Cargo.toml
+++ b/examples/hello-world-mcp-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hello-world-mcp-server"
-version = "0.1.15"
+version = "0.1.16"
 edition = "2021"
 publish = false
 license = "MIT"
diff --git a/examples/hello-world-server-core-sse/Cargo.toml b/examples/hello-world-server-core-sse/Cargo.toml
index 52d10a7..ab0274d 100644
--- a/examples/hello-world-server-core-sse/Cargo.toml
+++ b/examples/hello-world-server-core-sse/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hello-world-server-core-sse"
-version = "0.1.6"
+version = "0.1.7"
 edition = "2021"
 publish = false
 license = "MIT"
diff --git a/examples/hello-world-server-sse/Cargo.toml b/examples/hello-world-server-sse/Cargo.toml
index 66f36bd..95d5e82 100644
--- a/examples/hello-world-server-sse/Cargo.toml
+++ b/examples/hello-world-server-sse/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hello-world-server-sse"
-version = "0.1.15"
+version = "0.1.16"
 edition = "2021"
 publish = false
 license = "MIT"
diff --git a/examples/simple-mcp-client-core-sse/Cargo.toml b/examples/simple-mcp-client-core-sse/Cargo.toml
index c8b5011..b516deb 100644
--- a/examples/simple-mcp-client-core-sse/Cargo.toml
+++ b/examples/simple-mcp-client-core-sse/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "simple-mcp-client-core-sse"
-version = "0.1.6"
+version = "0.1.7"
 edition = "2021"
 publish = false
 license = "MIT"
diff --git a/examples/simple-mcp-client-core/Cargo.toml b/examples/simple-mcp-client-core/Cargo.toml
index 9f074ce..63ce288 100644
--- a/examples/simple-mcp-client-core/Cargo.toml
+++ b/examples/simple-mcp-client-core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "simple-mcp-client-core"
-version = "0.1.15"
+version = "0.1.16"
 edition = "2021"
 publish = false
 license = "MIT"
diff --git a/examples/simple-mcp-client-sse/Cargo.toml b/examples/simple-mcp-client-sse/Cargo.toml
index 8eb24c0..6e4db27 100644
--- a/examples/simple-mcp-client-sse/Cargo.toml
+++ b/examples/simple-mcp-client-sse/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "simple-mcp-client-sse"
-version = "0.1.6"
+version = "0.1.7"
 edition = "2021"
 publish = false
 license = "MIT"
diff --git a/examples/simple-mcp-client/Cargo.toml b/examples/simple-mcp-client/Cargo.toml
index 05e9e77..5cc5988 100644
--- a/examples/simple-mcp-client/Cargo.toml
+++ b/examples/simple-mcp-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "simple-mcp-client"
-version = "0.1.15"
+version = "0.1.16"
 edition = "2021"
 publish = false
 license = "MIT"