diff --git a/proto/clients/clients.proto b/proto/clients/clients.proto
index 992fa3c15aa1dcd25cc1034b48d1f785f00295a6..8237483cd13fb039634eea439c64ab40dc94eec1 100644
--- a/proto/clients/clients.proto
+++ b/proto/clients/clients.proto
@@ -119,7 +119,7 @@ service Clients  {
   rpc Enable(EnableRequest) returns(google.protobuf.Empty) {}
 }
 
-message ClientsEvent {
+message ClientEvent {
   string user_id = 1;
   string space_id = 2;
 
diff --git a/proto/common/event.proto b/proto/common/event.proto
index 27592cd73bd0bdae8c0e4021dc5cde0e7ae29fa9..4acd4121ef130493184e2befe211765a58205128 100644
--- a/proto/common/event.proto
+++ b/proto/common/event.proto
@@ -8,6 +8,17 @@ import "google/protobuf/struct.proto";
 import "google/protobuf/timestamp.proto";
 import "spaces/spaces.proto";
 import "users/users.proto";
+import "organizations/organizations.proto";
+import "roles/roles.proto";
+import "clients/clients.proto";
+import "locales/locales.proto";
+import "collections/collections.proto";
+import "collaborators/collaborators.proto";
+import "files/files.proto";
+import "environments/environments.proto";
+import "extensions/extension.proto";
+import "items/items.proto";
+import "members/members.proto";
 
 message EventMetadata {
 
@@ -28,8 +39,17 @@ message Event {
   EventMetadata metadata = 10;
 
   oneof event {
-    //    UserEvent user_event = 100;
-    //    OrganizationEvent organization_event = 200;
+    account.organizations.OrganizationEvent organization = 200;
+    account.users.UserEvent user = 250;
+    account.members.MemberEvent member = 275;
     content.spaces.SpaceEvent space = 300;
+    content.environments.EnvironmentEvent environment = 400;
+    content.collections.CollectionEvent collection = 450;
+    content.roles.RoleEvent role = 500;
+    content.clients.ClientEvent client = 600;
+    content.locales.LocaleEvent locale = 700;
+    content.collaborators.CollaboratorEvent collaborator = 800;
+    files.FileEvent file = 900;
+    extensions.ExtensionEvent extension = 1000;
   }
 }
\ No newline at end of file