diff --git a/WebSocketServer/Messages/Handlers/AuthHandler.cs b/WebSocketServer/Messages/Handlers/AuthHandler.cs
index efa9362..ebe351e 100644
--- a/WebSocketServer/Messages/Handlers/AuthHandler.cs
+++ b/WebSocketServer/Messages/Handlers/AuthHandler.cs
@@ -15,7 +15,7 @@ namespace WebSocketServer.Messages.Handlers
     public class AuthHandler : BaseHandler
     {
         /// <inheritdoc />
-        protected override string Target => Payloads.Server.AuthMessage.Type;
+        protected override string Target => Payloads.Types.AuthMessage;
 
         /// <inheritdoc />
         public override bool CanHandle(IWebSocketConnection socket, string messageType, IServer server)
diff --git a/WebSocketServer/Messages/Handlers/ChatHandler.cs b/WebSocketServer/Messages/Handlers/ChatHandler.cs
index a663d3c..a5df4f5 100644
--- a/WebSocketServer/Messages/Handlers/ChatHandler.cs
+++ b/WebSocketServer/Messages/Handlers/ChatHandler.cs
@@ -15,7 +15,7 @@ namespace WebSocketServer.Messages.Handlers
     public class ChatHandler : BaseHandler
     {
         /// <inheritdoc />
-        protected override string Target => Payloads.Server.ChatMessage.Type;
+        protected override string Target => Payloads.Types.ChatMessage;
 
         /// <inheritdoc />
         public override void Handle(IWebSocketConnection socket, string webSocketMessage, IServer server)
diff --git a/WebSocketServer/Messages/Handlers/UsersListHandler.cs b/WebSocketServer/Messages/Handlers/UsersListHandler.cs
index f9156f4..d6ff200 100644
--- a/WebSocketServer/Messages/Handlers/UsersListHandler.cs
+++ b/WebSocketServer/Messages/Handlers/UsersListHandler.cs
@@ -16,7 +16,7 @@ namespace WebSocketServer.Messages.Handlers
     public class UsersListHandler : BaseHandler
     {
         /// <inheritdoc />
-        protected override string Target => Payloads.Server.UsersListMessage.Type;
+        protected override string Target => Payloads.Types.UsersListMessage;
 
         /// <inheritdoc />
         public override void Handle(IWebSocketConnection socket, string webSocketMessage, IServer server)
diff --git a/WebSocketServer/Messages/Payloads/BaseMessage.cs b/WebSocketServer/Messages/Payloads/BaseMessage.cs
index 15b297e..d7d73f7 100644
--- a/WebSocketServer/Messages/Payloads/BaseMessage.cs
+++ b/WebSocketServer/Messages/Payloads/BaseMessage.cs
@@ -12,7 +12,7 @@ namespace WebSocketServer.Messages.Payloads
     /// <summary>
     /// The base message.
     /// </summary>
-    public class BaseMessage
+    public abstract class BaseMessage
     {
         /// <summary>
         /// Gets the message type.
diff --git a/WebSocketServer/Messages/Payloads/Client/AuthMessage.cs b/WebSocketServer/Messages/Payloads/Client/AuthMessage.cs
index db00ec7..0617e1b 100644
--- a/WebSocketServer/Messages/Payloads/Client/AuthMessage.cs
+++ b/WebSocketServer/Messages/Payloads/Client/AuthMessage.cs
@@ -10,19 +10,14 @@
 namespace WebSocketServer.Messages.Payloads.Client
 {
     /// <inheritdoc />
-    public partial class AuthMessage : BaseMessage
+    public class AuthMessage : BaseMessage
     {
-        /// <summary>
-        /// Тип сообщения.
-        /// </summary>
-        public const string Type = "AUTH_MESSAGE";
-
         /// <summary>
         /// Gets or sets the user name.
         /// </summary>
         public string UserName { get; set; }
 
         /// <inheritdoc />
-        protected override string MessageType => Type;
+        protected override string MessageType => Types.AuthMessage;
     }
 }
diff --git a/WebSocketServer/Messages/Payloads/Client/ChatMessage.cs b/WebSocketServer/Messages/Payloads/Client/ChatMessage.cs
index 418a567..cac560f 100644
--- a/WebSocketServer/Messages/Payloads/Client/ChatMessage.cs
+++ b/WebSocketServer/Messages/Payloads/Client/ChatMessage.cs
@@ -12,17 +12,12 @@ namespace WebSocketServer.Messages.Payloads.Client
     /// <inheritdoc />
     public class ChatMessage : BaseMessage
     {
-        /// <summary>
-        /// The type.
-        /// </summary>
-        public const string Type = "CHAT_MESSAGE";
-
         /// <summary>
         /// Gets or sets the message.
         /// </summary>
         public string Message { get; set; }
 
         /// <inheritdoc />
-        protected override string MessageType => Type;
+        protected override string MessageType => Types.ChatMessage;
     }
 }
diff --git a/WebSocketServer/Messages/Payloads/Client/UsersListMessage.cs b/WebSocketServer/Messages/Payloads/Client/UsersListMessage.cs
index fc5e08e..b7416b5 100644
--- a/WebSocketServer/Messages/Payloads/Client/UsersListMessage.cs
+++ b/WebSocketServer/Messages/Payloads/Client/UsersListMessage.cs
@@ -12,12 +12,7 @@ namespace WebSocketServer.Messages.Payloads.Client
     /// <inheritdoc />
     public class UsersListMessage : BaseMessage
     {
-        /// <summary>
-        /// Тип сообщения.
-        /// </summary>
-        public const string Type = "USERS_LIST_MESSAGE";
-
         /// <inheritdoc />
-        protected override string MessageType => Type;
+        protected override string MessageType => Types.UsersListMessage;
     }
 }
diff --git a/WebSocketServer/Messages/Payloads/Server/AuthMessage.cs b/WebSocketServer/Messages/Payloads/Server/AuthMessage.cs
index e36ee08..c399c30 100644
--- a/WebSocketServer/Messages/Payloads/Server/AuthMessage.cs
+++ b/WebSocketServer/Messages/Payloads/Server/AuthMessage.cs
@@ -12,11 +12,6 @@ namespace WebSocketServer.Messages.Payloads.Server
     /// <inheritdoc />
     public partial class AuthMessage : BaseMessage
     {
-        /// <summary>
-        /// Тип сообщения.
-        /// </summary>
-        public const string Type = "AUTH_MESSAGE";
-
         /// <summary>
         /// Текст сообщения об успешной или неудачной авторизации.
         /// </summary>
@@ -33,6 +28,6 @@ public partial class AuthMessage : BaseMessage
         public string UserName { get; set; }
 
         /// <inheritdoc />
-        protected override string MessageType => Type;
+        protected override string MessageType => Types.AuthMessage;
     }
 }
diff --git a/WebSocketServer/Messages/Payloads/Server/ChatMessage.cs b/WebSocketServer/Messages/Payloads/Server/ChatMessage.cs
index 3d6b18a..74941da 100644
--- a/WebSocketServer/Messages/Payloads/Server/ChatMessage.cs
+++ b/WebSocketServer/Messages/Payloads/Server/ChatMessage.cs
@@ -12,11 +12,6 @@ namespace WebSocketServer.Messages.Payloads.Server
     /// <inheritdoc />
     public class ChatMessage : BaseMessage
     {
-        /// <summary>
-        /// The type.
-        /// </summary>
-        public const string Type = "CHAT_MESSAGE";
-
         /// <summary>
         /// Gets or sets the message.
         /// </summary>
@@ -33,6 +28,6 @@ public class ChatMessage : BaseMessage
         public string UserName { get; set; }
 
         /// <inheritdoc />
-        protected override string MessageType => Type;
+        protected override string MessageType => Types.ChatMessage;
     }
 }
