diff --git a/Makefile b/Makefile
index efeea2d..0cd8f91 100644
--- a/Makefile
+++ b/Makefile
@@ -240,14 +240,14 @@
 	@echo $@
 	@${PROTOC} -I. \
       -I${GOOGLEAPI}/third_party/googleapis \
-      --go_out=plugins=grpc:./ \
+      --go_out=plugins=grpc:./ --go_opt=paths=source_relative \
       $<
 
 api/bbsim/bbsim_dmi.pb.go: api/bbsim/bbsim_dmi.proto setup_tools
 	@echo $@
 	@${PROTOC} -I. \
       -I${GOOGLEAPI}/third_party/googleapis \
-      --go_out=plugins=grpc:./ \
+      --go_out=plugins=grpc:./ --go_opt=paths=source_relative \
       $<
 
 api/bbsim/bbsim.pb.go api/bbsim/bbsim.pb.gw.go: api/bbsim/bbsim.proto api/bbsim/bbsim.yaml setup_tools
@@ -255,8 +255,8 @@
 	@${PROTOC} -I. \
 	  -I${GOOGLEAPI}/third_party/googleapis \
 	  -I${VOLTHA_PROTOS}/protos/ \
-      --go_out=plugins=grpc:./ \
-	  --grpc-gateway_out=logtostderr=true,grpc_api_configuration=api/bbsim/bbsim.yaml,allow_delete_body=true:./ \
+      --go_out=plugins=grpc:./ --go_opt=paths=source_relative \
+	  --grpc-gateway_out=logtostderr=true,paths=source_relative,grpc_api_configuration=api/bbsim/bbsim.yaml,allow_delete_body=true:./ \
       $<
 
 api/legacy/bbsim.pb.go api/legacy/bbsim.pb.gw.go: api/legacy/bbsim.proto setup_tools
@@ -266,7 +266,7 @@
 	  -I${GOOGLEAPI}/ \
 	  -I${VOLTHA_PROTOS}/protos/ \
       --go_out=plugins=grpc:./ \
-	  --grpc-gateway_out=logtostderr=true,allow_delete_body=true:./ \
+	  --grpc-gateway_out=logtostderr=true,paths=source_relative,allow_delete_body=true:./ \
       $<
 
 docs/swagger/bbsim/bbsim.swagger.json: api/bbsim/bbsim.yaml setup_tools
