diff --git a/crates/teepot-vault/src/client/mod.rs b/crates/teepot-vault/src/client/mod.rs
index 97625d7..85fa871 100644
--- a/crates/teepot-vault/src/client/mod.rs
+++ b/crates/teepot-vault/src/client/mod.rs
@@ -31,7 +31,7 @@ pub use teepot::quote::{
     tcblevel::{parse_tcb_levels, EnumSet, TcbLevel},
     verify_quote_with_collateral, QuoteVerificationResult,
 };
-use teepot::{quote::Report, sgx::Quote};
+use teepot::quote::{Quote, Report};
 use tracing::{debug, error, info, trace, warn};
 use x509_cert::{
     der::{Decode as _, Encode as _},
@@ -174,17 +174,17 @@ impl TeeConnection {
                     debug!("Failed to get collateral in certificate");
                 }
 
-                let quote = Quote::try_from_bytes(quote_bytes).map_err(|e| {
+                let quote = Quote::parse(quote_bytes).map_err(|e| {
                     Error::General(format!("Failed get quote in certificate {e:?}"))
                 })?;
 
-                if &quote.report_body.reportdata[..32] != hash.as_slice() {
+                if &quote.get_report_data()[..32] != hash.as_slice() {
                     error!("Report data mismatch");
                     return Err(Error::General("Report data mismatch".to_string()));
                 } else {
                     info!(
                         "Report data matches `{}`",
-                        hex::encode(&quote.report_body.reportdata[..32])
+                        hex::encode(&quote.get_report_data()[..32])
                     );
                 }
 
diff --git a/crates/teepot/src/sgx/mod.rs b/crates/teepot/src/sgx/mod.rs
index 8a9f85d..2b66c78 100644
--- a/crates/teepot/src/sgx/mod.rs
+++ b/crates/teepot/src/sgx/mod.rs
@@ -9,86 +9,11 @@ pub mod sign;
 
 use crate::quote::error::QuoteContext;
 pub use crate::quote::{error::QuoteError, Collateral};
-use bytemuck::{try_from_bytes, AnyBitPattern, PodCastError};
 use std::{
     fs::OpenOptions,
     io::{Read, Write},
-    mem,
 };
 
-/// Structure of a quote
-#[derive(Copy, Clone, Debug, AnyBitPattern)]
-#[repr(C)]
-pub struct Quote {
-    version: [u8; 2],
-    key_type: [u8; 2],
-    reserved: [u8; 4],
-    qe_svn: [u8; 2],
-    pce_svn: [u8; 2],
-    qe_vendor_id: [u8; 16],
-    /// The user data that was passed, when creating the enclave
-    pub user_data: [u8; 20],
-    /// The report body
-    pub report_body: ReportBody,
-}
-
-impl Quote {
-    /// Creates a quote from a byte slice
-    pub fn try_from_bytes(bytes: &[u8]) -> Result<&Self, QuoteError> {
-        if bytes.len() < mem::size_of::<Self>() {
-            return Err(PodCastError::SizeMismatch.into());
-        }
-        let this: &Self = try_from_bytes(&bytes[..mem::size_of::<Self>()])?;
-        if this.version() != 3 {
-            return Err(QuoteError::InvalidVersion);
-        }
-        Ok(this)
-    }
-
-    /// Version of the `Quote` structure
-    pub fn version(&self) -> u16 {
-        u16::from_le_bytes(self.version)
-    }
-}
-
-/// The enclave report body.
-///
-/// For more information see the following documents:
-///
-/// [Intel® Software Guard Extensions (Intel® SGX) Data Center Attestation Primitives: ECDSA Quote Library API](https://download.01.org/intel-sgx/dcap-1.0/docs/SGX_ECDSA_QuoteGenReference_DCAP_API_Linux_1.0.pdf)
-///
-/// Table 5, A.4. Quote Format
-///
-/// [Intel® 64 and IA-32 Architectures Software Developer's Manual Volume 3 (3A, 3B, 3C & 3D): System Programming Guide](https://www.intel.com/content/www/us/en/architecture-and-technology/64-ia-32-architectures-software-developer-vol-3d-part-4-manual.html)
-///
-/// Table 38-21. Layout of REPORT
-#[derive(Copy, Clone, Debug, AnyBitPattern)]
-#[repr(C)]
-pub struct ReportBody {
-    /// The security version number of the enclave.
-    pub cpusvn: [u8; 16],
-    /// The Misc section of the StateSaveArea of the enclave
-    pub miscselect: [u8; 4],
-    reserved1: [u8; 28],
-    /// The allowed Features of the enclave.
-    pub features: [u8; 8],
-    /// The allowed XCr0Flags of the enclave.
-    pub xfrm: [u8; 8],
-    /// The measurement of the enclave
-    pub mrenclave: [u8; 32],
-    reserved2: [u8; 32],
-    /// The hash of the public key, that signed the enclave
-    pub mrsigner: [u8; 32],
-    reserved3: [u8; 96],
-    /// ISV assigned Product ID of the enclave.
-    pub isv_prodid: [u8; 2],
-    /// ISV assigned SVN (security version number) of the enclave.
-    pub isv_svn: [u8; 2],
-    reserved4: [u8; 60],
-    /// The enclave report data, injected when requesting the quote, that is used for attestation.
-    pub reportdata: [u8; 64],
-}
-
 /// Get the attestation report in a Gramine enclave
 pub fn sgx_gramine_get_quote(report_data: &[u8; 64]) -> Result<Box<[u8]>, QuoteError> {
     let mut file = OpenOptions::new()