diff --git a/crates/ironrdp-async/src/connector.rs b/crates/ironrdp-async/src/connector.rs
index 6b0ac79f..89d09657 100644
--- a/crates/ironrdp-async/src/connector.rs
+++ b/crates/ironrdp-async/src/connector.rs
@@ -5,9 +5,8 @@ use ironrdp_pdu::write_buf::WriteBuf;
 
 use crate::framed::{Framed, FramedRead, FramedWrite};
 
-pub struct ShouldUpgrade {
-    _priv: (),
-}
+#[non_exhaustive]
+pub struct ShouldUpgrade;
 
 #[instrument(skip_all)]
 pub async fn connect_begin<S>(framed: &mut Framed<S>, connector: &mut ClientConnector) -> ConnectorResult<ShouldUpgrade>
@@ -22,24 +21,23 @@ where
         single_connect_step(framed, connector, &mut buf).await?;
     }
 
-    Ok(ShouldUpgrade { _priv: () })
+    Ok(ShouldUpgrade)
 }
 
 pub fn skip_connect_begin(connector: &mut ClientConnector) -> ShouldUpgrade {
     assert!(connector.should_perform_security_upgrade());
-    ShouldUpgrade { _priv: () }
+    ShouldUpgrade
 }
 
-pub struct Upgraded {
-    _priv: (),
-}
+#[non_exhaustive]
+pub struct Upgraded;
 
 #[instrument(skip_all)]
 pub fn mark_as_upgraded(_: ShouldUpgrade, connector: &mut ClientConnector, server_public_key: Vec<u8>) -> Upgraded {
-    trace!("marked as upgraded");
+    trace!("Marked as upgraded");
     connector.attach_server_public_key(server_public_key);
     connector.mark_security_upgrade_as_done();
-    Upgraded { _priv: () }
+    Upgraded
 }
 
 #[instrument(skip_all)]
diff --git a/crates/ironrdp-blocking/src/connector.rs b/crates/ironrdp-blocking/src/connector.rs
index b38361b9..23ae9184 100644
--- a/crates/ironrdp-blocking/src/connector.rs
+++ b/crates/ironrdp-blocking/src/connector.rs
@@ -7,9 +7,8 @@ use ironrdp_pdu::write_buf::WriteBuf;
 
 use crate::framed::Framed;
 
-pub struct ShouldUpgrade {
-    _priv: (),
-}
+#[non_exhaustive]
+pub struct ShouldUpgrade;
 
 #[instrument(skip_all)]
 pub fn connect_begin<S>(framed: &mut Framed<S>, connector: &mut ClientConnector) -> ConnectorResult<ShouldUpgrade>
@@ -24,24 +23,23 @@ where
         single_connect_step(framed, connector, &mut buf)?;
     }
 
-    Ok(ShouldUpgrade { _priv: () })
+    Ok(ShouldUpgrade)
 }
 
 pub fn skip_connect_begin(connector: &mut ClientConnector) -> ShouldUpgrade {
     assert!(connector.should_perform_security_upgrade());
-    ShouldUpgrade { _priv: () }
+    ShouldUpgrade
 }
 
-pub struct Upgraded {
-    _priv: (),
-}
+#[non_exhaustive]
+pub struct Upgraded;
 
 #[instrument(skip_all)]
 pub fn mark_as_upgraded(_: ShouldUpgrade, connector: &mut ClientConnector, server_public_key: Vec<u8>) -> Upgraded {
-    trace!("marked as upgraded");
+    trace!("Marked as upgraded");
     connector.attach_server_public_key(server_public_key);
     connector.mark_security_upgrade_as_done();
-    Upgraded { _priv: () }
+    Upgraded
 }
 
 #[instrument(skip_all)]