diff --git a/core/Message.proto b/core/Message.proto
index de7d06f8582..a25c21506f6 100644
--- a/core/Message.proto
+++ b/core/Message.proto
@@ -11,16 +11,6 @@ message Capability {
   int32 version = 2;
 }
 
-enum P2pMessageCode {
-  HELLO = 0;
-  DISCONNECT = 1;
-  PING = 2;
-  PONG = 3;
-  GET_PEERS = 4;
-  PEERS = 5;
-  USER = 6;
-}
-
 enum ReasonCode {
   REQUESTED = 0;
   TCP_ERROR = 1;
@@ -59,4 +49,38 @@ message HelloMessage {
 
 message PeersMessage {
   repeated Peer peers = 1;
+}
+
+message Endpoint {
+  bytes address = 1;
+  int32 udpPort = 2;
+  int32 tcpPort = 3;
+}
+
+message PingMessage {
+  int32 version = 1;
+  Endpoint from = 2;
+  Endpoint to = 3;
+  int32 timestamp = 4;
+}
+
+message PongMessage {
+  Endpoint to = 1;
+  int32 echo = 2;
+  int32 timestamp = 3;
+}
+
+message FindNeighbours {
+  bytes target = 1;
+  int32 timestamp = 2;
+}
+
+message Neighbour {
+  Endpoint endpoint = 1;
+  bytes nodeId = 2;
+}
+
+message Neighbours {
+  repeated Neighbour neighbours = 1;
+  int32 timestamp = 2;
 }
\ No newline at end of file