diff --git a/protocols/bgp/api/bgp.pb.go b/protocols/bgp/api/bgp.pb.go
index bb1cae9e39b9d64135995ef667eebae91e038891..a77d280bffcc8d38e58191dacf57d89f395f2c93 100644
--- a/protocols/bgp/api/bgp.pb.go
+++ b/protocols/bgp/api/bgp.pb.go
@@ -6,6 +6,7 @@ package api
 import (
 	context "context"
 	fmt "fmt"
+	api "github.com/bio-routing/bio-rd/net/api"
 	proto "github.com/golang/protobuf/proto"
 	grpc "google.golang.org/grpc"
 	math "math"
@@ -23,7 +24,8 @@ var _ = math.Inf
 const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type ListSessionsRequest struct {
-	NameFilter           string   `protobuf:"bytes,1,opt,name=name_filter,json=nameFilter,proto3" json:"name_filter,omitempty"`
+	NeighborIp           *api.IP  `protobuf:"bytes,1,opt,name=neighbor_ip,json=neighborIp,proto3" json:"neighbor_ip,omitempty"`
+	VrfName              string   `protobuf:"bytes,2,opt,name=vrf_name,json=vrfName,proto3" json:"vrf_name,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -54,9 +56,16 @@ func (m *ListSessionsRequest) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_ListSessionsRequest proto.InternalMessageInfo
 
-func (m *ListSessionsRequest) GetNameFilter() string {
+func (m *ListSessionsRequest) GetNeighborIp() *api.IP {
 	if m != nil {
-		return m.NameFilter
+		return m.NeighborIp
+	}
+	return nil
+}
+
+func (m *ListSessionsRequest) GetVrfName() string {
+	if m != nil {
+		return m.VrfName
 	}
 	return ""
 }
@@ -110,22 +119,24 @@ func init() {
 }
 
 var fileDescriptor_2d4ce551e16bb738 = []byte{
-	// 226 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xb2, 0x4c, 0xcf, 0x2c, 0xc9,
-	0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xca, 0xcc, 0xd7, 0x2d, 0xca, 0x2f, 0x2d, 0xc9,
-	0xcc, 0x4b, 0x87, 0xb0, 0x53, 0xf4, 0x0b, 0x8a, 0xf2, 0x4b, 0xf2, 0x93, 0xf3, 0x73, 0x8a, 0xf5,
-	0x93, 0xd2, 0x0b, 0xf4, 0x13, 0x0b, 0x32, 0x41, 0xb4, 0x1e, 0x58, 0x54, 0x88, 0x3d, 0x29, 0x33,
-	0x5f, 0x2f, 0x29, 0xbd, 0x40, 0xca, 0x96, 0x54, 0x33, 0x8a, 0x53, 0x8b, 0x8b, 0x33, 0xf3, 0xf3,
-	0x20, 0xe6, 0x28, 0x99, 0x71, 0x09, 0xfb, 0x64, 0x16, 0x97, 0x04, 0x43, 0x04, 0x8b, 0x83, 0x52,
-	0x0b, 0x4b, 0x53, 0x8b, 0x4b, 0x84, 0xe4, 0xb9, 0xb8, 0xf3, 0x12, 0x73, 0x53, 0xe3, 0xd3, 0x32,
-	0x73, 0x4a, 0x52, 0x8b, 0x24, 0x18, 0x15, 0x18, 0x35, 0x38, 0x83, 0xb8, 0x40, 0x42, 0x6e, 0x60,
-	0x11, 0x25, 0x17, 0x2e, 0x11, 0x54, 0x7d, 0xc5, 0x05, 0xf9, 0x79, 0xc5, 0xa9, 0x42, 0x3a, 0x5c,
-	0x1c, 0x50, 0x0b, 0x8a, 0x25, 0x18, 0x15, 0x98, 0x35, 0xb8, 0x8d, 0x04, 0xf4, 0xa0, 0x4e, 0xd5,
-	0x83, 0x2a, 0x0e, 0x82, 0xab, 0x30, 0x8a, 0xe6, 0xe2, 0x72, 0x4a, 0x2f, 0x08, 0x4e, 0x2d, 0x2a,
-	0xcb, 0x4c, 0x4e, 0x15, 0xf2, 0xe5, 0xe2, 0x41, 0x36, 0x53, 0x48, 0x06, 0xae, 0x13, 0x8b, 0x13,
-	0xa5, 0x64, 0x71, 0xc8, 0x42, 0x1c, 0xa2, 0xc4, 0xe0, 0x64, 0x18, 0xa5, 0x4f, 0x62, 0xd8, 0x24,
-	0xb1, 0x81, 0x85, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xc2, 0xeb, 0x52, 0x06, 0x99, 0x01,
-	0x00, 0x00,
+	// 271 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x90, 0xcf, 0x4b, 0xfc, 0x30,
+	0x10, 0xc5, 0xbf, 0xfd, 0x0a, 0xee, 0x9a, 0x7a, 0x90, 0xe8, 0xa1, 0x16, 0x85, 0xd2, 0x53, 0x0f,
+	0x6b, 0x82, 0xf5, 0xe4, 0xc1, 0xcb, 0xe2, 0x65, 0x41, 0x45, 0xba, 0x37, 0x05, 0x97, 0xa6, 0xce,
+	0x66, 0x03, 0x36, 0x89, 0x99, 0xb4, 0x7f, 0xbf, 0xf4, 0x87, 0x8b, 0x82, 0x0a, 0x7b, 0x4a, 0x78,
+	0x33, 0x9f, 0x37, 0x6f, 0x86, 0x5c, 0x4b, 0xe5, 0x37, 0x8d, 0x60, 0x95, 0xa9, 0xb9, 0x50, 0xe6,
+	0xc2, 0x99, 0xc6, 0x2b, 0x2d, 0x87, 0xff, 0x2b, 0xb7, 0xce, 0x78, 0x53, 0x99, 0x37, 0xe4, 0x42,
+	0x5a, 0x5e, 0x5a, 0xd5, 0xbd, 0xac, 0x57, 0xe9, 0x44, 0x28, 0xc3, 0x84, 0xb4, 0x31, 0xff, 0xdb,
+	0x43, 0x83, 0xef, 0x49, 0x0d, 0x7e, 0x20, 0xe3, 0x9b, 0x5d, 0x87, 0x22, 0x20, 0x2a, 0xa3, 0x07,
+	0x3c, 0x7d, 0x21, 0xc7, 0x77, 0x0a, 0xfd, 0x72, 0x10, 0xb1, 0x80, 0xf7, 0x06, 0xd0, 0xd3, 0x19,
+	0x09, 0x35, 0x28, 0xb9, 0x11, 0xc6, 0xad, 0x94, 0x8d, 0x82, 0x24, 0xc8, 0xc2, 0x3c, 0x64, 0x5d,
+	0xca, 0x6e, 0xf4, 0xe2, 0xb1, 0x20, 0x9f, 0xf5, 0x85, 0xa5, 0xa7, 0x64, 0xda, 0xba, 0xf5, 0x4a,
+	0x97, 0x35, 0x44, 0xff, 0x93, 0x20, 0x3b, 0x28, 0x26, 0xad, 0x5b, 0x3f, 0x94, 0x35, 0xa4, 0xb7,
+	0xe4, 0xe4, 0xbb, 0x3f, 0x5a, 0xa3, 0x11, 0xe8, 0x8c, 0x4c, 0xc7, 0x20, 0x18, 0x05, 0xc9, 0x5e,
+	0x16, 0xe6, 0x47, 0x6c, 0xbc, 0x01, 0x1b, 0x9b, 0x8b, 0x6d, 0x47, 0xfe, 0x4c, 0xc8, 0x5c, 0xda,
+	0x25, 0xb8, 0x56, 0x55, 0x40, 0xef, 0xc9, 0xe1, 0x57, 0x4f, 0x7a, 0xb6, 0x25, 0x7f, 0x58, 0x25,
+	0x3e, 0xff, 0xa5, 0x3a, 0x04, 0x49, 0xff, 0xcd, 0x2f, 0x9f, 0xf8, 0x8e, 0x37, 0x14, 0xfb, 0xbd,
+	0x74, 0xf5, 0x11, 0x00, 0x00, 0xff, 0xff, 0x70, 0x64, 0xa0, 0xba, 0xf2, 0x01, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/protocols/bgp/api/bgp.proto b/protocols/bgp/api/bgp.proto
index 8ff46a8d6dcfce4593cbba4275fd191ace7ae5c5..76ae6f956d2cb3af2850f2469f7e4cca787d37b1 100644
--- a/protocols/bgp/api/bgp.proto
+++ b/protocols/bgp/api/bgp.proto
@@ -2,11 +2,13 @@ syntax = "proto3";
 
 package bio.bgp;
 
+import "github.com/bio-routing/bio-rd/net/api/net.proto";
 import "github.com/bio-routing/bio-rd/protocols/bgp/api/session.proto";
 option go_package = "github.com/bio-routing/bio-rd/protocols/bgp/api";
 
 message ListSessionsRequest {
-    string name_filter = 1;
+    bio.net.IP neighbor_ip = 1;
+    string vrf_name = 2;
 }
 
 message ListSessionsResponse {