diff --git a/VERSION b/VERSION
index bd8bf88..943f9cb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.7.0
+1.7.1
diff --git a/api/bbsim/bbsim.pb.go b/api/bbsim/bbsim.pb.go
index b5df9e9..881187c 100644
--- a/api/bbsim/bbsim.pb.go
+++ b/api/bbsim/bbsim.pb.go
@@ -1609,128 +1609,130 @@
 func init() { proto.RegisterFile("api/bbsim/bbsim.proto", fileDescriptor_ef7750073d18011b) }
 
 var fileDescriptor_ef7750073d18011b = []byte{
-	// 1930 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x41, 0x72, 0xdb, 0xca,
-	0x11, 0x15, 0x49, 0x51, 0x24, 0x9b, 0x22, 0x05, 0x8d, 0x2d, 0x7d, 0x94, 0xac, 0x1f, 0xab, 0x10,
-	0x27, 0x65, 0xbb, 0xf2, 0xe5, 0x6f, 0x39, 0xf9, 0xb1, 0x97, 0x30, 0x09, 0xd1, 0xf8, 0xa2, 0x00,
-	0xd4, 0x80, 0x94, 0xcb, 0x95, 0x05, 0x0b, 0x22, 0x46, 0x12, 0x2b, 0x20, 0x40, 0x03, 0x43, 0x29,
-	0x3a, 0x40, 0xce, 0x90, 0x7d, 0x0e, 0x90, 0x4b, 0xe4, 0x02, 0x39, 0x41, 0xb2, 0xca, 0x01, 0x52,
-	0xb9, 0x40, 0x6a, 0x06, 0x03, 0x10, 0x20, 0x21, 0x9b, 0x5e, 0x65, 0xc3, 0x42, 0xbf, 0xee, 0xd7,
-	0xd3, 0xd3, 0xdd, 0xe8, 0x19, 0x10, 0xf6, 0x9c, 0xd9, 0xe4, 0xd5, 0xe5, 0x65, 0x34, 0x99, 0xc6,
-	0xbf, 0xc7, 0xb3, 0x30, 0xa0, 0x01, 0xaa, 0x72, 0xe1, 0xe0, 0xc9, 0x6d, 0xe0, 0xd1, 0x1b, 0x67,
-	0xc4, 0xc1, 0xe8, 0x55, 0x30, 0x23, 0x7e, 0xe0, 0xd1, 0xd8, 0xe6, 0xe0, 0x28, 0xaf, 0xa4, 0x64,
-	0x7c, 0xc3, 0x9e, 0xaf, 0x26, 0x1e, 0x89, 0x2d, 0x94, 0x7f, 0x95, 0xa1, 0x66, 0x99, 0x86, 0x15,
-	0x84, 0x14, 0xb5, 0xa1, 0xac, 0x77, 0xe5, 0xd2, 0x51, 0xe9, 0x79, 0x15, 0x97, 0xf5, 0x2e, 0x3a,
-	0x84, 0x86, 0x39, 0x23, 0xa1, 0x4d, 0x1d, 0x4a, 0xe4, 0xf2, 0x51, 0xe9, 0x79, 0x03, 0x2f, 0x00,
-	0xf4, 0x0c, 0x5a, 0xba, 0x4f, 0x49, 0xe8, 0x3b, 0x5e, 0x6c, 0x51, 0xe1, 0x16, 0x79, 0x10, 0x1d,
-	0x41, 0xd3, 0x72, 0xc6, 0x7f, 0x24, 0xb4, 0x13, 0xcc, 0x7d, 0x2a, 0x6f, 0x1e, 0x95, 0x9e, 0x6f,
-	0xe2, 0x2c, 0x84, 0x4e, 0x61, 0x47, 0xf5, 0xbc, 0x60, 0xec, 0x50, 0xe2, 0x9a, 0xfe, 0x5c, 0x77,
-	0x23, 0xb9, 0x7a, 0x54, 0x79, 0xde, 0x3c, 0x39, 0x3c, 0x8e, 0xb7, 0x6b, 0x05, 0x7e, 0x6a, 0x80,
-	0x49, 0x14, 0xcc, 0xc3, 0x31, 0x89, 0xf0, 0x32, 0x09, 0xfd, 0x0c, 0xbb, 0x29, 0xd4, 0x23, 0x53,
-	0xb6, 0xa3, 0x48, 0xde, 0x5a, 0xc3, 0xd3, 0x2a, 0x2d, 0xe7, 0x8b, 0x3f, 0xb0, 0xa8, 0x6a, 0xdf,
-	0xe4, 0x2b, 0xa1, 0x29, 0x67, 0xb0, 0x57, 0x68, 0x8b, 0x14, 0xd8, 0xb6, 0x49, 0x38, 0x71, 0x3c,
-	0x63, 0x3e, 0xbd, 0x24, 0x21, 0x4f, 0x7c, 0x03, 0xe7, 0x30, 0x5e, 0x12, 0x97, 0xe7, 0x9e, 0x95,
-	0xc4, 0x55, 0x7e, 0x0f, 0x35, 0xc3, 0xd0, 0xbf, 0xbd, 0x5a, 0xca, 0xbf, 0x4b, 0x50, 0x31, 0xbd,
-	0x55, 0xd6, 0x72, 0x10, 0xe5, 0x82, 0x20, 0x72, 0x9e, 0x2b, 0x5f, 0xed, 0x83, 0xcd, 0xa2, 0x3e,
-	0x60, 0xeb, 0x5a, 0x72, 0x8d, 0xab, 0xca, 0xba, 0x85, 0x5e, 0x42, 0x5d, 0x6c, 0x24, 0x29, 0x77,
-	0x5b, 0x24, 0x56, 0xc0, 0x38, 0xd5, 0x33, 0x5b, 0xd1, 0xa2, 0x49, 0x41, 0x13, 0x5b, 0x01, 0xe3,
-	0x54, 0xaf, 0xfc, 0xb9, 0x04, 0xb2, 0xe9, 0xd1, 0x95, 0x74, 0x0f, 0xee, 0x67, 0x04, 0xbd, 0x85,
-	0x4d, 0x7a, 0x3f, 0x23, 0x7c, 0xfb, 0xed, 0x93, 0x67, 0xc2, 0xc9, 0x43, 0xe6, 0xc7, 0xec, 0x07,
-	0x73, 0x86, 0xf2, 0x0a, 0x36, 0xb9, 0x87, 0x26, 0xd4, 0x86, 0xc6, 0x99, 0x61, 0x7e, 0x34, 0xa4,
-	0x0d, 0xb4, 0x0d, 0x75, 0xb5, 0xdf, 0x37, 0x3b, 0x23, 0xbd, 0x2b, 0x95, 0x98, 0xd4, 0xd3, 0xce,
-	0x47, 0x96, 0x89, 0x07, 0x52, 0x59, 0xf9, 0x5b, 0x09, 0x1e, 0x17, 0x39, 0x46, 0x28, 0xf6, 0x24,
-	0xaa, 0x1d, 0x7b, 0x3d, 0x84, 0x86, 0x15, 0xf8, 0x6c, 0x03, 0xa2, 0xd8, 0x2d, 0xbc, 0x00, 0xd0,
-	0x63, 0xa8, 0xf2, 0x16, 0xe7, 0xa9, 0x6f, 0xe1, 0x58, 0x40, 0xfb, 0xb0, 0xc5, 0xf4, 0x46, 0xc0,
-	0xf3, 0xdd, 0xc2, 0x42, 0x42, 0xbf, 0x00, 0x48, 0xd6, 0xd2, 0x5d, 0xb9, 0xca, 0x0b, 0x9d, 0x41,
-	0x18, 0xef, 0xd4, 0x0b, 0xee, 0x74, 0x57, 0xde, 0xe2, 0xef, 0xa2, 0x90, 0x14, 0x0c, 0x7b, 0x45,
-	0xf1, 0x46, 0xe8, 0x1d, 0x34, 0xc2, 0x44, 0x90, 0x4b, 0x3c, 0xfd, 0x4f, 0xbe, 0x90, 0x39, 0xbc,
-	0xb0, 0x56, 0xfe, 0x5b, 0x81, 0x8a, 0x69, 0x0c, 0xff, 0x6f, 0x4d, 0x97, 0xc9, 0x6b, 0x57, 0xa4,
-	0x62, 0x01, 0x30, 0xed, 0x87, 0x3b, 0xd5, 0x75, 0x43, 0x12, 0x45, 0x72, 0x3d, 0x5e, 0x21, 0x05,
-	0x32, 0xf9, 0x6d, 0x70, 0x62, 0x92, 0xdf, 0x97, 0x50, 0x8f, 0x48, 0x78, 0x3b, 0x61, 0xd9, 0x80,
-	0x5c, 0x33, 0xda, 0x31, 0x8c, 0x53, 0x3d, 0xea, 0xc2, 0xf7, 0xfa, 0xd4, 0xb9, 0x26, 0x76, 0x70,
-	0x45, 0xef, 0x9c, 0x90, 0x68, 0x7f, 0x9a, 0x91, 0x31, 0x25, 0xae, 0x4d, 0xc6, 0x74, 0x12, 0xf8,
-	0x91, 0xdc, 0xe4, 0xae, 0xbf, 0x6c, 0xb4, 0xe2, 0x05, 0x93, 0x31, 0x99, 0xdc, 0x66, 0xbc, 0x6c,
-	0x17, 0x78, 0x59, 0x36, 0x42, 0x3f, 0xc2, 0x23, 0x75, 0x4c, 0x27, 0xb7, 0x84, 0x9b, 0x69, 0x3e,
-	0x9d, 0xd0, 0x7b, 0xdd, 0x95, 0x5b, 0x9c, 0x5b, 0xa4, 0x42, 0x3f, 0xc1, 0x7e, 0x27, 0x98, 0x4e,
-	0x27, 0x94, 0x12, 0x37, 0x4f, 0x6a, 0x73, 0xd2, 0x03, 0x5a, 0xe5, 0x3f, 0x65, 0xa8, 0x89, 0x5c,
-	0xb0, 0x6e, 0x37, 0x9c, 0x69, 0xda, 0xed, 0xec, 0x39, 0x9f, 0xf7, 0xf2, 0x72, 0xde, 0xe3, 0x6e,
-	0xb7, 0x7d, 0x51, 0xf3, 0x58, 0x60, 0x7e, 0xec, 0x81, 0x73, 0xcd, 0xcb, 0x5c, 0xc5, 0xfc, 0x99,
-	0x61, 0x1d, 0x86, 0xc5, 0x85, 0xe5, 0xcf, 0xac, 0xfb, 0x0d, 0x42, 0xdc, 0x48, 0x73, 0x66, 0x81,
-	0xc7, 0x3b, 0xbc, 0x8e, 0x33, 0x08, 0x5b, 0x9b, 0x4b, 0xdd, 0x9b, 0xf1, 0x8c, 0x4f, 0xa3, 0x3a,
-	0x5e, 0x00, 0xa9, 0x56, 0xbf, 0x9e, 0xce, 0x78, 0x47, 0x24, 0x5a, 0x06, 0x20, 0x19, 0x6a, 0xe2,
-	0x80, 0x10, 0x2d, 0x91, 0x88, 0x6c, 0x55, 0xee, 0x3e, 0x6e, 0x45, 0xe0, 0x81, 0x67, 0x10, 0xe6,
-	0x97, 0xf9, 0x8f, 0xd5, 0xcd, 0x78, 0xc7, 0x29, 0xb0, 0xda, 0xcb, 0xdb, 0x0f, 0xf4, 0xb2, 0xde,
-	0x3b, 0xb7, 0x62, 0x8b, 0x56, 0xec, 0x23, 0x05, 0x14, 0x07, 0x1e, 0x9b, 0xc6, 0x70, 0x10, 0x3a,
-	0x57, 0x57, 0x93, 0xb1, 0x3d, 0xbe, 0x21, 0xee, 0xdc, 0x23, 0x61, 0x84, 0x74, 0xd8, 0xa1, 0x0c,
-	0x5c, 0x40, 0xbc, 0x14, 0xcd, 0x93, 0xa7, 0xc7, 0xb9, 0xcb, 0xc0, 0x0a, 0x13, 0x2f, 0xf3, 0x94,
-	0xe7, 0xb0, 0x69, 0x1a, 0xc3, 0x08, 0x1d, 0x41, 0x75, 0x42, 0xc9, 0x34, 0x99, 0x05, 0x90, 0xcc,
-	0x02, 0x63, 0x88, 0x63, 0x85, 0xf2, 0x23, 0xd4, 0xed, 0xe4, 0x15, 0x78, 0x96, 0xb7, 0x5e, 0x7e,
-	0x57, 0x52, 0x06, 0x30, 0x3e, 0xf9, 0x3c, 0x27, 0x11, 0x5d, 0xe7, 0x60, 0x54, 0x5e, 0x02, 0x58,
-	0xa6, 0x91, 0x30, 0x72, 0x03, 0xb4, 0xb4, 0x34, 0x40, 0x95, 0x7f, 0x56, 0xa0, 0xa1, 0x7a, 0x4e,
-	0x38, 0x65, 0xc3, 0x56, 0xf9, 0x47, 0x05, 0xaa, 0xec, 0x21, 0x42, 0x35, 0xa8, 0xf4, 0x4d, 0x5b,
-	0xda, 0x40, 0x6d, 0x80, 0xee, 0x27, 0xdd, 0xe8, 0x8d, 0x7a, 0xaa, 0x6d, 0x49, 0x25, 0xd4, 0x82,
-	0x86, 0x69, 0x0c, 0x47, 0x6a, 0x5f, 0xc5, 0xe7, 0x52, 0x19, 0x7d, 0x07, 0x8f, 0x98, 0x68, 0x0f,
-	0x54, 0x3c, 0x18, 0x5a, 0xa3, 0x53, 0x55, 0xef, 0x0f, 0xb1, 0x26, 0x55, 0xd0, 0x3e, 0x20, 0xae,
-	0xd0, 0x7b, 0x86, 0xda, 0x1f, 0x75, 0xb5, 0x1e, 0x56, 0xbb, 0x9a, 0xb4, 0x99, 0x10, 0xba, 0x58,
-	0x3f, 0x1d, 0x8c, 0xcc, 0xd3, 0xd1, 0x47, 0xdd, 0xe8, 0x9a, 0x1f, 0xa5, 0x2a, 0x3a, 0x04, 0x99,
-	0x29, 0xfa, 0xa6, 0x6d, 0x33, 0xdc, 0x3c, 0xef, 0xe8, 0xa3, 0xce, 0x07, 0xd5, 0x30, 0xb4, 0xbe,
-	0xb4, 0x95, 0xae, 0xc3, 0xdd, 0xd9, 0xe9, 0x3a, 0x35, 0xf4, 0x02, 0x7e, 0xc5, 0x14, 0x03, 0xac,
-	0x1a, 0xf6, 0xb9, 0x6e, 0xdb, 0xba, 0x69, 0x8c, 0x74, 0x63, 0xa0, 0xe1, 0x53, 0x0d, 0x6b, 0x46,
-	0x47, 0x1b, 0x7d, 0x54, 0xb1, 0xa1, 0x1b, 0x3d, 0xa9, 0x8e, 0x0e, 0x60, 0x9f, 0x87, 0xde, 0x19,
-	0xe8, 0x17, 0xea, 0x80, 0x19, 0x26, 0x6e, 0x1a, 0x48, 0xe6, 0x4d, 0x32, 0xb2, 0xb0, 0xd9, 0xd1,
-	0x6c, 0x9b, 0xed, 0x57, 0xc3, 0xd8, 0xc4, 0x12, 0xa0, 0x23, 0x38, 0xcc, 0xc6, 0x75, 0xa6, 0x7d,
-	0x1a, 0xd9, 0x9f, 0x8c, 0x4e, 0xca, 0x6d, 0xa2, 0x3d, 0xd8, 0x65, 0x16, 0xfa, 0x60, 0x38, 0xb2,
-	0x4c, 0x83, 0xe5, 0x62, 0x60, 0x4b, 0xdb, 0x68, 0x17, 0x5a, 0x69, 0xa6, 0x18, 0x5d, 0x6a, 0x2d,
-	0x43, 0xef, 0xa5, 0x76, 0xb2, 0xb1, 0x04, 0xb2, 0x3a, 0x23, 0xb6, 0x0b, 0x69, 0x27, 0xc9, 0x47,
-	0x4e, 0xd1, 0x11, 0x51, 0x49, 0x08, 0x41, 0x3b, 0xab, 0x3d, 0xd5, 0xa5, 0x5d, 0xf4, 0x08, 0x76,
-	0xb2, 0x98, 0x7a, 0xae, 0x4b, 0x48, 0x79, 0x0b, 0x6d, 0x5e, 0x5f, 0xcb, 0x09, 0x9d, 0x29, 0xa1,
-	0x24, 0x44, 0x12, 0x54, 0xce, 0xc8, 0xbd, 0xe8, 0x1c, 0xf6, 0xc8, 0xe6, 0xca, 0x85, 0xe3, 0xcd,
-	0x93, 0xab, 0x51, 0x2c, 0x28, 0x7f, 0x2d, 0x71, 0x7f, 0x9c, 0x9d, 0x69, 0xa6, 0xb4, 0x5b, 0x84,
-	0x87, 0x05, 0xb0, 0xd6, 0xd9, 0xb5, 0x0f, 0x5b, 0xec, 0xb5, 0x9c, 0x47, 0x62, 0x88, 0x09, 0x09,
-	0xfd, 0x0e, 0x20, 0x0d, 0x31, 0x92, 0x37, 0xf9, 0x1b, 0xb1, 0x27, 0xde, 0x88, 0xfc, 0x06, 0x70,
-	0xc6, 0x50, 0xf9, 0x0c, 0x3b, 0x66, 0x7f, 0x90, 0x8b, 0xf1, 0x08, 0x9a, 0x7c, 0x3c, 0x5c, 0x39,
-	0x63, 0x22, 0x8e, 0xd6, 0x16, 0xce, 0x42, 0xe9, 0x54, 0x61, 0x22, 0xdf, 0x49, 0x39, 0x33, 0x55,
-	0x12, 0xf0, 0xa1, 0x48, 0xd9, 0x35, 0xaa, 0x75, 0x41, 0xc2, 0x68, 0x12, 0xf8, 0x62, 0x4f, 0x32,
-	0xd4, 0x6e, 0x63, 0x40, 0xe4, 0x24, 0x11, 0x59, 0xbe, 0x2e, 0xe7, 0x13, 0xcf, 0x1d, 0x4c, 0xa6,
-	0xe9, 0xc5, 0x33, 0x05, 0xd8, 0x6c, 0x1c, 0xf3, 0x73, 0xe2, 0x83, 0x13, 0xdd, 0x88, 0x55, 0x32,
-	0x08, 0x63, 0x5f, 0x4f, 0xa8, 0x08, 0x22, 0x3e, 0xc5, 0x17, 0x80, 0xf2, 0x16, 0xea, 0xfd, 0xe0,
-	0xba, 0x4f, 0x6e, 0x89, 0xc7, 0x2a, 0xe8, 0xb1, 0x07, 0xb1, 0x7e, 0x2c, 0xb0, 0x1d, 0x8c, 0x1d,
-	0xcf, 0x13, 0x95, 0xa8, 0x63, 0x21, 0x29, 0x1a, 0xd4, 0x31, 0x89, 0x66, 0x81, 0x1f, 0x11, 0xf4,
-	0x14, 0x9a, 0x11, 0xf7, 0x37, 0x1a, 0x07, 0x2e, 0x11, 0x17, 0x11, 0x88, 0xa1, 0x4e, 0xe0, 0x12,
-	0xb6, 0xb9, 0x29, 0x89, 0x22, 0xe7, 0x3a, 0xd9, 0x40, 0x22, 0x2a, 0x7f, 0x29, 0x41, 0x93, 0x4d,
-	0xff, 0x24, 0xf1, 0x2f, 0x60, 0xcb, 0xf4, 0xe7, 0x98, 0x7c, 0x16, 0x73, 0x74, 0x37, 0x33, 0xfe,
-	0x62, 0x13, 0x2c, 0x0c, 0xd0, 0x3b, 0xd8, 0xb6, 0xe7, 0x97, 0x2a, 0x3f, 0x7f, 0x2f, 0x1c, 0x8f,
-	0x7b, 0x6e, 0xa7, 0xf5, 0x4e, 0x55, 0x7c, 0x16, 0xe1, 0x9c, 0x29, 0x6b, 0xb2, 0x5e, 0x18, 0xcc,
-	0x67, 0xc9, 0x29, 0x19, 0xa7, 0x2d, 0x87, 0x29, 0x67, 0x50, 0x65, 0x57, 0xb7, 0x08, 0x7d, 0x0f,
-	0x70, 0xe5, 0x05, 0x77, 0xa3, 0x31, 0xff, 0xc2, 0x12, 0xd3, 0x8f, 0x21, 0xf1, 0xf7, 0xd5, 0x2f,
-	0xa1, 0xca, 0x04, 0x76, 0xd4, 0xb2, 0x7e, 0x6b, 0x1d, 0x27, 0x9f, 0x88, 0x8c, 0x8d, 0x63, 0x9d,
-	0xf2, 0x14, 0x6a, 0xac, 0x5a, 0xc1, 0x9c, 0xb2, 0x34, 0xbb, 0xc4, 0x73, 0xee, 0x85, 0xa7, 0x58,
-	0x50, 0x6a, 0x50, 0xd5, 0xa6, 0x33, 0x7a, 0xff, 0xf2, 0x35, 0xb4, 0xf3, 0xa1, 0xa3, 0x3a, 0x6c,
-	0xfe, 0x6c, 0xea, 0xec, 0x42, 0xdc, 0x80, 0x6a, 0x5f, 0x53, 0x2f, 0x34, 0xa9, 0x84, 0x00, 0xb6,
-	0x18, 0x78, 0xf1, 0x46, 0x2a, 0x9f, 0xfc, 0xbd, 0x09, 0xd5, 0xf7, 0xef, 0xed, 0xc9, 0x14, 0xbd,
-	0x82, 0x9a, 0xe8, 0x2a, 0xb4, 0x2d, 0xf2, 0xc0, 0xbd, 0x1e, 0x3c, 0x16, 0x52, 0xae, 0xe7, 0x94,
-	0x0d, 0xf4, 0x1a, 0x9a, 0x36, 0xa1, 0x69, 0x0b, 0xec, 0x08, 0xb3, 0x04, 0x38, 0x58, 0x06, 0x94,
-	0x0d, 0xf4, 0x0c, 0xb6, 0x7a, 0x84, 0xb2, 0x6f, 0x9d, 0xfc, 0x12, 0xb0, 0xb8, 0xb4, 0x2a, 0x1b,
-	0xe8, 0x0f, 0x20, 0xc7, 0x56, 0x05, 0x37, 0xde, 0xa7, 0x5f, 0xf9, 0x30, 0x38, 0x38, 0xfc, 0x82,
-	0x41, 0xa4, 0x6c, 0xa0, 0x1f, 0x00, 0xac, 0xe0, 0x8e, 0x84, 0x81, 0xbf, 0x1a, 0x46, 0x12, 0x71,
-	0xd2, 0x9c, 0xca, 0x06, 0x3a, 0x86, 0xa6, 0x7d, 0x33, 0xa7, 0x6e, 0x70, 0xb7, 0x9e, 0xfd, 0x6f,
-	0xa0, 0x81, 0xc9, 0x65, 0x10, 0xd0, 0xb5, 0xac, 0x59, 0xc1, 0x68, 0x30, 0xbb, 0xc6, 0x56, 0x87,
-	0x9d, 0xba, 0x24, 0xfc, 0x3a, 0xe5, 0x04, 0x76, 0x6c, 0xea, 0x84, 0xf4, 0x5b, 0x38, 0x3f, 0xc1,
-	0x2e, 0x26, 0xd1, 0x12, 0x2b, 0x39, 0xee, 0x45, 0x6f, 0x15, 0xf1, 0x5e, 0xc4, 0xe5, 0x32, 0x86,
-	0x68, 0xf5, 0x55, 0x3a, 0xc8, 0x5c, 0x2e, 0x94, 0x0d, 0xf4, 0x6b, 0x76, 0x01, 0xa3, 0xfc, 0x12,
-	0x92, 0x0f, 0xa7, 0xb9, 0x30, 0x8b, 0xe2, 0x7c, 0xf6, 0x08, 0x4d, 0xaf, 0x20, 0xc5, 0xa1, 0x27,
-	0x6a, 0x1e, 0x7a, 0x9b, 0xf9, 0xf5, 0xe7, 0x29, 0xa5, 0x20, 0x94, 0x02, 0xde, 0x9b, 0x4c, 0xdd,
-	0x8a, 0xe3, 0x7f, 0x20, 0xb7, 0x82, 0xa4, 0x7a, 0x5e, 0xc1, 0x66, 0x0a, 0x38, 0xef, 0x60, 0x37,
-	0xb3, 0x50, 0x64, 0xfa, 0x96, 0x69, 0xa4, 0xcb, 0x2d, 0xae, 0x41, 0xc5, 0xcb, 0xa5, 0xad, 0xb8,
-	0x76, 0x88, 0xaf, 0xa1, 0x2d, 0x38, 0x6b, 0x47, 0xf8, 0x16, 0xa4, 0xc5, 0x32, 0xdf, 0x14, 0xe0,
-	0x6f, 0x61, 0x5b, 0xf4, 0x4d, 0x7c, 0x43, 0x5f, 0x2f, 0xc4, 0x37, 0xd0, 0x14, 0x2c, 0x7e, 0x71,
-	0x5f, 0x8f, 0xf4, 0x1e, 0xf6, 0x6c, 0x5e, 0x67, 0x7e, 0x94, 0xea, 0xbe, 0x3b, 0x19, 0x3b, 0x6c,
-	0x8c, 0xa1, 0xfd, 0x05, 0x3d, 0x7b, 0xca, 0x7e, 0xc1, 0x07, 0x7b, 0xf1, 0x1f, 0xf0, 0x91, 0x3f,
-	0xa9, 0x8b, 0x7c, 0xfc, 0x00, 0xf5, 0x1e, 0xa1, 0xf1, 0xf0, 0x2e, 0x88, 0x3c, 0x49, 0x36, 0x37,
-	0xe0, 0xb9, 0xdd, 0xe9, 0xdc, 0x38, 0xfe, 0x35, 0x61, 0xe7, 0x50, 0xfc, 0x31, 0x80, 0x84, 0x49,
-	0xe6, 0x64, 0x2a, 0x5a, 0xe8, 0x0c, 0xbe, 0x8b, 0x1b, 0x7b, 0xf5, 0xc3, 0xa0, 0x60, 0xdd, 0x27,
-	0x0b, 0x68, 0xc5, 0x5e, 0xd9, 0xb8, 0xdc, 0xe2, 0x7f, 0x18, 0xbe, 0xf9, 0x5f, 0x00, 0x00, 0x00,
-	0xff, 0xff, 0x86, 0x40, 0xa9, 0x75, 0x8f, 0x14, 0x00, 0x00,
+	// 1956 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x51, 0x72, 0xdb, 0xc8,
+	0x11, 0x15, 0x49, 0x51, 0x24, 0x9b, 0x22, 0x05, 0x8d, 0x2d, 0x2d, 0x4b, 0xd6, 0xc6, 0x2a, 0xac,
+	0x37, 0x65, 0xbb, 0xb2, 0xf2, 0x5a, 0x4e, 0x36, 0xf6, 0x27, 0x44, 0x42, 0x34, 0x56, 0x14, 0x80,
+	0x1a, 0x90, 0x72, 0x39, 0xf9, 0x60, 0x41, 0xc0, 0x48, 0x42, 0x05, 0x24, 0x68, 0x60, 0x28, 0x45,
+	0x07, 0xc8, 0x19, 0xf2, 0x9f, 0x03, 0xe4, 0x12, 0xb9, 0x40, 0x4e, 0x90, 0x7c, 0xe5, 0x00, 0xa9,
+	0x5c, 0x20, 0x35, 0x83, 0x01, 0x08, 0x90, 0x90, 0x2d, 0x7f, 0xed, 0x0f, 0x0b, 0xfd, 0xba, 0x5f,
+	0x4f, 0x4f, 0x77, 0xa3, 0x67, 0x40, 0xd8, 0xb1, 0x67, 0xde, 0xab, 0x8b, 0x8b, 0xc8, 0x9b, 0xc4,
+	0xbf, 0x87, 0xb3, 0x30, 0xa0, 0x01, 0xaa, 0x72, 0x61, 0xef, 0xc9, 0x4d, 0xe0, 0xd3, 0x6b, 0x7b,
+	0xcc, 0xc1, 0xe8, 0x55, 0x30, 0x23, 0xd3, 0xc0, 0xa7, 0xb1, 0xcd, 0xde, 0x41, 0x5e, 0x49, 0x89,
+	0x73, 0xcd, 0x9e, 0x2f, 0x3d, 0x9f, 0xc4, 0x16, 0xf2, 0xbf, 0xcb, 0x50, 0x33, 0x0d, 0xdd, 0x0c,
+	0x42, 0x8a, 0xda, 0x50, 0xd6, 0x7a, 0x9d, 0xd2, 0x41, 0xe9, 0x79, 0x15, 0x97, 0xb5, 0x1e, 0xda,
+	0x87, 0x86, 0x31, 0x23, 0xa1, 0x45, 0x6d, 0x4a, 0x3a, 0xe5, 0x83, 0xd2, 0xf3, 0x06, 0x5e, 0x00,
+	0xe8, 0x19, 0xb4, 0xb4, 0x29, 0x25, 0xe1, 0xd4, 0xf6, 0x63, 0x8b, 0x0a, 0xb7, 0xc8, 0x83, 0xe8,
+	0x00, 0x9a, 0xa6, 0xed, 0xfc, 0x89, 0xd0, 0x6e, 0x30, 0x9f, 0xd2, 0xce, 0xfa, 0x41, 0xe9, 0xf9,
+	0x3a, 0xce, 0x42, 0xe8, 0x04, 0xb6, 0x14, 0xdf, 0x0f, 0x1c, 0x9b, 0x12, 0xd7, 0x98, 0xce, 0x35,
+	0x37, 0xea, 0x54, 0x0f, 0x2a, 0xcf, 0x9b, 0x47, 0xfb, 0x87, 0xf1, 0x76, 0xcd, 0x60, 0x9a, 0x1a,
+	0x60, 0x12, 0x05, 0xf3, 0xd0, 0x21, 0x11, 0x5e, 0x26, 0xa1, 0x9f, 0x61, 0x3b, 0x85, 0xfa, 0x64,
+	0xc2, 0x76, 0x14, 0x75, 0x36, 0x1e, 0xe0, 0x69, 0x95, 0x96, 0xf3, 0xc5, 0x1f, 0x58, 0x54, 0xb5,
+	0xaf, 0xf2, 0x95, 0xd0, 0xe4, 0x53, 0xd8, 0x29, 0xb4, 0x45, 0x32, 0x6c, 0x5a, 0x24, 0xf4, 0x6c,
+	0x5f, 0x9f, 0x4f, 0x2e, 0x48, 0xc8, 0x13, 0xdf, 0xc0, 0x39, 0x8c, 0x97, 0xc4, 0xe5, 0xb9, 0x67,
+	0x25, 0x71, 0xe5, 0xdf, 0x43, 0x4d, 0xd7, 0xb5, 0xaf, 0xaf, 0x96, 0xfc, 0x9f, 0x12, 0x54, 0x0c,
+	0x7f, 0x95, 0xb5, 0x1c, 0x44, 0xb9, 0x20, 0x88, 0x9c, 0xe7, 0xca, 0x17, 0xfb, 0x60, 0xbd, 0xa8,
+	0x0f, 0xd8, 0xba, 0x66, 0xa7, 0xc6, 0x55, 0x65, 0xcd, 0x44, 0x2f, 0xa1, 0x2e, 0x36, 0x92, 0x94,
+	0xbb, 0x2d, 0x12, 0x2b, 0x60, 0x9c, 0xea, 0x99, 0xad, 0x68, 0xd1, 0xa4, 0xa0, 0x89, 0xad, 0x80,
+	0x71, 0xaa, 0x97, 0xff, 0x52, 0x82, 0x8e, 0xe1, 0xd3, 0x95, 0x74, 0x0f, 0xef, 0x66, 0x04, 0xbd,
+	0x85, 0x75, 0x7a, 0x37, 0x23, 0x7c, 0xfb, 0xed, 0xa3, 0x67, 0xc2, 0xc9, 0x7d, 0xe6, 0x87, 0xec,
+	0x07, 0x73, 0x86, 0xfc, 0x0a, 0xd6, 0xb9, 0x87, 0x26, 0xd4, 0x46, 0xfa, 0xa9, 0x6e, 0x7c, 0xd0,
+	0xa5, 0x35, 0xb4, 0x09, 0x75, 0x65, 0x30, 0x30, 0xba, 0x63, 0xad, 0x27, 0x95, 0x98, 0xd4, 0x57,
+	0xcf, 0xc6, 0xa6, 0x81, 0x87, 0x52, 0x59, 0xfe, 0x7b, 0x09, 0x1e, 0x17, 0x39, 0x46, 0x28, 0xf6,
+	0x24, 0xaa, 0x1d, 0x7b, 0xdd, 0x87, 0x86, 0x19, 0x4c, 0xd9, 0x06, 0x44, 0xb1, 0x5b, 0x78, 0x01,
+	0xa0, 0xc7, 0x50, 0xe5, 0x2d, 0xce, 0x53, 0xdf, 0xc2, 0xb1, 0x80, 0x76, 0x61, 0x83, 0xe9, 0xf5,
+	0x80, 0xe7, 0xbb, 0x85, 0x85, 0x84, 0x7e, 0x05, 0x90, 0xac, 0xa5, 0xb9, 0x9d, 0x2a, 0x2f, 0x74,
+	0x06, 0x61, 0xbc, 0x13, 0x3f, 0xb8, 0xd5, 0xdc, 0xce, 0x06, 0x7f, 0x17, 0x85, 0x24, 0x63, 0xd8,
+	0x29, 0x8a, 0x37, 0x42, 0xef, 0xa0, 0x11, 0x26, 0x42, 0xa7, 0xc4, 0xd3, 0xff, 0xe4, 0x33, 0x99,
+	0xc3, 0x0b, 0x6b, 0xf9, 0x7f, 0x15, 0xa8, 0x18, 0xfa, 0xe8, 0x17, 0x6b, 0xba, 0x4c, 0x5e, 0x7b,
+	0x22, 0x15, 0x0b, 0x80, 0x69, 0xdf, 0xdf, 0x2a, 0xae, 0x1b, 0x92, 0x28, 0xea, 0xd4, 0xe3, 0x15,
+	0x52, 0x20, 0x93, 0xdf, 0x06, 0x27, 0x26, 0xf9, 0x7d, 0x09, 0xf5, 0x88, 0x84, 0x37, 0x1e, 0xcb,
+	0x06, 0xe4, 0x9a, 0xd1, 0x8a, 0x61, 0x9c, 0xea, 0x51, 0x0f, 0xbe, 0xd5, 0x26, 0xf6, 0x15, 0xb1,
+	0x82, 0x4b, 0x7a, 0x6b, 0x87, 0x44, 0xfd, 0xf3, 0x8c, 0x38, 0x94, 0xb8, 0x16, 0x71, 0xa8, 0x17,
+	0x4c, 0xa3, 0x4e, 0x93, 0xbb, 0xfe, 0xbc, 0xd1, 0x8a, 0x17, 0x4c, 0x1c, 0xe2, 0xdd, 0x64, 0xbc,
+	0x6c, 0x16, 0x78, 0x59, 0x36, 0x42, 0x3f, 0xc2, 0x23, 0xc5, 0xa1, 0xde, 0x0d, 0xe1, 0x66, 0xea,
+	0x94, 0x7a, 0xf4, 0x4e, 0x73, 0x3b, 0x2d, 0xce, 0x2d, 0x52, 0xa1, 0x9f, 0x60, 0xb7, 0x1b, 0x4c,
+	0x26, 0x1e, 0xa5, 0xc4, 0xcd, 0x93, 0xda, 0x9c, 0x74, 0x8f, 0x56, 0xfe, 0x6f, 0x19, 0x6a, 0x22,
+	0x17, 0xac, 0xdb, 0x75, 0x7b, 0x92, 0x76, 0x3b, 0x7b, 0xce, 0xe7, 0xbd, 0xbc, 0x9c, 0xf7, 0xb8,
+	0xdb, 0xad, 0xa9, 0xa8, 0x79, 0x2c, 0x30, 0x3f, 0xd6, 0xd0, 0xbe, 0xe2, 0x65, 0xae, 0x62, 0xfe,
+	0xcc, 0xb0, 0x2e, 0xc3, 0xe2, 0xc2, 0xf2, 0x67, 0xd6, 0xfd, 0x3a, 0x21, 0x6e, 0xa4, 0xda, 0xb3,
+	0xc0, 0xe7, 0x1d, 0x5e, 0xc7, 0x19, 0x84, 0xad, 0xcd, 0xa5, 0xde, 0xb5, 0x33, 0xe3, 0xd3, 0xa8,
+	0x8e, 0x17, 0x40, 0xaa, 0xd5, 0xae, 0x26, 0x33, 0xde, 0x11, 0x89, 0x96, 0x01, 0xa8, 0x03, 0x35,
+	0x71, 0x40, 0x88, 0x96, 0x48, 0x44, 0xb6, 0x2a, 0x77, 0x1f, 0xb7, 0x22, 0xf0, 0xc0, 0x33, 0x08,
+	0xf3, 0xcb, 0xfc, 0xc7, 0xea, 0x66, 0xbc, 0xe3, 0x14, 0x58, 0xed, 0xe5, 0xcd, 0x7b, 0x7a, 0x59,
+	0xeb, 0x9f, 0x99, 0xb1, 0x45, 0x2b, 0xf6, 0x91, 0x02, 0xb2, 0x0d, 0x8f, 0x0d, 0x7d, 0x34, 0x0c,
+	0xed, 0xcb, 0x4b, 0xcf, 0xb1, 0x9c, 0x6b, 0xe2, 0xce, 0x7d, 0x12, 0x46, 0x48, 0x83, 0x2d, 0xca,
+	0xc0, 0x05, 0xc4, 0x4b, 0xd1, 0x3c, 0x7a, 0x7a, 0x98, 0xbb, 0x0c, 0xac, 0x30, 0xf1, 0x32, 0x4f,
+	0x7e, 0x0e, 0xeb, 0x86, 0x3e, 0x8a, 0xd0, 0x01, 0x54, 0x3d, 0x4a, 0x26, 0xc9, 0x2c, 0x80, 0x64,
+	0x16, 0xe8, 0x23, 0x1c, 0x2b, 0xe4, 0x1f, 0xa1, 0x6e, 0x25, 0xaf, 0xc0, 0xb3, 0xbc, 0xf5, 0xf2,
+	0xbb, 0x92, 0x32, 0x80, 0xf1, 0xc9, 0xa7, 0x39, 0x89, 0xe8, 0x43, 0x0e, 0x46, 0xf9, 0x25, 0x80,
+	0x69, 0xe8, 0x09, 0x23, 0x37, 0x40, 0x4b, 0x4b, 0x03, 0x54, 0xfe, 0x57, 0x05, 0x1a, 0x8a, 0x6f,
+	0x87, 0x13, 0x36, 0x6c, 0xe5, 0x7f, 0x56, 0xa0, 0xca, 0x1e, 0x22, 0x54, 0x83, 0xca, 0xc0, 0xb0,
+	0xa4, 0x35, 0xd4, 0x06, 0xe8, 0x7d, 0xd4, 0xf4, 0xfe, 0xb8, 0xaf, 0x58, 0xa6, 0x54, 0x42, 0x2d,
+	0x68, 0x18, 0xfa, 0x68, 0xac, 0x0c, 0x14, 0x7c, 0x26, 0x95, 0xd1, 0x37, 0xf0, 0x88, 0x89, 0xd6,
+	0x50, 0xc1, 0xc3, 0x91, 0x39, 0x3e, 0x51, 0xb4, 0xc1, 0x08, 0xab, 0x52, 0x05, 0xed, 0x02, 0xe2,
+	0x0a, 0xad, 0xaf, 0x2b, 0x83, 0x71, 0x4f, 0xed, 0x63, 0xa5, 0xa7, 0x4a, 0xeb, 0x09, 0xa1, 0x87,
+	0xb5, 0x93, 0xe1, 0xd8, 0x38, 0x19, 0x7f, 0xd0, 0xf4, 0x9e, 0xf1, 0x41, 0xaa, 0xa2, 0x7d, 0xe8,
+	0x30, 0xc5, 0xc0, 0xb0, 0x2c, 0x86, 0x1b, 0x67, 0x5d, 0x6d, 0xdc, 0x7d, 0xaf, 0xe8, 0xba, 0x3a,
+	0x90, 0x36, 0xd2, 0x75, 0xb8, 0x3b, 0x2b, 0x5d, 0xa7, 0x86, 0x5e, 0xc0, 0xf7, 0x4c, 0x31, 0xc4,
+	0x8a, 0x6e, 0x9d, 0x69, 0x96, 0xa5, 0x19, 0xfa, 0x58, 0xd3, 0x87, 0x2a, 0x3e, 0x51, 0xb1, 0xaa,
+	0x77, 0xd5, 0xf1, 0x07, 0x05, 0xeb, 0x9a, 0xde, 0x97, 0xea, 0x68, 0x0f, 0x76, 0x79, 0xe8, 0xdd,
+	0xa1, 0x76, 0xae, 0x0c, 0x99, 0x61, 0xe2, 0xa6, 0x81, 0x3a, 0xbc, 0x49, 0xc6, 0x26, 0x36, 0xba,
+	0xaa, 0x65, 0xb1, 0xfd, 0xaa, 0x18, 0x1b, 0x58, 0x02, 0x74, 0x00, 0xfb, 0xd9, 0xb8, 0x4e, 0xd5,
+	0x8f, 0x63, 0xeb, 0xa3, 0xde, 0x4d, 0xb9, 0x4d, 0xb4, 0x03, 0xdb, 0xcc, 0x42, 0x1b, 0x8e, 0xc6,
+	0xa6, 0xa1, 0xb3, 0x5c, 0x0c, 0x2d, 0x69, 0x13, 0x6d, 0x43, 0x2b, 0xcd, 0x14, 0xa3, 0x4b, 0xad,
+	0x65, 0xe8, 0x58, 0x6a, 0x27, 0x1b, 0x4b, 0x20, 0xb3, 0x3b, 0x66, 0xbb, 0x90, 0xb6, 0x92, 0x7c,
+	0xe4, 0x14, 0x5d, 0x11, 0x95, 0x84, 0x10, 0xb4, 0xb3, 0xda, 0x13, 0x4d, 0xda, 0x46, 0x8f, 0x60,
+	0x2b, 0x8b, 0x29, 0x67, 0x9a, 0x84, 0xe4, 0xb7, 0xd0, 0xe6, 0xf5, 0x35, 0xed, 0xd0, 0x9e, 0x10,
+	0x4a, 0x42, 0x24, 0x41, 0xe5, 0x94, 0xdc, 0x89, 0xce, 0x61, 0x8f, 0x6c, 0xae, 0x9c, 0xdb, 0xfe,
+	0x3c, 0xb9, 0x1a, 0xc5, 0x82, 0xfc, 0xb7, 0x12, 0xf7, 0xc7, 0xd9, 0x99, 0x66, 0x4a, 0xbb, 0x45,
+	0x78, 0x58, 0x00, 0x0f, 0x3a, 0xbb, 0x76, 0x61, 0x83, 0xbd, 0x96, 0xf3, 0x48, 0x0c, 0x31, 0x21,
+	0xa1, 0xdf, 0x01, 0xa4, 0x21, 0x46, 0x9d, 0x75, 0xfe, 0x46, 0xec, 0x88, 0x37, 0x22, 0xbf, 0x01,
+	0x9c, 0x31, 0x94, 0x3f, 0xc1, 0x96, 0x31, 0x18, 0xe6, 0x62, 0x3c, 0x80, 0x26, 0x1f, 0x0f, 0x97,
+	0xb6, 0x43, 0xc4, 0xd1, 0xda, 0xc2, 0x59, 0x28, 0x9d, 0x2a, 0x4c, 0xe4, 0x3b, 0x29, 0x67, 0xa6,
+	0x4a, 0x02, 0xde, 0x17, 0x29, 0xbb, 0x46, 0xb5, 0xce, 0x49, 0x18, 0x79, 0xc1, 0x54, 0xec, 0xa9,
+	0x03, 0xb5, 0x9b, 0x18, 0x10, 0x39, 0x49, 0x44, 0x96, 0xaf, 0x8b, 0xb9, 0xe7, 0xbb, 0x43, 0x6f,
+	0x92, 0x5e, 0x3c, 0x53, 0x80, 0xcd, 0x46, 0x87, 0x9f, 0x13, 0xef, 0xed, 0xe8, 0x5a, 0xac, 0x92,
+	0x41, 0x18, 0xfb, 0xca, 0xa3, 0x22, 0x88, 0xf8, 0x14, 0x5f, 0x00, 0xf2, 0x5b, 0xa8, 0x0f, 0x82,
+	0xab, 0x01, 0xb9, 0x21, 0x3e, 0xab, 0xa0, 0xcf, 0x1e, 0xc4, 0xfa, 0xb1, 0xc0, 0x76, 0xe0, 0xd8,
+	0xbe, 0x2f, 0x2a, 0x51, 0xc7, 0x42, 0x92, 0x55, 0xa8, 0x63, 0x12, 0xcd, 0x82, 0x69, 0x44, 0xd0,
+	0x53, 0x68, 0x46, 0xdc, 0xdf, 0xd8, 0x09, 0x5c, 0x22, 0x2e, 0x22, 0x10, 0x43, 0xdd, 0xc0, 0x25,
+	0x6c, 0x73, 0x13, 0x12, 0x45, 0xf6, 0x55, 0xb2, 0x81, 0x44, 0x94, 0xff, 0x5a, 0x82, 0x26, 0x9b,
+	0xfe, 0x49, 0xe2, 0x5f, 0xc0, 0x86, 0x31, 0x9d, 0x63, 0xf2, 0x49, 0xcc, 0xd1, 0xed, 0xcc, 0xf8,
+	0x8b, 0x4d, 0xb0, 0x30, 0x40, 0xef, 0x60, 0xd3, 0x9a, 0x5f, 0x28, 0xfc, 0xfc, 0x3d, 0xb7, 0x7d,
+	0xee, 0xb9, 0x9d, 0xd6, 0x3b, 0x55, 0xf1, 0x59, 0x84, 0x73, 0xa6, 0xac, 0xc9, 0xfa, 0x61, 0x30,
+	0x9f, 0x25, 0xa7, 0x64, 0x9c, 0xb6, 0x1c, 0x26, 0x9f, 0x42, 0x95, 0x5d, 0xdd, 0x22, 0xf4, 0x2d,
+	0xc0, 0xa5, 0x1f, 0xdc, 0x8e, 0x1d, 0xfe, 0x85, 0x25, 0xa6, 0x1f, 0x43, 0xe2, 0xef, 0xab, 0xef,
+	0xa0, 0xca, 0x04, 0x76, 0xd4, 0xb2, 0x7e, 0x6b, 0x1d, 0x26, 0x9f, 0x88, 0x8c, 0x8d, 0x63, 0x9d,
+	0xfc, 0x14, 0x6a, 0xac, 0x5a, 0xc1, 0x9c, 0xb2, 0x34, 0xbb, 0xc4, 0xb7, 0xef, 0x84, 0xa7, 0x58,
+	0x90, 0x6b, 0x50, 0x55, 0x27, 0x33, 0x7a, 0xf7, 0xf2, 0x35, 0xb4, 0xf3, 0xa1, 0xa3, 0x3a, 0xac,
+	0xff, 0x6c, 0x68, 0xec, 0x42, 0xdc, 0x80, 0xea, 0x40, 0x55, 0xce, 0x55, 0xa9, 0x84, 0x00, 0x36,
+	0x18, 0x78, 0xfe, 0x46, 0x2a, 0x1f, 0xfd, 0xa3, 0x09, 0xd5, 0xe3, 0x63, 0xcb, 0x9b, 0xa0, 0x57,
+	0x50, 0x13, 0x5d, 0x85, 0x36, 0x45, 0x1e, 0xb8, 0xd7, 0xbd, 0xc7, 0x42, 0xca, 0xf5, 0x9c, 0xbc,
+	0x86, 0x5e, 0x43, 0xd3, 0x22, 0x34, 0x6d, 0x81, 0x2d, 0x61, 0x96, 0x00, 0x7b, 0xcb, 0x80, 0xbc,
+	0x86, 0x9e, 0xc1, 0x46, 0x9f, 0x50, 0xf6, 0xad, 0x93, 0x5f, 0x02, 0x16, 0x97, 0x56, 0x79, 0x0d,
+	0xfd, 0x11, 0x3a, 0xb1, 0x55, 0xc1, 0x8d, 0xf7, 0xe9, 0x17, 0x3e, 0x0c, 0xf6, 0xf6, 0x3f, 0x63,
+	0x10, 0xc9, 0x6b, 0xe8, 0x07, 0x00, 0x33, 0xb8, 0x25, 0x61, 0x30, 0x5d, 0x0d, 0x23, 0x89, 0x38,
+	0x69, 0x4e, 0x79, 0x0d, 0x1d, 0x42, 0xd3, 0xba, 0x9e, 0x53, 0x37, 0xb8, 0x7d, 0x98, 0xfd, 0x6f,
+	0xa0, 0x81, 0xc9, 0x45, 0x10, 0xd0, 0x07, 0x59, 0xb3, 0x82, 0xd1, 0x60, 0x76, 0x85, 0xcd, 0x2e,
+	0x3b, 0x75, 0x49, 0xf8, 0x65, 0xca, 0x11, 0x6c, 0x59, 0xd4, 0x0e, 0xe9, 0xd7, 0x70, 0x7e, 0x82,
+	0x6d, 0x4c, 0xa2, 0x25, 0x56, 0x72, 0xdc, 0x8b, 0xde, 0x2a, 0xe2, 0xbd, 0x88, 0xcb, 0xa5, 0x8f,
+	0xd0, 0xea, 0xab, 0xb4, 0x97, 0xb9, 0x5c, 0xc8, 0x6b, 0xe8, 0xd7, 0xec, 0x02, 0x46, 0xf9, 0x25,
+	0x24, 0x1f, 0x4e, 0x73, 0x61, 0x16, 0xc5, 0xf9, 0xec, 0x13, 0x9a, 0x5e, 0x41, 0x8a, 0x43, 0x4f,
+	0xd4, 0x3c, 0xf4, 0x36, 0xf3, 0x3b, 0x9d, 0xa7, 0x94, 0x82, 0x50, 0x0a, 0x78, 0x6f, 0x32, 0x75,
+	0x2b, 0x8e, 0xff, 0x9e, 0xdc, 0x0a, 0x92, 0xe2, 0xfb, 0x05, 0x9b, 0x29, 0xe0, 0xbc, 0x83, 0xed,
+	0xcc, 0x42, 0x91, 0x31, 0x35, 0x0d, 0x3d, 0x5d, 0x6e, 0x71, 0x0d, 0x2a, 0x5e, 0x2e, 0x6d, 0xc5,
+	0x07, 0x87, 0xf8, 0x1a, 0xda, 0x82, 0xf3, 0xe0, 0x08, 0xdf, 0x82, 0xb4, 0x58, 0xe6, 0xab, 0x02,
+	0xfc, 0x2d, 0x6c, 0x8a, 0xbe, 0x89, 0x6f, 0xe8, 0x0f, 0x0b, 0xf1, 0x0d, 0x34, 0x05, 0x8b, 0x5f,
+	0xdc, 0x1f, 0x46, 0x3a, 0x86, 0x1d, 0x8b, 0xd7, 0x99, 0x1f, 0xa5, 0xda, 0xd4, 0xf5, 0x1c, 0x9b,
+	0x8d, 0x31, 0xb4, 0xbb, 0xa0, 0x67, 0x4f, 0xd9, 0xcf, 0xf8, 0x60, 0x2f, 0xfe, 0x3d, 0x3e, 0xf2,
+	0x27, 0x75, 0x91, 0x8f, 0x1f, 0xa0, 0xde, 0x27, 0x34, 0x1e, 0xde, 0x05, 0x91, 0x27, 0xc9, 0xe6,
+	0x06, 0x3c, 0xb7, 0x5b, 0xdd, 0x6b, 0x7b, 0x7a, 0x45, 0xd8, 0x39, 0x14, 0x7f, 0x0c, 0x20, 0x61,
+	0x92, 0x39, 0x99, 0x8a, 0x16, 0x3a, 0x85, 0x6f, 0xe2, 0xc6, 0x5e, 0xfd, 0x30, 0x28, 0x58, 0xf7,
+	0xc9, 0x02, 0x5a, 0xb1, 0x97, 0xd7, 0x8e, 0xbf, 0xff, 0xc3, 0x77, 0x57, 0x1e, 0xbd, 0x9e, 0x5f,
+	0x1c, 0x3a, 0xc1, 0x84, 0xff, 0xcf, 0xe8, 0x04, 0xa1, 0x2b, 0xfe, 0x98, 0x4c, 0xff, 0xa2, 0xbc,
+	0xd8, 0xe0, 0xff, 0x2b, 0xbe, 0xf9, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xce, 0x0d, 0xfb, 0x2c,
+	0xb6, 0x14, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/api/bbsim/bbsim.proto b/api/bbsim/bbsim.proto
index e6a253d..0216eb5 100644
--- a/api/bbsim/bbsim.proto
+++ b/api/bbsim/bbsim.proto
@@ -13,6 +13,9 @@
 // limitations under the License.
 
 syntax = "proto3";
+
+option go_package = "github.com/opencord/bbsim/api/bbsim";
+
 package bbsim;
 
 import "voltha_protos/openolt.proto";
diff --git a/api/bbsim/bbsim_dmi.pb.go b/api/bbsim/bbsim_dmi.pb.go
index 7dd373d..d2cc5f8 100644
--- a/api/bbsim/bbsim_dmi.pb.go
+++ b/api/bbsim/bbsim_dmi.pb.go
@@ -118,19 +118,21 @@
 func init() { proto.RegisterFile("api/bbsim/bbsim_dmi.proto", fileDescriptor_49e784b4938902cc) }
 
 var fileDescriptor_49e784b4938902cc = []byte{
-	// 190 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4c, 0x2c, 0xc8, 0xd4,
-	0x4f, 0x4a, 0x2a, 0xce, 0xcc, 0x85, 0x90, 0xf1, 0x29, 0xb9, 0x99, 0x7a, 0x05, 0x45, 0xf9, 0x25,
-	0xf9, 0x42, 0xac, 0x60, 0x01, 0x25, 0x4d, 0x2e, 0x0e, 0x97, 0xdc, 0x4c, 0xd7, 0xb2, 0xd4, 0xbc,
-	0x12, 0x21, 0x59, 0x2e, 0xae, 0x54, 0x10, 0x23, 0x3e, 0x2f, 0x31, 0x37, 0x55, 0x82, 0x51, 0x81,
-	0x51, 0x83, 0x33, 0x88, 0x13, 0x2c, 0xe2, 0x97, 0x98, 0x9b, 0xaa, 0x14, 0xcc, 0x25, 0xe6, 0x92,
-	0x9b, 0xe9, 0x5c, 0x94, 0x9a, 0x58, 0x92, 0x0a, 0xd6, 0x10, 0x94, 0x5a, 0x5c, 0x90, 0x9f, 0x57,
-	0x9c, 0x2a, 0x24, 0xcf, 0xc5, 0x5d, 0x5c, 0x92, 0x58, 0x52, 0x5a, 0x1c, 0x9f, 0x9c, 0x9f, 0x02,
-	0xd1, 0xc9, 0x1a, 0xc4, 0x05, 0x11, 0x72, 0xce, 0x4f, 0x49, 0x15, 0x92, 0xe0, 0x62, 0xcf, 0x4d,
-	0x2d, 0x2e, 0x4e, 0x4c, 0x4f, 0x95, 0x60, 0x02, 0x1b, 0x0b, 0xe3, 0x1a, 0xf9, 0x70, 0x71, 0x3a,
-	0x39, 0x41, 0x5d, 0x26, 0x64, 0xcf, 0xc5, 0x8d, 0x64, 0xbc, 0x10, 0xbf, 0x1e, 0xd8, 0x8d, 0x7a,
-	0x30, 0x07, 0x4a, 0xc9, 0x22, 0x04, 0xb0, 0x38, 0x43, 0x89, 0x21, 0x89, 0x0d, 0xec, 0x37, 0x63,
-	0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3f, 0x8b, 0xf2, 0xfd, 0xf8, 0x00, 0x00, 0x00,
+	// 216 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0x31, 0x4b, 0xc5, 0x30,
+	0x14, 0x85, 0x7d, 0xc2, 0x53, 0x7b, 0xdf, 0x20, 0x64, 0x90, 0x2a, 0x3c, 0x94, 0x8a, 0xa0, 0x4b,
+	0x0a, 0xfa, 0x03, 0x84, 0xb6, 0x6e, 0xe2, 0x50, 0x37, 0x97, 0x92, 0x34, 0x97, 0x9a, 0xe1, 0xe6,
+	0x86, 0x26, 0xf5, 0xf7, 0x8b, 0x69, 0xab, 0x0e, 0x6f, 0x09, 0xb9, 0x1f, 0x9c, 0xc3, 0xc7, 0x81,
+	0x4b, 0xe5, 0x6d, 0xa9, 0x75, 0xb0, 0x34, 0xbf, 0x9d, 0x21, 0x2b, 0xfd, 0xc8, 0x91, 0xc5, 0x36,
+	0x81, 0xe2, 0x01, 0xce, 0x1a, 0xb2, 0x2f, 0x5f, 0xe8, 0xa2, 0xd8, 0x03, 0xe0, 0xcf, 0xa7, 0x73,
+	0x8a, 0x30, 0xdf, 0xdc, 0x6c, 0xee, 0xb3, 0x36, 0x4b, 0xe4, 0x4d, 0x11, 0x16, 0xef, 0x70, 0xd1,
+	0x90, 0xad, 0x47, 0x54, 0x11, 0x53, 0xa0, 0xc5, 0xe0, 0xd9, 0x05, 0x14, 0xd7, 0xb0, 0x0b, 0x51,
+	0xc5, 0x29, 0x74, 0x3d, 0x9b, 0x39, 0xb9, 0x6d, 0x61, 0x46, 0x35, 0x1b, 0x14, 0x39, 0x9c, 0x12,
+	0x86, 0xa0, 0x06, 0xcc, 0x8f, 0x53, 0xed, 0x7a, 0x3e, 0xbe, 0x42, 0x56, 0x55, 0x8b, 0x99, 0x78,
+	0x86, 0xdd, 0xbf, 0x7a, 0x71, 0x2e, 0x93, 0xa3, 0x5c, 0x05, 0xaf, 0xf6, 0x7f, 0xe0, 0x80, 0x46,
+	0x71, 0x54, 0xdd, 0x7d, 0xdc, 0x0e, 0x36, 0x7e, 0x4e, 0x5a, 0xf6, 0x4c, 0x25, 0x7b, 0x74, 0x3d,
+	0x8f, 0x66, 0x59, 0xe0, 0x77, 0x0b, 0x7d, 0x92, 0x26, 0x78, 0xfa, 0x0e, 0x00, 0x00, 0xff, 0xff,
+	0xd2, 0x6b, 0xb3, 0x25, 0x1f, 0x01, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/api/bbsim/bbsim_dmi.proto b/api/bbsim/bbsim_dmi.proto
index c560598..bc89a16 100644
--- a/api/bbsim/bbsim_dmi.proto
+++ b/api/bbsim/bbsim_dmi.proto
@@ -13,6 +13,9 @@
 // limitations under the License.
 
 syntax = "proto3";
+
+option go_package = "github.com/opencord/bbsim/api/bbsim";
+
 package bbsim;
 
 
diff --git a/internal/bbsim/dmiserver/dmi_hw_mgmt.go b/internal/bbsim/dmiserver/dmi_hw_mgmt.go
index 5fd068c..024f7c0 100755
--- a/internal/bbsim/dmiserver/dmi_hw_mgmt.go
+++ b/internal/bbsim/dmiserver/dmi_hw_mgmt.go
@@ -82,7 +82,7 @@
 		dms.ponTransceiverCageUuids[i] = getUUID(dms.deviceSerial + "cage" + label)
 
 		transName := fmt.Sprintf("sfp-%d", i)
-		cageName := fmt.Sprintf("cage-%d", i)
+		cageName := fmt.Sprintf("sfp-plus-transceiver-cage-pon-%d", i)
 
 		trans := dmi.Component{
 			Name:        transName,