diff --git a/src/generated_schema/2024_11_05/mcp_schema.rs b/src/generated_schema/2024_11_05/mcp_schema.rs
index 3aa9051..2a06279 100644
--- a/src/generated_schema/2024_11_05/mcp_schema.rs
+++ b/src/generated_schema/2024_11_05/mcp_schema.rs
@@ -1,12 +1,12 @@
 /// ----------------------------------------------------------------------------
-/// This file is auto-generated by mcp-schema-gen v0.1.4.
+/// This file is auto-generated by mcp-schema-gen v0.1.5.
 /// WARNING:
 /// It is not recommended to modify this file directly. You are free to
 /// modify or extend the implementations as needed, but please do so at your own risk.
 ///
 /// Generated from : <https://github.com/modelcontextprotocol/specification.git>
 /// Hash : bb1446ff1810a0df57989d78366d626d2c01b9d7
-/// Generated at : 2025-02-19 06:30:55
+/// Generated at : 2025-02-19 17:00:34
 /// ----------------------------------------------------------------------------
 ///
 /// MCP Protocol Version
diff --git a/src/generated_schema/2024_11_05/schema_utils.rs b/src/generated_schema/2024_11_05/schema_utils.rs
index e455b27..3799aed 100644
--- a/src/generated_schema/2024_11_05/schema_utils.rs
+++ b/src/generated_schema/2024_11_05/schema_utils.rs
@@ -58,17 +58,17 @@ fn detect_message_type(value: &serde_json::Value) -> MessageTypes {
 
 /// Represents a generic MCP (Model Content Protocol) message.
 /// This trait defines methods to classify and extract information from messages.
-pub trait RPCMessage {
+pub trait RPCMessage: MCPMessage {
     fn request_id(&self) -> Option<&RequestId>;
     fn jsonrpc(&self) -> &str;
 }
 
-pub trait MCPMessage: RPCMessage {
-    fn message_type(&self) -> MessageTypes;
+pub trait MCPMessage {
     fn is_response(&self) -> bool;
     fn is_request(&self) -> bool;
     fn is_notification(&self) -> bool;
     fn is_error(&self) -> bool;
+    fn message_type(&self) -> MessageTypes;
 }
 
 //*******************************//
diff --git a/src/generated_schema/draft/mcp_schema.rs b/src/generated_schema/draft/mcp_schema.rs
index db309ec..e9c70cd 100644
--- a/src/generated_schema/draft/mcp_schema.rs
+++ b/src/generated_schema/draft/mcp_schema.rs
@@ -1,12 +1,12 @@
 /// ----------------------------------------------------------------------------
-/// This file is auto-generated by mcp-schema-gen v0.1.4.
+/// This file is auto-generated by mcp-schema-gen v0.1.5.
 /// WARNING:
 /// It is not recommended to modify this file directly. You are free to
 /// modify or extend the implementations as needed, but please do so at your own risk.
 ///
 /// Generated from : <https://github.com/modelcontextprotocol/specification.git>
 /// Hash : bb1446ff1810a0df57989d78366d626d2c01b9d7
-/// Generated at : 2025-02-19 06:30:55
+/// Generated at : 2025-02-19 17:00:35
 /// ----------------------------------------------------------------------------
 ///
 /// MCP Protocol Version
diff --git a/src/generated_schema/draft/schema_utils.rs b/src/generated_schema/draft/schema_utils.rs
index 85ae235..96ef2e1 100644
--- a/src/generated_schema/draft/schema_utils.rs
+++ b/src/generated_schema/draft/schema_utils.rs
@@ -58,17 +58,17 @@ fn detect_message_type(value: &serde_json::Value) -> MessageTypes {
 
 /// Represents a generic MCP (Model Content Protocol) message.
 /// This trait defines methods to classify and extract information from messages.
-pub trait RPCMessage {
+pub trait RPCMessage: MCPMessage {
     fn request_id(&self) -> Option<&RequestId>;
-    fn jsonrpc_version(&self) -> &str;
+    fn jsonrpc(&self) -> &str;
 }
 
-pub trait MCPMessage: RPCMessage {
-    fn message_type(&self) -> MessageTypes;
+pub trait MCPMessage {
     fn is_response(&self) -> bool;
     fn is_request(&self) -> bool;
     fn is_notification(&self) -> bool;
     fn is_error(&self) -> bool;
+    fn message_type(&self) -> MessageTypes;
 }
 
 //*******************************//
@@ -134,11 +134,11 @@ impl RPCMessage for ClientMessage {
         }
     }
 
-    fn jsonrpc_version(&self) -> &str {
+    fn jsonrpc(&self) -> &str {
         match self {
-            ClientMessage::Request(client_jsonrpc_request) => client_jsonrpc_request.jsonrpc.as_str(),
-            ClientMessage::Notification(notification) => notification.jsonrpc.as_str(),
-            ClientMessage::Response(client_jsonrpc_response) => client_jsonrpc_response.jsonrpc.as_str(),
+            ClientMessage::Request(client_jsonrpc_request) => client_jsonrpc_request.jsonrpc(),
+            ClientMessage::Notification(notification) => notification.jsonrpc(),
+            ClientMessage::Response(client_jsonrpc_response) => client_jsonrpc_response.jsonrpc(),
             ClientMessage::Error(jsonrpc_error) => jsonrpc_error.jsonrpc(),
         }
     }
@@ -534,14 +534,14 @@ impl RPCMessage for ServerMessage {
         }
     }
 
-    fn jsonrpc_version(&self) -> &str {
+    fn jsonrpc(&self) -> &str {
         match self {
             // If the message is a request, return the associated request ID
-            ServerMessage::Request(client_jsonrpc_request) => client_jsonrpc_request.jsonrpc.as_str(),
+            ServerMessage::Request(client_jsonrpc_request) => client_jsonrpc_request.jsonrpc(),
             // Notifications do not have request IDs
-            ServerMessage::Notification(notification) => notification.jsonrpc.as_str(),
+            ServerMessage::Notification(notification) => notification.jsonrpc(),
             // If the message is a response, return the associated request ID
-            ServerMessage::Response(client_jsonrpc_response) => client_jsonrpc_response.jsonrpc.as_str(),
+            ServerMessage::Response(client_jsonrpc_response) => client_jsonrpc_response.jsonrpc(),
             // If the message is an error, return the associated request ID
             ServerMessage::Error(jsonrpc_error) => jsonrpc_error.jsonrpc(),
         }