diff --git a/WebSocketServer/Messages/Payloads/Server/InvalidMessage.cs b/WebSocketServer/Messages/Payloads/Server/InvalidMessage.cs
index a52e8ca..1fb322b 100644
--- a/WebSocketServer/Messages/Payloads/Server/InvalidMessage.cs
+++ b/WebSocketServer/Messages/Payloads/Server/InvalidMessage.cs
@@ -12,17 +12,12 @@ namespace WebSocketServer.Messages.Payloads.Server
     /// <inheritdoc />
     public class InvalidMessage : BaseMessage
     {
-        /// <summary>
-        /// Тип сообщения.
-        /// </summary>
-        public const string Type = "INVALID_MESSAGE";
-
         /// <summary>
         /// Сообщение об ошибке.
         /// </summary>
         public string Message { get; set; }
 
         /// <inheritdoc />
-        protected override string MessageType => Type;
+        protected override string MessageType => Types.InvalidMessage;
     }
 }
diff --git a/WebSocketServer/Messages/Payloads/Server/UsersListMessage.cs b/WebSocketServer/Messages/Payloads/Server/UsersListMessage.cs
index f9686ab..9d9c295 100644
--- a/WebSocketServer/Messages/Payloads/Server/UsersListMessage.cs
+++ b/WebSocketServer/Messages/Payloads/Server/UsersListMessage.cs
@@ -12,17 +12,12 @@ namespace WebSocketServer.Messages.Payloads.Server
     /// <inheritdoc />
     public class UsersListMessage : BaseMessage
     {
-        /// <summary>
-        /// Тип сообщения.
-        /// </summary>
-        public const string Type = "USERS_LIST_MESSAGE";
-
         /// <summary>
         /// Список пользователей онлайн.
         /// </summary>
         public string[] UsersList { get; set; }
 
         /// <inheritdoc />
-        protected override string MessageType => Type;
+        protected override string MessageType => Types.UsersListMessage;
     }
 }
