diff --git a/editions.yaml b/editions.yaml
index affefde..e5badf1 100644
--- a/editions.yaml
+++ b/editions.yaml
@@ -163,7 +163,7 @@ terraria:
   features:
     - prudpv1
     - third-notif-param
-    - v3-8-15
+    - v3-8-13
     - match-making
     - ranking
   settings:
diff --git a/rnex-protocols/auth-protos/Cargo.toml b/rnex-protocols/auth-protos/Cargo.toml
index 3e9bc7b..2581ab4 100644
--- a/rnex-protocols/auth-protos/Cargo.toml
+++ b/rnex-protocols/auth-protos/Cargo.toml
@@ -20,6 +20,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]
diff --git a/rnex-protocols/base-protos/Cargo.toml b/rnex-protocols/base-protos/Cargo.toml
index ef6e41c..8f4cd75 100644
--- a/rnex-protocols/base-protos/Cargo.toml
+++ b/rnex-protocols/base-protos/Cargo.toml
@@ -18,6 +18,7 @@ friends = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]
diff --git a/rnex-protocols/ds-protos/Cargo.toml b/rnex-protocols/ds-protos/Cargo.toml
index 15f39e7..fde23a0 100644
--- a/rnex-protocols/ds-protos/Cargo.toml
+++ b/rnex-protocols/ds-protos/Cargo.toml
@@ -19,6 +19,7 @@ friends = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]
diff --git a/rnex-protocols/fpd-protos/Cargo.toml b/rnex-protocols/fpd-protos/Cargo.toml
index 5934e17..88924a3 100644
--- a/rnex-protocols/fpd-protos/Cargo.toml
+++ b/rnex-protocols/fpd-protos/Cargo.toml
@@ -18,6 +18,7 @@ friends = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]
diff --git a/rnex-protocols/mm-protos/Cargo.toml b/rnex-protocols/mm-protos/Cargo.toml
index f7eeb9e..9f82b37 100644
--- a/rnex-protocols/mm-protos/Cargo.toml
+++ b/rnex-protocols/mm-protos/Cargo.toml
@@ -16,6 +16,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]
diff --git a/rnex-protocols/mm-protos/src/matchmake.rs b/rnex-protocols/mm-protos/src/matchmake.rs
index 2723ba6..d18adea 100644
--- a/rnex-protocols/mm-protos/src/matchmake.rs
+++ b/rnex-protocols/mm-protos/src/matchmake.rs
@@ -1,11 +1,12 @@
 use cfg_if::cfg_if;
+#[cfg(all(not(any(feature="v3-8-13"))))]
+use rnex_rmc::string_set::StringSet;
 use rnex_rmc::{
     RmcSerialize,
     any::Any,
     method_id,
     response::ErrorCode,
     rmc_proto,
-    string_set::StringSet,
     util::{PID, station_url::StationUrl},
     variant::Variant,
 };
@@ -77,23 +78,46 @@ cfg_if! {
     }
 }
 
-#[derive(RmcSerialize, Debug, Clone)]
-#[rmc_struct(3)]
-pub struct MatchmakeSessionSearchCriteria {
-    pub attribs: Vec<StringSet<u32>>,
-    pub game_mode: String,
-    pub minimum_participants: String,
-    pub maximum_participants: String,
-    pub matchmake_system_type: String,
-    pub vacant_only: bool,
-    pub exclude_locked: bool,
-    pub exclude_non_host_pid: bool,
-    pub selection_method: u32,
-    pub vacant_participants: u16,
-    pub matchmake_param: MatchmakeParam,
-    pub exclude_user_password_set: bool,
-    pub exclude_system_password_set: bool,
-    pub refer_gid: u32,
+cfg_if! {
+    if #[cfg(feature = "v3-8-13")] {
+        #[derive(RmcSerialize, Debug, Clone)]
+        #[rmc_struct(3)]
+        pub struct MatchmakeSessionSearchCriteria {
+            pub attribs: Vec<String>,
+            pub game_mode: String,
+            pub minimum_participants: String,
+            pub maximum_participants: String,
+            pub matchmake_system_type: String,
+            pub vacant_only: bool,
+            pub exclude_locked: bool,
+            pub exclude_non_host_pid: bool,
+            pub selection_method: u32,
+            pub vacant_participants: u16,
+            pub matchmake_param: MatchmakeParam,
+            pub exclude_user_password_set: bool,
+            pub exclude_system_password_set: bool,
+            pub refer_gid: u32,
+        }
+    } else {
+        #[derive(RmcSerialize, Debug, Clone)]
+        #[rmc_struct(3)]
+        pub struct MatchmakeSessionSearchCriteria {
+            pub attribs: Vec<StringSet<u32>>,
+            pub game_mode: String,
+            pub minimum_participants: String,
+            pub maximum_participants: String,
+            pub matchmake_system_type: String,
+            pub vacant_only: bool,
+            pub exclude_locked: bool,
+            pub exclude_non_host_pid: bool,
+            pub selection_method: u32,
+            pub vacant_participants: u16,
+            pub matchmake_param: MatchmakeParam,
+            pub exclude_user_password_set: bool,
+            pub exclude_system_password_set: bool,
+            pub refer_gid: u32,
+        }
+    }
 }
 
 #[derive(RmcSerialize, Debug, Clone)]
