diff --git a/src/main/java/cocaine/message/HandshakeMessage.java b/src/main/java/cocaine/message/HandshakeMessage.java
index <HASH>..<HASH> 100644
--- a/src/main/java/cocaine/message/HandshakeMessage.java
+++ b/src/main/java/cocaine/message/HandshakeMessage.java
@@ -1,23 +1,25 @@
 package cocaine.message;
 
+import java.util.UUID;
+
 /**
  * @author Anton Bobukh <abobukh@yandex-team.ru>
  */
 public class HandshakeMessage extends Message {
 
-    private final String uniqueId;
+    private final UUID id;
 
-    public HandshakeMessage(long session, String uniqueId) {
+    public HandshakeMessage(long session, UUID id) {
         super(Type.HANDSHAKE, session);
-        this.uniqueId = uniqueId;
+        this.id = id;
     }
 
-    public String getUniqueId() {
-        return uniqueId;
+    public UUID getId() {
+        return id;
     }
 
     @Override
     public String toString() {
-        return "HandshakeMessage/" + getSession() + ": " + uniqueId;
+        return "HandshakeMessage/" + getSession() + ": " + id;
     }
 }
Application ID type is changed to java.util.UUID