diff --git a/BattlePlace/WebApi.hs b/BattlePlace/WebApi.hs
--- a/BattlePlace/WebApi.hs
+++ b/BattlePlace/WebApi.hs
@@ -16,7 +16,6 @@
 	, MatchTeam(..)
 	, MatchPlayer(..)
 	, MatchServer(..)
-	, MatchServerInfo(..)
 	, SessionResultRequest(..)
 	, ServerMatchRequest(..)
 	, ServerMatchResponse(..)
@@ -151,8 +150,6 @@
 	toJSON = J.genericToJSON jsonOptions
 	toEncoding = J.genericToEncoding jsonOptions
 
-newtype MatchServerInfo = MatchServerInfo T.Text deriving (J.FromJSON, J.ToJSON)
-
 data SessionResultRequest
 	= SessionResultRequest_finished
 		{ sessionResultRequest_ranks :: !(V.Vector Int)
@@ -171,7 +168,7 @@
 	, serverMatchRequest_serverTag :: !(Maybe ServerTag)
 	, serverMatchRequest_maxSessionsCount :: {-# UNPACK #-} !Int
 	, serverMatchRequest_name :: !T.Text
-	, serverMatchRequest_info :: !MatchServerInfo
+	, serverMatchRequest_info :: !(Maybe MatchServerInfo)
 	, serverMatchRequest_timeout :: !(Maybe Int)
 	} deriving Generic
 instance J.FromJSON ServerMatchRequest where
diff --git a/BattlePlace/WebApi/Types.hs b/BattlePlace/WebApi/Types.hs
--- a/BattlePlace/WebApi/Types.hs
+++ b/BattlePlace/WebApi/Types.hs
@@ -21,6 +21,7 @@
 	, MatchTag(..)
 	, ServerTag(..)
 	, MatchPlayerInfo(..)
+	, MatchServerInfo(..)
 	, MatchToken(..)
 	, MatchFailureReason(..)
 	, SessionToken(..)
@@ -159,7 +160,10 @@
 newtype ServerTag = ServerTag T.Text deriving (Eq, Hashable, Semigroup, Monoid, J.FromJSON, J.ToJSON)
 
 -- | Opaque player info.
-newtype MatchPlayerInfo = MatchPlayerInfo T.Text deriving (Semigroup, Monoid, J.FromJSON, J.ToJSON)
+newtype MatchPlayerInfo = MatchPlayerInfo J.Value deriving (J.FromJSON, J.ToJSON)
+
+-- | Opaque server info.
+newtype MatchServerInfo = MatchServerInfo J.Value deriving (J.FromJSON, J.ToJSON)
 
 -- | Match token.
 data MatchToken = MatchToken
diff --git a/battleplace.cabal b/battleplace.cabal
--- a/battleplace.cabal
+++ b/battleplace.cabal
@@ -1,5 +1,5 @@
 name:                battleplace
-version:             0.1.0.4
+version:             0.1.0.5
 synopsis:            Core definitions for BattlePlace.io service
 description:         Core definitions for BattlePlace.io service
 license:             MIT