diff --git a/cli/src/queries/player_info.rs b/cli/src/queries/player_info.rs
index f2bc1f7..2966f08 100644
--- a/cli/src/queries/player_info.rs
+++ b/cli/src/queries/player_info.rs
@@ -20,13 +20,16 @@ pub struct PlayerInfo {
 
 #[derive(cynic::QueryFragment, Debug)]
 struct Player {
+    id: Option<PlayerId>,
     gamer_tag: Option<String>,
     prefix: Option<String>,
 }
 
 // Unwrapping
 
+#[derive(Debug, Clone)]
 pub struct PlayerData {
+    pub id: PlayerId,
     pub name: Option<String>,
     pub prefix: Option<String>,
 }
@@ -37,6 +40,7 @@ impl QueryUnwrap<PlayerInfoVars> for PlayerInfo {
     fn unwrap_response(response: GraphQlResponse<PlayerInfo>) -> Option<PlayerData> {
         let player = response.data?.player?;
         Some(PlayerData {
+            id: player.id?,
             name: player.gamer_tag,
             prefix: player.prefix.filter(|pr| !pr.is_empty()),
         })
diff --git a/cli/src/queries/search_games.rs b/cli/src/queries/search_games.rs
index d981515..eec8e39 100644
--- a/cli/src/queries/search_games.rs
+++ b/cli/src/queries/search_games.rs
@@ -32,6 +32,7 @@ struct Videogame {
 
 // Unwrapping
 
+#[derive(Debug, Clone)]
 pub struct VideogameData {
     pub id: VideogameId,
     pub name: String,
diff --git a/cli/src/queries/tournament_sets.rs b/cli/src/queries/tournament_sets.rs
index acaf413..9f81e76 100644
--- a/cli/src/queries/tournament_sets.rs
+++ b/cli/src/queries/tournament_sets.rs
@@ -1,7 +1,9 @@
-use super::{EntrantId, PlayerId, QueryUnwrap, Timestamp, VideogameId};
+use super::{EntrantId, PlayerData, PlayerId, QueryUnwrap, Timestamp, VideogameId};
 use cynic::GraphQlResponse;
 use schema::schema;
 
+pub type Teams<T> = Vec<Vec<T>>;
+
 // Variables
 
 #[derive(cynic::QueryVariables, Debug)]
@@ -97,22 +99,18 @@ struct Player {
 
 // Unwrap
 
+#[derive(Debug, Clone)]
 pub struct TournamentData {
     pub name: String,
     pub sets: Vec<SetData>,
 }
 
+#[derive(Debug, Clone)]
 pub struct SetData {
-    pub teams: Vec<Vec<PlayerId>>,
+    pub teams: Teams<PlayerData>,
     pub winner: usize,
 }
 
-pub struct PlayerData {
-    pub id: PlayerId,
-    pub gamer_tag: Option<String>,
-    pub prefix: Option<String>,
-}
-
 impl<'a> QueryUnwrap<TournamentSetsVars<'a>> for TournamentSets {
     type Unwrapped = Vec<TournamentData>;
 
@@ -154,7 +152,7 @@ impl<'a> QueryUnwrap<TournamentSetsVars<'a>> for TournamentSets {
                                                         let p_ = p.player?;
                                                         Some(PlayerData {
                                                             id: p_.id?,
-                                                            gamer_tag: p_.gamer_tag,
+                                                            name: p_.gamer_tag,
                                                             prefix: p_.prefix,
                                                         })
                                                     })