diff --git a/WebSocketServer/Messages/Payloads/Types.cs b/WebSocketServer/Messages/Payloads/Types.cs
new file mode 100644
index 0000000..bf23d78
--- /dev/null
+++ b/WebSocketServer/Messages/Payloads/Types.cs
@@ -0,0 +1,37 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Types.cs" company="mpgp">
+//   Multiplayer Game Platform
+// </copyright>
+// <summary>
+//   Defines the Types of Messages.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace WebSocketServer.Messages.Payloads
+{
+    /// <summary>
+    /// The types of messages.
+    /// </summary>
+    public static class Types
+    {
+        /// <summary>
+        /// The auth message.
+        /// </summary>
+        public static readonly string AuthMessage = "AUTH_MESSAGE";
+
+        /// <summary>
+        /// The chat message.
+        /// </summary>
+        public static readonly string ChatMessage = "CHAT_MESSAGE";
+
+        /// <summary>
+        /// The users list message.
+        /// </summary>
+        public static readonly string UsersListMessage = "USERS_LIST_MESSAGE";
+
+        /// <summary>
+        /// The invalid message.
+        /// </summary>
+        public static readonly string InvalidMessage = "INVALID_MESSAGE";
+    }
+}
diff --git a/WebSocketServer/WebSocketServer.csproj b/WebSocketServer/WebSocketServer.csproj
index aeae236..a009c3e 100644
--- a/WebSocketServer/WebSocketServer.csproj
+++ b/WebSocketServer/WebSocketServer.csproj
@@ -56,6 +56,7 @@
     <Compile Include="Messages\Payloads\Client\UsersListMessage.cs" />
     <Compile Include="Messages\Payloads\Server\InvalidMessage.cs" />
     <Compile Include="Messages\Payloads\Server\UsersListMessage.cs" />
+    <Compile Include="Messages\Payloads\Types.cs" />
     <Compile Include="Messages\Successor.cs" />
     <Compile Include="Messages\Handlers\AuthHandler.cs" />
     <Compile Include="Messages\Handlers\BaseHandler.cs" />