diff --git a/src/tateyama/proto/endpoint/request.proto b/src/tateyama/proto/endpoint/request.proto
index ba336d8..709d318 100644
--- a/src/tateyama/proto/endpoint/request.proto
+++ b/src/tateyama/proto/endpoint/request.proto
@@ -27,11 +27,17 @@ message Request {
 
 // handshake operation.
 message Handshake {
-    // the auth info.
-    AuthInfo auth_info = 1;
+    // the credential.
+    Credential credential = 1;
 
     // the client information.
     ClientInformation client_information = 2;
+
+    // reserved for system use
+    reserved 3 to 10;
+
+    // the wire information.
+    WireInformation wire_information = 11;
 }
 
 // client information
@@ -42,18 +48,32 @@ message ClientInformation {
     // the application name.
     string application_name = 2;
 
+    // the credential
+    Credential credential = 3;
+}
+
+// the credential
+message Credential {
     // the user name.
-    string user_name = 4;
+    string user_name = 1;
+}
 
-    // the connection information
-    string connection_information = 5;
+// wire information
+message WireInformation {
+    oneof wire_information {
+        IpcInformation ipc_information = 1;
+        StreamInformation stream_information = 2;
+    }
 
-    // reserved for future use
-    reserved 6 to 10;
+    // ipc information
+    message IpcInformation {
+        // the connection information
+        string connection_information = 1;
+    }
 
-    // the maximum concurrent result sets
-    uint64 maximum_concurrent_result_sets = 11;
+    // stream information
+    message StreamInformation {
+        // the maximum concurrent result sets
+        uint64 maximum_concurrent_result_sets = 1;
+    }
 }
-
-// auto info.
-message AuthInfo {}