diff --git a/kmsetsiproto/kmsetsiproto.pb.go b/kmsetsiproto/kmsetsiproto.pb.go
index 0df25eda0dc3493c2c6bf5d076713f27a5ad8386..69bd7dfe333e844cbb70d61fd7bd4e3418ed9a54 100644
--- a/kmsetsiproto/kmsetsiproto.pb.go
+++ b/kmsetsiproto/kmsetsiproto.pb.go
@@ -248,7 +248,7 @@ func (*ETSIKMSPeerListRequest) Descriptor() ([]byte, []int) {
 	return file_kmsetsiproto_proto_rawDescGZIP(), []int{4}
 }
 
-type ETSIKMSPeerListReply struct {
+type ETSIKMSPeer struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -257,8 +257,8 @@ type ETSIKMSPeerListReply struct {
 	PeerStatus string `protobuf:"bytes,2,opt,name=peerStatus,proto3" json:"peerStatus,omitempty"`
 }
 
-func (x *ETSIKMSPeerListReply) Reset() {
-	*x = ETSIKMSPeerListReply{}
+func (x *ETSIKMSPeer) Reset() {
+	*x = ETSIKMSPeer{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_kmsetsiproto_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -266,13 +266,13 @@ func (x *ETSIKMSPeerListReply) Reset() {
 	}
 }
 
-func (x *ETSIKMSPeerListReply) String() string {
+func (x *ETSIKMSPeer) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*ETSIKMSPeerListReply) ProtoMessage() {}
+func (*ETSIKMSPeer) ProtoMessage() {}
 
-func (x *ETSIKMSPeerListReply) ProtoReflect() protoreflect.Message {
+func (x *ETSIKMSPeer) ProtoReflect() protoreflect.Message {
 	mi := &file_kmsetsiproto_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -284,25 +284,72 @@ func (x *ETSIKMSPeerListReply) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use ETSIKMSPeerListReply.ProtoReflect.Descriptor instead.
-func (*ETSIKMSPeerListReply) Descriptor() ([]byte, []int) {
+// Deprecated: Use ETSIKMSPeer.ProtoReflect.Descriptor instead.
+func (*ETSIKMSPeer) Descriptor() ([]byte, []int) {
 	return file_kmsetsiproto_proto_rawDescGZIP(), []int{5}
 }
 
-func (x *ETSIKMSPeerListReply) GetPeerName() string {
+func (x *ETSIKMSPeer) GetPeerName() string {
 	if x != nil {
 		return x.PeerName
 	}
 	return ""
 }
 
-func (x *ETSIKMSPeerListReply) GetPeerStatus() string {
+func (x *ETSIKMSPeer) GetPeerStatus() string {
 	if x != nil {
 		return x.PeerStatus
 	}
 	return ""
 }
 
+type ETSIKMSPeerListReply struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Peer []*ETSIKMSPeer `protobuf:"bytes,1,rep,name=peer,proto3" json:"peer,omitempty"`
+}
+
+func (x *ETSIKMSPeerListReply) Reset() {
+	*x = ETSIKMSPeerListReply{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_kmsetsiproto_proto_msgTypes[6]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ETSIKMSPeerListReply) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ETSIKMSPeerListReply) ProtoMessage() {}
+
+func (x *ETSIKMSPeerListReply) ProtoReflect() protoreflect.Message {
+	mi := &file_kmsetsiproto_proto_msgTypes[6]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ETSIKMSPeerListReply.ProtoReflect.Descriptor instead.
+func (*ETSIKMSPeerListReply) Descriptor() ([]byte, []int) {
+	return file_kmsetsiproto_proto_rawDescGZIP(), []int{6}
+}
+
+func (x *ETSIKMSPeerListReply) GetPeer() []*ETSIKMSPeer {
+	if x != nil {
+		return x.Peer
+	}
+	return nil
+}
+
 type ETSIGetEncryptKeys256BitRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -314,7 +361,7 @@ type ETSIGetEncryptKeys256BitRequest struct {
 func (x *ETSIGetEncryptKeys256BitRequest) Reset() {
 	*x = ETSIGetEncryptKeys256BitRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_kmsetsiproto_proto_msgTypes[6]
+		mi := &file_kmsetsiproto_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -327,7 +374,7 @@ func (x *ETSIGetEncryptKeys256BitRequest) String() string {
 func (*ETSIGetEncryptKeys256BitRequest) ProtoMessage() {}
 
 func (x *ETSIGetEncryptKeys256BitRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_kmsetsiproto_proto_msgTypes[6]
+	mi := &file_kmsetsiproto_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -340,7 +387,7 @@ func (x *ETSIGetEncryptKeys256BitRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ETSIGetEncryptKeys256BitRequest.ProtoReflect.Descriptor instead.
 func (*ETSIGetEncryptKeys256BitRequest) Descriptor() ([]byte, []int) {
-	return file_kmsetsiproto_proto_rawDescGZIP(), []int{6}
+	return file_kmsetsiproto_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *ETSIGetEncryptKeys256BitRequest) GetAmount() int64 {
@@ -362,7 +409,7 @@ type ETSIGetEncryptKeys256BitReply struct {
 func (x *ETSIGetEncryptKeys256BitReply) Reset() {
 	*x = ETSIGetEncryptKeys256BitReply{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_kmsetsiproto_proto_msgTypes[7]
+		mi := &file_kmsetsiproto_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -375,7 +422,7 @@ func (x *ETSIGetEncryptKeys256BitReply) String() string {
 func (*ETSIGetEncryptKeys256BitReply) ProtoMessage() {}
 
 func (x *ETSIGetEncryptKeys256BitReply) ProtoReflect() protoreflect.Message {
-	mi := &file_kmsetsiproto_proto_msgTypes[7]
+	mi := &file_kmsetsiproto_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -388,7 +435,7 @@ func (x *ETSIGetEncryptKeys256BitReply) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ETSIGetEncryptKeys256BitReply.ProtoReflect.Descriptor instead.
 func (*ETSIGetEncryptKeys256BitReply) Descriptor() ([]byte, []int) {
-	return file_kmsetsiproto_proto_rawDescGZIP(), []int{7}
+	return file_kmsetsiproto_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *ETSIGetEncryptKeys256BitReply) GetKeyID() string {
@@ -426,56 +473,59 @@ var file_kmsetsiproto_proto_rawDesc = []byte{
 	0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6b, 0x6d, 0x73,
 	0x50, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x18, 0x0a, 0x16, 0x45, 0x54, 0x53, 0x49,
 	0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x22, 0x52, 0x0a, 0x14, 0x45, 0x54, 0x53, 0x49, 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65,
-	0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x65,
-	0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x65,
-	0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x65, 0x65, 0x72, 0x53, 0x74,
-	0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x65, 0x65, 0x72,
-	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x39, 0x0a, 0x1f, 0x45, 0x54, 0x53, 0x49, 0x47, 0x65,
-	0x74, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x32, 0x35, 0x36, 0x42,
-	0x69, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f,
-	0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e,
-	0x74, 0x22, 0x47, 0x0a, 0x1d, 0x45, 0x54, 0x53, 0x49, 0x47, 0x65, 0x74, 0x45, 0x6e, 0x63, 0x72,
-	0x79, 0x70, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x32, 0x35, 0x36, 0x42, 0x69, 0x74, 0x52, 0x65, 0x70,
-	0x6c, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x6b, 0x65, 0x79, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x05, 0x6b, 0x65, 0x79, 0x49, 0x44, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x32, 0xf3, 0x03, 0x0a, 0x07, 0x4b,
-	0x6d, 0x73, 0x45, 0x54, 0x53, 0x49, 0x12, 0x60, 0x0a, 0x10, 0x45, 0x54, 0x53, 0x49, 0x43, 0x61,
-	0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x12, 0x25, 0x2e, 0x6b, 0x6d, 0x73,
-	0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x54, 0x53, 0x49, 0x43, 0x61,
-	0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x23, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x45, 0x54, 0x53, 0x49, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65,
-	0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x54, 0x0a, 0x0e, 0x45, 0x54, 0x53, 0x49,
-	0x41, 0x64, 0x64, 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65, 0x72, 0x12, 0x20, 0x2e, 0x6b, 0x6d, 0x73,
+	0x73, 0x74, 0x22, 0x49, 0x0a, 0x0b, 0x45, 0x54, 0x53, 0x49, 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65,
+	0x72, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x65, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a,
+	0x0a, 0x70, 0x65, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x0a, 0x70, 0x65, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x45, 0x0a,
+	0x14, 0x45, 0x54, 0x53, 0x49, 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74,
+	0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x2d, 0x0a, 0x04, 0x70, 0x65, 0x65, 0x72, 0x18, 0x01, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x2e, 0x45, 0x54, 0x53, 0x49, 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65, 0x72, 0x52, 0x04,
+	0x70, 0x65, 0x65, 0x72, 0x22, 0x39, 0x0a, 0x1f, 0x45, 0x54, 0x53, 0x49, 0x47, 0x65, 0x74, 0x45,
+	0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x32, 0x35, 0x36, 0x42, 0x69, 0x74,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e,
+	0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22,
+	0x47, 0x0a, 0x1d, 0x45, 0x54, 0x53, 0x49, 0x47, 0x65, 0x74, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70,
+	0x74, 0x4b, 0x65, 0x79, 0x73, 0x32, 0x35, 0x36, 0x42, 0x69, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79,
+	0x12, 0x14, 0x0a, 0x05, 0x6b, 0x65, 0x79, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x05, 0x6b, 0x65, 0x79, 0x49, 0x44, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0c, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x32, 0xf3, 0x03, 0x0a, 0x07, 0x4b, 0x6d, 0x73,
+	0x45, 0x54, 0x53, 0x49, 0x12, 0x60, 0x0a, 0x10, 0x45, 0x54, 0x53, 0x49, 0x43, 0x61, 0x70, 0x61,
+	0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x12, 0x25, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74,
+	0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x54, 0x53, 0x49, 0x43, 0x61, 0x70, 0x61,
+	0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x23, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45,
+	0x54, 0x53, 0x49, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x52,
+	0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x54, 0x0a, 0x0e, 0x45, 0x54, 0x53, 0x49, 0x41, 0x64,
+	0x64, 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65, 0x72, 0x12, 0x20, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74,
+	0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x54, 0x53, 0x49, 0x4b, 0x4d, 0x53, 0x50,
+	0x65, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x6b, 0x6d, 0x73,
 	0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x54, 0x53, 0x49, 0x4b, 0x4d,
-	0x53, 0x50, 0x65, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x6b,
-	0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x54, 0x53, 0x49,
-	0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65, 0x72, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x57,
-	0x0a, 0x11, 0x45, 0x54, 0x53, 0x49, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x4b, 0x4d, 0x53, 0x50,
-	0x65, 0x65, 0x72, 0x12, 0x20, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f,
+	0x53, 0x50, 0x65, 0x65, 0x72, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x57, 0x0a, 0x11,
+	0x45, 0x54, 0x53, 0x49, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65,
+	0x72, 0x12, 0x20, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2e, 0x45, 0x54, 0x53, 0x49, 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x2e, 0x45, 0x54, 0x53, 0x49, 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65, 0x72, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x54, 0x53, 0x49, 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65, 0x72,
-	0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x5d, 0x0a, 0x0f, 0x45, 0x54, 0x53, 0x49, 0x47,
-	0x65, 0x74, 0x50, 0x65, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x24, 0x2e, 0x6b, 0x6d, 0x73,
-	0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x54, 0x53, 0x49, 0x4b, 0x4d,
-	0x53, 0x50, 0x65, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x22, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x45, 0x54, 0x53, 0x49, 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52,
-	0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x78, 0x0a, 0x18, 0x45, 0x54, 0x53, 0x49, 0x47, 0x65,
-	0x74, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x32, 0x35, 0x36, 0x42,
-	0x69, 0x74, 0x12, 0x2d, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x45, 0x54, 0x53, 0x49, 0x47, 0x65, 0x74, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74,
-	0x4b, 0x65, 0x79, 0x73, 0x32, 0x35, 0x36, 0x42, 0x69, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x2b, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x45, 0x54, 0x53, 0x49, 0x47, 0x65, 0x74, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x4b,
-	0x65, 0x79, 0x73, 0x32, 0x35, 0x36, 0x42, 0x69, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00,
-	0x42, 0x37, 0x5a, 0x35, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x66, 0x62, 0x69, 0x2e, 0x68, 0x2d, 0x64,
-	0x61, 0x2e, 0x64, 0x65, 0x2f, 0x6d, 0x2e, 0x73, 0x74, 0x69, 0x65, 0x6d, 0x65, 0x72, 0x6c, 0x69,
-	0x6e, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x6b, 0x6d, 0x73, 0x2f, 0x6b, 0x6d, 0x73,
-	0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x5d, 0x0a, 0x0f, 0x45, 0x54, 0x53, 0x49, 0x47, 0x65, 0x74,
+	0x50, 0x65, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x24, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74,
+	0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x54, 0x53, 0x49, 0x4b, 0x4d, 0x53, 0x50,
+	0x65, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22,
+	0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45, 0x54,
+	0x53, 0x49, 0x4b, 0x4d, 0x53, 0x50, 0x65, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x70,
+	0x6c, 0x79, 0x22, 0x00, 0x12, 0x78, 0x0a, 0x18, 0x45, 0x54, 0x53, 0x49, 0x47, 0x65, 0x74, 0x45,
+	0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x4b, 0x65, 0x79, 0x73, 0x32, 0x35, 0x36, 0x42, 0x69, 0x74,
+	0x12, 0x2d, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x45, 0x54, 0x53, 0x49, 0x47, 0x65, 0x74, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x4b, 0x65,
+	0x79, 0x73, 0x32, 0x35, 0x36, 0x42, 0x69, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x2b, 0x2e, 0x6b, 0x6d, 0x73, 0x65, 0x74, 0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x45,
+	0x54, 0x53, 0x49, 0x47, 0x65, 0x74, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x4b, 0x65, 0x79,
+	0x73, 0x32, 0x35, 0x36, 0x42, 0x69, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x42, 0x37,
+	0x5a, 0x35, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x66, 0x62, 0x69, 0x2e, 0x68, 0x2d, 0x64, 0x61, 0x2e,
+	0x64, 0x65, 0x2f, 0x6d, 0x2e, 0x73, 0x74, 0x69, 0x65, 0x6d, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x67,
+	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2d, 0x6b, 0x6d, 0x73, 0x2f, 0x6b, 0x6d, 0x73, 0x65, 0x74,
+	0x73, 0x69, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -490,33 +540,35 @@ func file_kmsetsiproto_proto_rawDescGZIP() []byte {
 	return file_kmsetsiproto_proto_rawDescData
 }
 
-var file_kmsetsiproto_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
+var file_kmsetsiproto_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
 var file_kmsetsiproto_proto_goTypes = []interface{}{
 	(*ETSICapabilitiesRequest)(nil),         // 0: kmsetsiproto.ETSICapabilitiesRequest
 	(*ETSICapabilitiesReply)(nil),           // 1: kmsetsiproto.ETSICapabilitiesReply
 	(*ETSIKMSPeerRequest)(nil),              // 2: kmsetsiproto.ETSIKMSPeerRequest
 	(*ETSIKMSPeerReply)(nil),                // 3: kmsetsiproto.ETSIKMSPeerReply
 	(*ETSIKMSPeerListRequest)(nil),          // 4: kmsetsiproto.ETSIKMSPeerListRequest
-	(*ETSIKMSPeerListReply)(nil),            // 5: kmsetsiproto.ETSIKMSPeerListReply
-	(*ETSIGetEncryptKeys256BitRequest)(nil), // 6: kmsetsiproto.ETSIGetEncryptKeys256BitRequest
-	(*ETSIGetEncryptKeys256BitReply)(nil),   // 7: kmsetsiproto.ETSIGetEncryptKeys256BitReply
+	(*ETSIKMSPeer)(nil),                     // 5: kmsetsiproto.ETSIKMSPeer
+	(*ETSIKMSPeerListReply)(nil),            // 6: kmsetsiproto.ETSIKMSPeerListReply
+	(*ETSIGetEncryptKeys256BitRequest)(nil), // 7: kmsetsiproto.ETSIGetEncryptKeys256BitRequest
+	(*ETSIGetEncryptKeys256BitReply)(nil),   // 8: kmsetsiproto.ETSIGetEncryptKeys256BitReply
 }
 var file_kmsetsiproto_proto_depIdxs = []int32{
-	0, // 0: kmsetsiproto.KmsETSI.ETSICapabilities:input_type -> kmsetsiproto.ETSICapabilitiesRequest
-	2, // 1: kmsetsiproto.KmsETSI.ETSIAddKMSPeer:input_type -> kmsetsiproto.ETSIKMSPeerRequest
-	2, // 2: kmsetsiproto.KmsETSI.ETSIRemoveKMSPeer:input_type -> kmsetsiproto.ETSIKMSPeerRequest
-	4, // 3: kmsetsiproto.KmsETSI.ETSIGetPeerList:input_type -> kmsetsiproto.ETSIKMSPeerListRequest
-	6, // 4: kmsetsiproto.KmsETSI.ETSIGetEncryptKeys256Bit:input_type -> kmsetsiproto.ETSIGetEncryptKeys256BitRequest
-	1, // 5: kmsetsiproto.KmsETSI.ETSICapabilities:output_type -> kmsetsiproto.ETSICapabilitiesReply
-	3, // 6: kmsetsiproto.KmsETSI.ETSIAddKMSPeer:output_type -> kmsetsiproto.ETSIKMSPeerReply
-	3, // 7: kmsetsiproto.KmsETSI.ETSIRemoveKMSPeer:output_type -> kmsetsiproto.ETSIKMSPeerReply
-	5, // 8: kmsetsiproto.KmsETSI.ETSIGetPeerList:output_type -> kmsetsiproto.ETSIKMSPeerListReply
-	7, // 9: kmsetsiproto.KmsETSI.ETSIGetEncryptKeys256Bit:output_type -> kmsetsiproto.ETSIGetEncryptKeys256BitReply
-	5, // [5:10] is the sub-list for method output_type
-	0, // [0:5] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
+	5, // 0: kmsetsiproto.ETSIKMSPeerListReply.peer:type_name -> kmsetsiproto.ETSIKMSPeer
+	0, // 1: kmsetsiproto.KmsETSI.ETSICapabilities:input_type -> kmsetsiproto.ETSICapabilitiesRequest
+	2, // 2: kmsetsiproto.KmsETSI.ETSIAddKMSPeer:input_type -> kmsetsiproto.ETSIKMSPeerRequest
+	2, // 3: kmsetsiproto.KmsETSI.ETSIRemoveKMSPeer:input_type -> kmsetsiproto.ETSIKMSPeerRequest
+	4, // 4: kmsetsiproto.KmsETSI.ETSIGetPeerList:input_type -> kmsetsiproto.ETSIKMSPeerListRequest
+	7, // 5: kmsetsiproto.KmsETSI.ETSIGetEncryptKeys256Bit:input_type -> kmsetsiproto.ETSIGetEncryptKeys256BitRequest
+	1, // 6: kmsetsiproto.KmsETSI.ETSICapabilities:output_type -> kmsetsiproto.ETSICapabilitiesReply
+	3, // 7: kmsetsiproto.KmsETSI.ETSIAddKMSPeer:output_type -> kmsetsiproto.ETSIKMSPeerReply
+	3, // 8: kmsetsiproto.KmsETSI.ETSIRemoveKMSPeer:output_type -> kmsetsiproto.ETSIKMSPeerReply
+	6, // 9: kmsetsiproto.KmsETSI.ETSIGetPeerList:output_type -> kmsetsiproto.ETSIKMSPeerListReply
+	8, // 10: kmsetsiproto.KmsETSI.ETSIGetEncryptKeys256Bit:output_type -> kmsetsiproto.ETSIGetEncryptKeys256BitReply
+	6, // [6:11] is the sub-list for method output_type
+	1, // [1:6] is the sub-list for method input_type
+	1, // [1:1] is the sub-list for extension type_name
+	1, // [1:1] is the sub-list for extension extendee
+	0, // [0:1] is the sub-list for field type_name
 }
 
 func init() { file_kmsetsiproto_proto_init() }
@@ -586,7 +638,7 @@ func file_kmsetsiproto_proto_init() {
 			}
 		}
 		file_kmsetsiproto_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ETSIKMSPeerListReply); i {
+			switch v := v.(*ETSIKMSPeer); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -598,7 +650,7 @@ func file_kmsetsiproto_proto_init() {
 			}
 		}
 		file_kmsetsiproto_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ETSIGetEncryptKeys256BitRequest); i {
+			switch v := v.(*ETSIKMSPeerListReply); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -610,6 +662,18 @@ func file_kmsetsiproto_proto_init() {
 			}
 		}
 		file_kmsetsiproto_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ETSIGetEncryptKeys256BitRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_kmsetsiproto_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ETSIGetEncryptKeys256BitReply); i {
 			case 0:
 				return &v.state
@@ -628,7 +692,7 @@ func file_kmsetsiproto_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_kmsetsiproto_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   8,
+			NumMessages:   9,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
diff --git a/kmsetsiproto/kmsetsiproto.proto b/kmsetsiproto/kmsetsiproto.proto
index fea368f7efbed18d796eb7539f0c753f87a0a3f5..e27ad82c61dad89e5815c17a53d25df6e23303ff 100644
--- a/kmsetsiproto/kmsetsiproto.proto
+++ b/kmsetsiproto/kmsetsiproto.proto
@@ -34,9 +34,14 @@ message ETSIKMSPeerReply {
 message ETSIKMSPeerListRequest {
 }
 
-message ETSIKMSPeerListReply {
+message ETSIKMSPeer {
   string peerName = 1;
   string peerStatus = 2;
+
+}
+
+message ETSIKMSPeerListReply {
+  repeated ETSIKMSPeer peer = 1;
 }
 
 message ETSIGetEncryptKeys256BitRequest {