diff --git a/Cargo.toml b/Cargo.toml
index ff59c39..fd05552 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -58,7 +58,7 @@ axum-lib = { version = "^0.5", optional = true , package="axum"}
 http-body = { version = "^0.4", optional = true }
 poem-lib = { version = "=1.2.34", optional = true, package = "poem" }
 nats-lib = { version = "0.21.0", optional = true, package = "nats" }
-fe2o3-amqp-types = { version = "0.3.4", optional = true }
+fe2o3-amqp-types = { version = "0.4.0", optional = true }
 
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies]
 hostname = "^0.3"
@@ -81,4 +81,4 @@ mockito = "0.25.1"
 tokio = { version = "^1.0", features = ["full"] }
 mime = "0.3"
 tower = { version = "0.4", features = ["util"] }
-fe2o3-amqp = { version = "0.4" }
+fe2o3-amqp = { version = "0.5.1" }
diff --git a/example-projects/fe2o3-amqp-example/Cargo.toml b/example-projects/fe2o3-amqp-example/Cargo.toml
index c49e1c1..ae8d8b4 100644
--- a/example-projects/fe2o3-amqp-example/Cargo.toml
+++ b/example-projects/fe2o3-amqp-example/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2021"
 
 [dependencies]
 cloudevents-sdk = { path = "../..", features = ["fe2o3-amqp"] }
-fe2o3-amqp = "0.4.0"
+fe2o3-amqp = "0.5.1"
 tokio = { version = "1", features = ["macros", "net", "rt", "rt-multi-thread"] }
 serde_json = "1"
\ No newline at end of file
diff --git a/example-projects/fe2o3-amqp-example/src/main.rs b/example-projects/fe2o3-amqp-example/src/main.rs
index 498673d..5ee6f50 100644
--- a/example-projects/fe2o3-amqp-example/src/main.rs
+++ b/example-projects/fe2o3-amqp-example/src/main.rs
@@ -4,7 +4,7 @@
 //! With docker: docker run -it --rm -e ARTEMIS_USERNAME=guest -e ARTEMIS_PASSWORD=guest -p 5672:5672 vromero/activemq-artemis
 
 use cloudevents::{
-    binding::fe2o3_amqp::{EventMessage, AmqpMessage}, message::MessageDeserializer, Event, EventBuilder,
+    binding::fe2o3_amqp::{EventMessage}, message::MessageDeserializer, Event, EventBuilder,
     EventBuilderV10, AttributesReader, event::ExtensionValue,
 };
 use fe2o3_amqp::{Connection, Receiver, Sender, Session};
@@ -27,8 +27,7 @@ async fn send_binary_event(sender: &mut Sender, i: usize, value: serde_json::Val
         .data("application/json", value)
         .build()?;
     let event_message = EventMessage::from_binary_event(event)?;
-    let message = AmqpMessage::from(event_message);
-    sender.send(message).await?.accepted_or("not accepted")?;
+    sender.send(event_message).await?.accepted_or("not accepted")?;
     Ok(())
 }
 
@@ -41,8 +40,7 @@ async fn send_structured_event(sender: &mut Sender, i: usize, value: serde_json:
         .data("application/json", value)
         .build()?;
     let event_message = EventMessage::from_structured_event(event)?;
-    let message = AmqpMessage::from(event_message);
-    sender.send(message).await?.accepted_or("not accepted")?;
+    sender.send(event_message).await?.accepted_or("not accepted")?;
     Ok(())
 }
 
diff --git a/src/binding/fe2o3_amqp/deserializer.rs b/src/binding/fe2o3_amqp/deserializer.rs
index 9c0c5f3..3590e56 100644
--- a/src/binding/fe2o3_amqp/deserializer.rs
+++ b/src/binding/fe2o3_amqp/deserializer.rs
@@ -68,7 +68,7 @@ impl BinaryDeserializer for EventMessage {
                 let bytes = data.0.into_vec();
                 serializer.end_with_data(bytes)
             }
-            Body::Nothing => serializer.end(),
+            Body::Empty => serializer.end(),
             Body::Sequence(_) | Body::Value(_) => Err(Error::WrongEncoding {}),
         }
     }
@@ -82,7 +82,7 @@ impl StructuredDeserializer for EventMessage {
         use fe2o3_amqp_types::messaging::Body;
         let bytes = match self.body {
             Body::Data(data) => data.0.into_vec(),
-            Body::Nothing => vec![],
+            Body::Empty => vec![],
             Body::Sequence(_) | Body::Value(_) => return Err(Error::WrongEncoding {}),
         };
         serializer.set_structured_event(bytes)
diff --git a/src/binding/fe2o3_amqp/mod.rs b/src/binding/fe2o3_amqp/mod.rs
index e326820..c696b06 100644
--- a/src/binding/fe2o3_amqp/mod.rs
+++ b/src/binding/fe2o3_amqp/mod.rs
@@ -181,7 +181,7 @@ impl EventMessage {
         Self {
             content_type: None,
             application_properties: None,
-            body: Body::Nothing,
+            body: Body::Empty,
         }
     }