diff --git a/protobuf/2.0/Container.proto b/protobuf/2.0/Container.proto
index 4f77145..ad25cbb 100644
--- a/protobuf/2.0/Container.proto
+++ b/protobuf/2.0/Container.proto
@@ -1,18 +1,20 @@
+import "./Authentication.proto";
+import "./Message.proto";
+import "./PublishDiscover.proto";
+
 syntax = "proto3";
 
 // Client <-> Server
 message Container {
-    enum MessageType {
-        AuthenticationRequest  = 0;
-        AuthenticationResponse = 1;
-        Message                = 2;
-        PublishRequest         = 3;
-        PublishResponse        = 4;
-        DiscoverRequest        = 5;
-        DiscoverResponse       = 6;
-    }
+    uint32 id   = 1;
 
-    MessageType type = 1;
-    uint32      id   = 2;
-    bytes       data = 3;
+    oneof message {
+        AuthenticationRequest  AuthenticationRequest  = 2;
+        AuthenticationResponse AuthenticationResponse = 3;
+        Message                Message                = 4;
+        PublishRequest         PublishRequest         = 5;
+        PublishResponse        PublishResponse        = 6;
+        DiscoverRequest        DiscoverRequest        = 7;
+        DiscoverResponse       DiscoverResponse       = 8;
+    }
 }