diff --git a/waku/message/v1/message.proto b/waku/message/v1/message.proto
index b48b22e..292db84 100644
--- a/waku/message/v1/message.proto
+++ b/waku/message/v1/message.proto
@@ -10,4 +10,5 @@ message WakuMessage {
   optional sint64 timestamp = 10;
   optional bytes meta = 11;
   optional bool ephemeral = 31;
+  optional bytes rate_limit_proof = 21;
 }
diff --git a/waku/rln/v1/rln.proto b/waku/rln/v1/rln.proto
new file mode 100644
index 0000000..99fb517
--- /dev/null
+++ b/waku/rln/v1/rln.proto
@@ -0,0 +1,14 @@
+syntax = "proto3";
+
+// rfc: https://rfc.vac.dev/spec/17/
+package waku.rln.v1;
+
+message RateLimitProof {
+  bytes proof = 1;
+  bytes merkle_root = 2;
+  bytes epoch = 3;
+  bytes share_x = 4;
+  bytes share_y = 5;
+  bytes nullifier = 6;
+  bytes rln_identifier = 7;
+}
diff --git a/waku/store/v2beta4/store.proto b/waku/store/v2beta4/store.proto
index c208262..27f9c3c 100644
--- a/waku/store/v2beta4/store.proto
+++ b/waku/store/v2beta4/store.proto
@@ -14,13 +14,13 @@ message Index {
 }
 
 message PagingInfo {
-  optional uint64 page_size = 1;
-  optional Index cursor = 2;
+  uint64 page_size = 1;
+  Index cursor = 2;
   enum Direction {
     BACKWARD = 0;
     FORWARD = 1;
   }
-  optional Direction direction = 3;
+  Direction direction = 3;
 }
 
 message ContentFilter {
@@ -29,9 +29,9 @@ message ContentFilter {
 
 message HistoryQuery {
   // The first field is reserved for future use
-  optional string pubsub_topic = 2;
+  string pubsub_topic = 2;
   repeated ContentFilter content_filters = 3;
-  optional PagingInfo paging_info = 4;
+  PagingInfo paging_info = 4;
   optional sint64 start_time = 5;
   optional sint64 end_time = 6;
 }
@@ -39,7 +39,7 @@ message HistoryQuery {
 message HistoryResponse {
   // The first field is reserved for future use
   repeated waku.message.v1.WakuMessage messages = 2;
-  optional PagingInfo paging_info = 3;
+  PagingInfo paging_info = 3;
   enum Error {
     NONE = 0;
     INVALID_CURSOR = 1;
@@ -49,6 +49,6 @@ message HistoryResponse {
 
 message HistoryRPC {
   string request_id = 1;
-  optional HistoryQuery query = 2;
-  optional HistoryResponse response = 3;
+  HistoryQuery query = 2;
+  HistoryResponse response = 3;
 }