diff --git a/aruna/api/google b/aruna/api/google
index e8cca305..1c4f24e6 160000
--- a/aruna/api/google
+++ b/aruna/api/google
@@ -1 +1 @@
-Subproject commit e8cca30589a3fadf8e93954bd30197ef12a39ff8
+Subproject commit 1c4f24e66d8559a680e472eab70ccfb1e6fbd685
diff --git a/aruna/api/notification/services/v2/notification_service.proto b/aruna/api/notification/services/v2/notification_service.proto
index f9840962..5b9c03b3 100644
--- a/aruna/api/notification/services/v2/notification_service.proto
+++ b/aruna/api/notification/services/v2/notification_service.proto
@@ -24,19 +24,19 @@ service EventNotificationService {
 
   // GetEventMessageBatch
   //
-  // Reads a set of messages from a given stream group
-  // Each message contains a separate acknowledgement message that is protected by a salt and an hmac for verification
-  // The message can be send directly through the AcknowledgeMessageBatch call to acknowledge the message
+  // Reads a set of messages from a given stream group 
+  // Each message contains a separate acknowledgement message thatis protected by a salt and an hmac for verification.
+  // The message can be send directly through the AcknowledgeMessageBatch call to acknowledge the message.
   rpc GetEventMessageBatch(GetEventMessageBatchRequest) 
       returns (GetEventMessageBatchResponse) {}
 
   // GetEventMessageBatch
   //
-  // Reads a set of messages from a given stream group
-  // Each message contains a separate acknowledgement message that is protected by a salt and an hmac for verification
-  // The message can be send directly through the AcknowledgeMessageBatch call to acknowledge the message
-  rpc GetEventMessageBatchStream(GetEventMessageBatchStreamRequest) 
-      returns (stream GetEventMessageBatchStreamResponse) {}
+  // Opens a stream which pushes each received notification individual and just-in-time.
+  // Each message contains a separate acknowledgement message that is protected by a salt and an hmac for verification.
+  // The message can be send directly through the AcknowledgeMessageBatch call to acknowledge the message.
+  rpc GetEventMessageStream(GetEventMessageStreamRequest) 
+      returns (stream GetEventMessageStreamResponse) {}
 
   // AcknowledgeMessageBatch
   //
@@ -55,10 +55,9 @@ service EventNotificationService {
 
 message Resource {
   string resource_id = 1;
-  string associated_id = 2;
-  bool persistent_resource_id = 3;
-  string checksum = 4;
-  storage.models.v2.ResourceVariant resource_variant = 5;
+  bool persistent_resource_id = 2;
+  string checksum = 3;
+  storage.models.v2.ResourceVariant resource_variant = 4;
 }
 
 message ResourceTarget {
@@ -92,13 +91,12 @@ message GetEventMessageBatchResponse {
   repeated EventMessage messages = 1;
 }
 
-message GetEventMessageBatchStreamRequest {
+message GetEventMessageStreamRequest {
   string stream_consumer = 1;
-  uint32 batch_size = 2;
 }
 
-message GetEventMessageBatchStreamResponse {
-  repeated EventMessage messages = 1;
+message GetEventMessageStreamResponse {
+  EventMessage messages = 1;
 }
 
 message AcknowledgeMessageBatchRequest {
@@ -177,8 +175,8 @@ message AnouncementEvent {
     string new_data_proxy_id = 1;
     string remove_data_proxy_id = 2;
     string update_data_proxy_id = 3;
-    bool new_pubkey = 4;
-    bool remove_pubkey = 5;
+    int32 new_pubkey = 4;
+    int32 remove_pubkey = 5;
     ScheduledDowntime downtime = 6;
     NewVersion version = 7;
   }
diff --git a/aruna/api/storage/models/v2/models.proto b/aruna/api/storage/models/v2/models.proto
index 10719bb9..619e898b 100644
--- a/aruna/api/storage/models/v2/models.proto
+++ b/aruna/api/storage/models/v2/models.proto
@@ -164,8 +164,9 @@ message UserAttributes {
   bool global_admin = 1;
   bool service_account = 2;
   repeated Token tokens = 3;
-  repeated CustomAttributes custom_attributes = 4; 
-  repeated Permission personal_permissions = 5;
+  repeated string trusted_endpoints = 4;
+  repeated CustomAttributes custom_attributes = 5; 
+  repeated Permission personal_permissions = 6;
 }
 
 // --------------- RELATION / KEYVALUES -------------------
@@ -234,6 +235,12 @@ message Endpoint {
   repeated EndpointHostConfig host_configs = 6;
 }
 
+message DataEndpoint {
+  string id = 1;
+  // Hint if the objects' project 
+  // is fully synced to the endpoint
+  bool full_synced = 2;
+}
 
 message Copy {
   string resource = 1;
@@ -274,6 +281,7 @@ message Project {
   string created_by = 9;
   Status status = 10;
   bool dynamic = 11;
+  repeated DataEndpoint endpoints = 12;
 }
 
 
@@ -291,6 +299,7 @@ message Collection {
   string created_by = 9;
   Status status = 10;
   bool dynamic = 11;
+  repeated DataEndpoint endpoints = 12;
 }
 
 message Dataset {
@@ -307,6 +316,7 @@ message Dataset {
   string created_by = 9;
   Status status = 10;
   bool dynamic = 11;
+  repeated DataEndpoint endpoints = 12;
 }
 
 message Object {
@@ -323,6 +333,7 @@ message Object {
   string created_by = 9;
   Status status = 10;
   bool dynamic = 11;
+  repeated DataEndpoint endpoints = 12;
   // Object specific attributes
-  repeated Hash hashes = 12;  
+  repeated Hash hashes = 13;  
 }
\ No newline at end of file
diff --git a/aruna/api/storage/services/v2/project_service.proto b/aruna/api/storage/services/v2/project_service.proto
index bda78efd..0c5a465d 100644
--- a/aruna/api/storage/services/v2/project_service.proto
+++ b/aruna/api/storage/services/v2/project_service.proto
@@ -161,6 +161,8 @@ message CreateProjectRequest {
   repeated storage.models.v2.ExternalRelation external_relations = 4;
   // DataClass
   storage.models.v2.DataClass data_class = 5;
+  // Preferred endpoint
+  string preferred_endpoint = 6;
 }
 
 message CreateProjectResponse {