diff --git a/waku/v2/node/waku_payload.go b/waku/v2/node/waku_payload.go
index 77b1351b..8681d7d4 100644
--- a/waku/v2/node/waku_payload.go
+++ b/waku/v2/node/waku_payload.go
@@ -97,7 +97,6 @@ func DecodePayload(message *protocol.WakuMessage, keyInfo *KeyInfo) (*DecodedPay
 			if keyInfo.SymKey == nil {
 				return nil, errors.New("Symmetric key is required")
 			}
-			fmt.Println("AAA")
 
 			decodedData, err := decryptSymmetric(message.Payload, keyInfo.SymKey)
 			if err != nil {
diff --git a/waku/v2/protocol/waku_message.pb.go b/waku/v2/protocol/waku_message.pb.go
index 74dfc8ae..726867f0 100644
--- a/waku/v2/protocol/waku_message.pb.go
+++ b/waku/v2/protocol/waku_message.pb.go
@@ -30,11 +30,11 @@ type WakuMessage struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Payload      []byte  `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"`
-	ContentTopic uint32  `protobuf:"varint,2,opt,name=contentTopic,proto3" json:"contentTopic,omitempty"`
-	Version      uint32  `protobuf:"varint,3,opt,name=version,proto3" json:"version,omitempty"`
-	Proof        []byte  `protobuf:"bytes,4,opt,name=proof,proto3" json:"proof,omitempty"`
-	Timestamp    float64 `protobuf:"fixed64,5,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
+	Payload      []byte   `protobuf:"bytes,1,opt,name=payload,proto3,oneof" json:"payload,omitempty"`
+	ContentTopic *uint32  `protobuf:"varint,2,opt,name=contentTopic,proto3,oneof" json:"contentTopic,omitempty"`
+	Version      *uint32  `protobuf:"varint,3,opt,name=version,proto3,oneof" json:"version,omitempty"`
+	Proof        []byte   `protobuf:"bytes,4,opt,name=proof,proto3,oneof" json:"proof,omitempty"`
+	Timestamp    *float64 `protobuf:"fixed64,5,opt,name=timestamp,proto3,oneof" json:"timestamp,omitempty"`
 }
 
 func (x *WakuMessage) Reset() {
@@ -77,15 +77,15 @@ func (x *WakuMessage) GetPayload() []byte {
 }
 
 func (x *WakuMessage) GetContentTopic() uint32 {
-	if x != nil {
-		return x.ContentTopic
+	if x != nil && x.ContentTopic != nil {
+		return *x.ContentTopic
 	}
 	return 0
 }
 
 func (x *WakuMessage) GetVersion() uint32 {
-	if x != nil {
-		return x.Version
+	if x != nil && x.Version != nil {
+		return *x.Version
 	}
 	return 0
 }
@@ -98,8 +98,8 @@ func (x *WakuMessage) GetProof() []byte {
 }
 
 func (x *WakuMessage) GetTimestamp() float64 {
-	if x != nil {
-		return x.Timestamp
+	if x != nil && x.Timestamp != nil {
+		return *x.Timestamp
 	}
 	return 0
 }
@@ -108,18 +108,23 @@ var File_waku_message_proto protoreflect.FileDescriptor
 
 var file_waku_message_proto_rawDesc = []byte{
 	0x0a, 0x12, 0x77, 0x61, 0x6b, 0x75, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x22, 0x99,
-	0x01, 0x0a, 0x0b, 0x57, 0x61, 0x6b, 0x75, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x18,
-	0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52,
-	0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x6f, 0x6e, 0x74,
-	0x65, 0x6e, 0x74, 0x54, 0x6f, 0x70, 0x69, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0c,
-	0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x54, 0x6f, 0x70, 0x69, 0x63, 0x12, 0x18, 0x0a, 0x07,
-	0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x76,
-	0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x12, 0x1c, 0x0a, 0x09,
-	0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x01, 0x52,
-	0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
+	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x22, 0xf3,
+	0x01, 0x0a, 0x0b, 0x57, 0x61, 0x6b, 0x75, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x1d,
+	0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x48,
+	0x00, 0x52, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x88, 0x01, 0x01, 0x12, 0x27, 0x0a,
+	0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x54, 0x6f, 0x70, 0x69, 0x63, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0d, 0x48, 0x01, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x54, 0x6f,
+	0x70, 0x69, 0x63, 0x88, 0x01, 0x01, 0x12, 0x1d, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f,
+	0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x02, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69,
+	0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x19, 0x0a, 0x05, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x0c, 0x48, 0x03, 0x52, 0x05, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x88, 0x01, 0x01,
+	0x12, 0x21, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x05, 0x20,
+	0x01, 0x28, 0x01, 0x48, 0x04, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70,
+	0x88, 0x01, 0x01, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x42,
+	0x0f, 0x0a, 0x0d, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x54, 0x6f, 0x70, 0x69, 0x63,
+	0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0x0a, 0x06,
+	0x5f, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x73,
+	0x74, 0x61, 0x6d, 0x70, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -165,6 +170,7 @@ func file_waku_message_proto_init() {
 			}
 		}
 	}
+	file_waku_message_proto_msgTypes[0].OneofWrappers = []interface{}{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
diff --git a/waku/v2/protocol/waku_message.proto b/waku/v2/protocol/waku_message.proto
index c09e7401..1e5b5ab5 100644
--- a/waku/v2/protocol/waku_message.proto
+++ b/waku/v2/protocol/waku_message.proto
@@ -3,9 +3,9 @@ syntax = "proto3";
 package protocol;
 
 message WakuMessage {
-    bytes payload = 1;
-    uint32 contentTopic = 2;
-    uint32 version = 3;
-    bytes proof = 4;
-    double timestamp = 5;
+    optional bytes payload = 1;
+    optional uint32 contentTopic = 2;
+    optional uint32 version = 3;
+    optional bytes proof = 4;
+    optional double timestamp = 5;
 }
\ No newline at end of file
diff --git a/waku/v2/protocol/waku_store/waku_store.go b/waku/v2/protocol/waku_store/waku_store.go
index a9adabc0..977c691a 100644
--- a/waku/v2/protocol/waku_store/waku_store.go
+++ b/waku/v2/protocol/waku_store/waku_store.go
@@ -148,7 +148,7 @@ func (w *WakuStore) FindMessages(query *protocol.HistoryQuery) *protocol.History
 	// data holds IndexedWakuMessage whose topics match the query
 	var data []IndexedWakuMessage
 	for _, indexedMsg := range w.messages {
-		if contains(query.Topics, indexedMsg.msg.ContentTopic) {
+		if contains(query.Topics, *indexedMsg.msg.ContentTopic) {
 			data = append(data, indexedMsg)
 		}
 	}