diff --git a/progenitor-impl/tests/output/buildomat-builder-tagged.out b/progenitor-impl/tests/output/buildomat-builder-tagged.out
index fe9815cf..c8804fad 100644
--- a/progenitor-impl/tests/output/buildomat-builder-tagged.out
+++ b/progenitor-impl/tests/output/buildomat-builder-tagged.out
@@ -1,6 +1,8 @@
 #[allow(unused_imports)]
 use progenitor_client::{encode_path, RequestBuilderExt};
-pub use progenitor_client::{ByteStream, Error, ResponseValue};
+pub use progenitor_client::{
+    generate_websocket_key, ByteStream, Error, ResponseValue, WebsocketReactants,
+};
 pub mod types {
     use serde::{Deserialize, Serialize};
     #[allow(unused_imports)]
@@ -1500,7 +1502,12 @@ impl Client {
 pub mod builder {
     use super::types;
     #[allow(unused_imports)]
-    use super::{encode_path, ByteStream, Error, RequestBuilderExt, ResponseValue};
+    use super::{
+        encode_path, generate_websocket_key, ByteStream, Error, RequestBuilderExt, ResponseValue,
+        WebsocketReactants,
+    };
+    #[allow(unused_imports)]
+    use std::convert::TryInto;
     ///Builder for [`Client::control_hold`]
     ///
     ///[`Client::control_hold`]: super::Client::control_hold
diff --git a/progenitor-impl/tests/output/buildomat-builder.out b/progenitor-impl/tests/output/buildomat-builder.out
index e1d4c58a..a926f1d3 100644
--- a/progenitor-impl/tests/output/buildomat-builder.out
+++ b/progenitor-impl/tests/output/buildomat-builder.out
@@ -1,6 +1,8 @@
 #[allow(unused_imports)]
 use progenitor_client::{encode_path, RequestBuilderExt};
-pub use progenitor_client::{ByteStream, Error, ResponseValue};
+pub use progenitor_client::{
+    generate_websocket_key, ByteStream, Error, ResponseValue, WebsocketReactants,
+};
 pub mod types {
     use serde::{Deserialize, Serialize};
     #[allow(unused_imports)]
@@ -1500,7 +1502,10 @@ impl Client {
 pub mod builder {
     use super::types;
     #[allow(unused_imports)]
-    use super::{encode_path, ByteStream, Error, RequestBuilderExt, ResponseValue};
+    use super::{
+        encode_path, generate_websocket_key, ByteStream, Error, RequestBuilderExt, ResponseValue,
+        WebsocketReactants,
+    };
     #[allow(unused_imports)]
     use std::convert::TryInto;
     ///Builder for [`Client::control_hold`]
diff --git a/progenitor-impl/tests/output/buildomat-positional.out b/progenitor-impl/tests/output/buildomat-positional.out
index 6a039bb2..87567a85 100644
--- a/progenitor-impl/tests/output/buildomat-positional.out
+++ b/progenitor-impl/tests/output/buildomat-positional.out
@@ -1,6 +1,8 @@
 #[allow(unused_imports)]
 use progenitor_client::{encode_path, RequestBuilderExt};
-pub use progenitor_client::{ByteStream, Error, ResponseValue};
+pub use progenitor_client::{
+    generate_websocket_key, ByteStream, Error, ResponseValue, WebsocketReactants,
+};
 pub mod types {
     use serde::{Deserialize, Serialize};
     #[allow(unused_imports)]
diff --git a/progenitor-impl/tests/output/keeper-builder-tagged.out b/progenitor-impl/tests/output/keeper-builder-tagged.out
index 00f1772b..73139c7b 100644
--- a/progenitor-impl/tests/output/keeper-builder-tagged.out
+++ b/progenitor-impl/tests/output/keeper-builder-tagged.out
@@ -1,6 +1,8 @@
 #[allow(unused_imports)]
 use progenitor_client::{encode_path, RequestBuilderExt};
-pub use progenitor_client::{ByteStream, Error, ResponseValue};
+pub use progenitor_client::{
+    generate_websocket_key, ByteStream, Error, ResponseValue, WebsocketReactants,
+};
 pub mod types {
     use serde::{Deserialize, Serialize};
     #[allow(unused_imports)]
@@ -829,7 +831,12 @@ impl Client {
 pub mod builder {
     use super::types;
     #[allow(unused_imports)]
-    use super::{encode_path, ByteStream, Error, RequestBuilderExt, ResponseValue};
+    use super::{
+        encode_path, generate_websocket_key, ByteStream, Error, RequestBuilderExt, ResponseValue,
+        WebsocketReactants,
+    };
+    #[allow(unused_imports)]
+    use std::convert::TryInto;
     ///Builder for [`Client::enrol`]
     ///
     ///[`Client::enrol`]: super::Client::enrol
diff --git a/progenitor-impl/tests/output/keeper-builder.out b/progenitor-impl/tests/output/keeper-builder.out
index bb334b2c..9e5e682b 100644
--- a/progenitor-impl/tests/output/keeper-builder.out
+++ b/progenitor-impl/tests/output/keeper-builder.out
@@ -1,6 +1,8 @@
 #[allow(unused_imports)]
 use progenitor_client::{encode_path, RequestBuilderExt};
-pub use progenitor_client::{ByteStream, Error, ResponseValue};
+pub use progenitor_client::{
+    generate_websocket_key, ByteStream, Error, ResponseValue, WebsocketReactants,
+};
 pub mod types {
     use serde::{Deserialize, Serialize};
     #[allow(unused_imports)]
@@ -829,7 +831,10 @@ impl Client {
 pub mod builder {
     use super::types;
     #[allow(unused_imports)]
-    use super::{encode_path, ByteStream, Error, RequestBuilderExt, ResponseValue};
+    use super::{
+        encode_path, generate_websocket_key, ByteStream, Error, RequestBuilderExt, ResponseValue,
+        WebsocketReactants,
+    };
     #[allow(unused_imports)]
     use std::convert::TryInto;
     ///Builder for [`Client::enrol`]
diff --git a/progenitor-impl/tests/output/keeper-positional.out b/progenitor-impl/tests/output/keeper-positional.out
index 6a3bf9c8..4b4d6611 100644
--- a/progenitor-impl/tests/output/keeper-positional.out
+++ b/progenitor-impl/tests/output/keeper-positional.out
@@ -1,6 +1,8 @@
 #[allow(unused_imports)]
 use progenitor_client::{encode_path, RequestBuilderExt};
-pub use progenitor_client::{ByteStream, Error, ResponseValue};
+pub use progenitor_client::{
+    generate_websocket_key, ByteStream, Error, ResponseValue, WebsocketReactants,
+};
 pub mod types {
     use serde::{Deserialize, Serialize};
     #[allow(unused_imports)]
diff --git a/progenitor-impl/tests/output/nexus-builder-tagged.out b/progenitor-impl/tests/output/nexus-builder-tagged.out
index 4c1f9f1b..ee928fe7 100644
--- a/progenitor-impl/tests/output/nexus-builder-tagged.out
+++ b/progenitor-impl/tests/output/nexus-builder-tagged.out
@@ -1,6 +1,8 @@
 #[allow(unused_imports)]
 use progenitor_client::{encode_path, RequestBuilderExt};
-pub use progenitor_client::{ByteStream, Error, ResponseValue};
+pub use progenitor_client::{
+    generate_websocket_key, ByteStream, Error, ResponseValue, WebsocketReactants,
+};
 pub mod types {
     use serde::{Deserialize, Serialize};
     #[allow(unused_imports)]
@@ -13617,7 +13619,12 @@ impl ClientVpcsExt for Client {
 pub mod builder {
     use super::types;
     #[allow(unused_imports)]
-    use super::{encode_path, ByteStream, Error, RequestBuilderExt, ResponseValue};
+    use super::{
+        encode_path, generate_websocket_key, ByteStream, Error, RequestBuilderExt, ResponseValue,
+        WebsocketReactants,
+    };
+    #[allow(unused_imports)]
+    use std::convert::TryInto;
     ///Builder for [`ClientDisksExt::disk_view_by_id`]
     ///
     ///[`ClientDisksExt::disk_view_by_id`]: super::ClientDisksExt::disk_view_by_id
diff --git a/progenitor-impl/tests/output/nexus-builder.out b/progenitor-impl/tests/output/nexus-builder.out
index 46857e82..6ec722f3 100644
--- a/progenitor-impl/tests/output/nexus-builder.out
+++ b/progenitor-impl/tests/output/nexus-builder.out
@@ -1,6 +1,8 @@
 #[allow(unused_imports)]
 use progenitor_client::{encode_path, RequestBuilderExt};
-pub use progenitor_client::{ByteStream, Error, ResponseValue};
+pub use progenitor_client::{
+    generate_websocket_key, ByteStream, Error, ResponseValue, WebsocketReactants,
+};
 pub mod types {
     use serde::{Deserialize, Serialize};
     #[allow(unused_imports)]
@@ -13437,7 +13439,10 @@ impl Client {
 pub mod builder {
     use super::types;
     #[allow(unused_imports)]
-    use super::{encode_path, ByteStream, Error, RequestBuilderExt, ResponseValue};
+    use super::{
+        encode_path, generate_websocket_key, ByteStream, Error, RequestBuilderExt, ResponseValue,
+        WebsocketReactants,
+    };
     #[allow(unused_imports)]
     use std::convert::TryInto;
     ///Builder for [`Client::disk_view_by_id`]
diff --git a/progenitor-impl/tests/output/nexus-positional.out b/progenitor-impl/tests/output/nexus-positional.out
index 916cfb75..d8e14e97 100644
--- a/progenitor-impl/tests/output/nexus-positional.out
+++ b/progenitor-impl/tests/output/nexus-positional.out
@@ -1,6 +1,8 @@
 #[allow(unused_imports)]
 use progenitor_client::{encode_path, RequestBuilderExt};
-pub use progenitor_client::{ByteStream, Error, ResponseValue};
+pub use progenitor_client::{
+    generate_websocket_key, ByteStream, Error, ResponseValue, WebsocketReactants,
+};
 pub mod types {
     use serde::{Deserialize, Serialize};
     #[allow(unused_imports)]
diff --git a/progenitor-impl/tests/output/test_default_params_builder.out b/progenitor-impl/tests/output/test_default_params_builder.out
index cc576a97..12e16acd 100644
--- a/progenitor-impl/tests/output/test_default_params_builder.out
+++ b/progenitor-impl/tests/output/test_default_params_builder.out
@@ -1,6 +1,8 @@
 #[allow(unused_imports)]
 use progenitor_client::{encode_path, RequestBuilderExt};
-pub use progenitor_client::{ByteStream, Error, ResponseValue};
+pub use progenitor_client::{
+    generate_websocket_key, ByteStream, Error, ResponseValue, WebsocketReactants,
+};
 pub mod types {
     use serde::{Deserialize, Serialize};
     #[allow(unused_imports)]
@@ -181,7 +183,7 @@ pub mod types {
             T::try_from(V).unwrap()
         }
 
-        pub(super) fn body_with_defaults_something() -> Option<bool> {
+        pub(super) fn body_with_defaults_something() -> super::Option<bool> {
             Some(true)
         }
     }
@@ -236,7 +238,10 @@ impl Client {
 pub mod builder {
     use super::types;
     #[allow(unused_imports)]
-    use super::{encode_path, ByteStream, Error, RequestBuilderExt, ResponseValue};
+    use super::{
+        encode_path, generate_websocket_key, ByteStream, Error, RequestBuilderExt, ResponseValue,
+        WebsocketReactants,
+    };
     #[allow(unused_imports)]
     use std::convert::TryInto;
     ///Builder for [`Client::default_params`]
diff --git a/progenitor-impl/tests/output/test_default_params_positional.out b/progenitor-impl/tests/output/test_default_params_positional.out
index 9eadbcab..dabbc153 100644
--- a/progenitor-impl/tests/output/test_default_params_positional.out
+++ b/progenitor-impl/tests/output/test_default_params_positional.out
@@ -1,6 +1,8 @@
 #[allow(unused_imports)]
 use progenitor_client::{encode_path, RequestBuilderExt};
-pub use progenitor_client::{ByteStream, Error, ResponseValue};
+pub use progenitor_client::{
+    generate_websocket_key, ByteStream, Error, ResponseValue, WebsocketReactants,
+};
 pub mod types {
     use serde::{Deserialize, Serialize};
     #[allow(unused_imports)]
@@ -34,7 +36,7 @@ pub mod types {
             T::try_from(V).unwrap()
         }
 
-        pub(super) fn body_with_defaults_something() -> Option<bool> {
+        pub(super) fn body_with_defaults_something() -> super::Option<bool> {
             Some(true)
         }
     }
diff --git a/progenitor-impl/tests/output/test_freeform_response.out b/progenitor-impl/tests/output/test_freeform_response.out
index 97216ca1..d9b8a395 100644
--- a/progenitor-impl/tests/output/test_freeform_response.out
+++ b/progenitor-impl/tests/output/test_freeform_response.out
@@ -1,6 +1,8 @@
 #[allow(unused_imports)]
 use progenitor_client::{encode_path, RequestBuilderExt};
-pub use progenitor_client::{ByteStream, Error, ResponseValue};
+pub use progenitor_client::{
+    generate_websocket_key, ByteStream, Error, ResponseValue, WebsocketReactants,
+};
 pub mod types {
     use serde::{Deserialize, Serialize};
     #[allow(unused_imports)]
diff --git a/progenitor-impl/tests/output/test_renamed_parameters.out b/progenitor-impl/tests/output/test_renamed_parameters.out
index 8f13e283..6b95b98d 100644
--- a/progenitor-impl/tests/output/test_renamed_parameters.out
+++ b/progenitor-impl/tests/output/test_renamed_parameters.out
@@ -1,6 +1,8 @@
 #[allow(unused_imports)]
 use progenitor_client::{encode_path, RequestBuilderExt};
-pub use progenitor_client::{ByteStream, Error, ResponseValue};
+pub use progenitor_client::{
+    generate_websocket_key, ByteStream, Error, ResponseValue, WebsocketReactants,
+};
 pub mod types {
     use serde::{Deserialize, Serialize};
     #[allow(unused_imports)]