diff --git a/rnex-protocols/msg-protos/Cargo.toml b/rnex-protocols/msg-protos/Cargo.toml
index f5d8986..598f848 100644
--- a/rnex-protocols/msg-protos/Cargo.toml
+++ b/rnex-protocols/msg-protos/Cargo.toml
@@ -17,6 +17,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]
diff --git a/rnex-protocols/reggie-protos/Cargo.toml b/rnex-protocols/reggie-protos/Cargo.toml
index af606af..39cd547 100644
--- a/rnex-protocols/reggie-protos/Cargo.toml
+++ b/rnex-protocols/reggie-protos/Cargo.toml
@@ -17,6 +17,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]
diff --git a/rnex-protocols/rk-protos/Cargo.toml b/rnex-protocols/rk-protos/Cargo.toml
index b6a2668..9f4d705 100644
--- a/rnex-protocols/rk-protos/Cargo.toml
+++ b/rnex-protocols/rk-protos/Cargo.toml
@@ -19,6 +19,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]
diff --git a/rnex-prudp/Cargo.toml b/rnex-prudp/Cargo.toml
index 0724a73..11c41ee 100644
--- a/rnex-prudp/Cargo.toml
+++ b/rnex-prudp/Cargo.toml
@@ -24,6 +24,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]
diff --git a/rnex-rmc/Cargo.toml b/rnex-rmc/Cargo.toml
index 0d31496..c952cee 100644
--- a/rnex-rmc/Cargo.toml
+++ b/rnex-rmc/Cargo.toml
@@ -25,6 +25,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param", "rmc_struct_header"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]
diff --git a/rnex-rmc/src/lib.rs b/rnex-rmc/src/lib.rs
index 2914ab4..d77d637 100644
--- a/rnex-rmc/src/lib.rs
+++ b/rnex-rmc/src/lib.rs
@@ -38,7 +38,7 @@ pub mod config {
 
 pub use paste;
 pub use rnex_util as util;
-use tracing::{error, info, info_span};
+use tracing::{error, info};
 
 use crate::{
     RemoteCallError::ConnectionBroke,
diff --git a/rnex-server-nex-modules/rnex-auth/Cargo.toml b/rnex-server-nex-modules/rnex-auth/Cargo.toml
index 39e2e59..bd994d0 100644
--- a/rnex-server-nex-modules/rnex-auth/Cargo.toml
+++ b/rnex-server-nex-modules/rnex-auth/Cargo.toml
@@ -27,6 +27,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param", "rmc_struct_header"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]
diff --git a/rnex-server-nex-modules/rnex-base/Cargo.toml b/rnex-server-nex-modules/rnex-base/Cargo.toml
index 92078e5..f5dfcb6 100644
--- a/rnex-server-nex-modules/rnex-base/Cargo.toml
+++ b/rnex-server-nex-modules/rnex-base/Cargo.toml
@@ -22,6 +22,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]
diff --git a/rnex-server-nex-modules/rnex-ds/Cargo.toml b/rnex-server-nex-modules/rnex-ds/Cargo.toml
index 71392b4..fc7590f 100644
--- a/rnex-server-nex-modules/rnex-ds/Cargo.toml
+++ b/rnex-server-nex-modules/rnex-ds/Cargo.toml
@@ -31,6 +31,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]
diff --git a/rnex-server-nex-modules/rnex-fpd/Cargo.toml b/rnex-server-nex-modules/rnex-fpd/Cargo.toml
index 9679b2a..5917f18 100644
--- a/rnex-server-nex-modules/rnex-fpd/Cargo.toml
+++ b/rnex-server-nex-modules/rnex-fpd/Cargo.toml
@@ -30,6 +30,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param", "rmc_struct_header"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]
diff --git a/rnex-server-nex-modules/rnex-mm/Cargo.toml b/rnex-server-nex-modules/rnex-mm/Cargo.toml
index 37c1cbc..a4add3a 100644
--- a/rnex-server-nex-modules/rnex-mm/Cargo.toml
+++ b/rnex-server-nex-modules/rnex-mm/Cargo.toml
@@ -27,6 +27,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param", "rmc_struct_header"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]
diff --git a/rnex-server-nex-modules/rnex-msg/Cargo.toml b/rnex-server-nex-modules/rnex-msg/Cargo.toml
index f07de7c..0f3afdf 100644
--- a/rnex-server-nex-modules/rnex-msg/Cargo.toml
+++ b/rnex-server-nex-modules/rnex-msg/Cargo.toml
@@ -12,6 +12,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param", "rmc_struct_header"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]
diff --git a/rnex-server-nex-modules/rnex-node-holder/Cargo.toml b/rnex-server-nex-modules/rnex-node-holder/Cargo.toml
index 453d4c8..b62e267 100644
--- a/rnex-server-nex-modules/rnex-node-holder/Cargo.toml
+++ b/rnex-server-nex-modules/rnex-node-holder/Cargo.toml
@@ -12,6 +12,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param", "rmc_struct_header"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]
diff --git a/rnex-server-nex-modules/rnex-rk/Cargo.toml b/rnex-server-nex-modules/rnex-rk/Cargo.toml
index be1ee7a..dc1ee4a 100644
--- a/rnex-server-nex-modules/rnex-rk/Cargo.toml
+++ b/rnex-server-nex-modules/rnex-rk/Cargo.toml
@@ -12,6 +12,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param", "rmc_struct_header"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]
diff --git a/rnex-server/Cargo.toml b/rnex-server/Cargo.toml
index c4a04d6..222c387 100644
--- a/rnex-server/Cargo.toml
+++ b/rnex-server/Cargo.toml
@@ -25,6 +25,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]
diff --git a/rnex-server/backend-auth/Cargo.toml b/rnex-server/backend-auth/Cargo.toml
index 35af07a..da3ea5a 100644
--- a/rnex-server/backend-auth/Cargo.toml
+++ b/rnex-server/backend-auth/Cargo.toml
@@ -12,6 +12,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]
diff --git a/rnex-server/backend-node-holder/Cargo.toml b/rnex-server/backend-node-holder/Cargo.toml
index edb9693..17cd2e6 100644
--- a/rnex-server/backend-node-holder/Cargo.toml
+++ b/rnex-server/backend-node-holder/Cargo.toml
@@ -18,6 +18,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]
diff --git a/rnex-server/backend-secure/Cargo.toml b/rnex-server/backend-secure/Cargo.toml
index cf56dce..abb5bec 100644
--- a/rnex-server/backend-secure/Cargo.toml
+++ b/rnex-server/backend-secure/Cargo.toml
@@ -24,6 +24,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]
diff --git a/rnex-server/src/lib.rs b/rnex-server/src/lib.rs
index b0a1cf2..56a2bdc 100644
--- a/rnex-server/src/lib.rs
+++ b/rnex-server/src/lib.rs
@@ -4,7 +4,6 @@ use std::net::SocketAddr;
 use std::sync::Weak;
 use std::{
     any::{Any, TypeId, type_name},
-    borrow::Cow,
     collections::HashMap,
     env,
     error::Error,
diff --git a/rnex-util/Cargo.toml b/rnex-util/Cargo.toml
index 60d8f18..83e6bb1 100644
--- a/rnex-util/Cargo.toml
+++ b/rnex-util/Cargo.toml
@@ -21,6 +21,7 @@ third-notif-param = []
 v3-3-2 = []
 v3-4-0 = ["v3-3-2", "third-notif-param", "rmc_struct_header"]
 v3-5-0 = ["v3-4-0"]
+v3-8-13 = ["v3-5-0"]
 v3-8-15 = ["v3-5-0"]
 v3-10-22 = ["v3-8-15"]
 v4-3-11 = ["v3-8-15"]