diff --git a/proto/proto3_proto/proto3.pb.go b/proto/proto3_proto/proto3.pb.go
index 2f2859a..cc4d048 100644
--- a/proto/proto3_proto/proto3.pb.go
+++ b/proto/proto3_proto/proto3.pb.go
@@ -12,6 +12,8 @@
 	Message
 	Nested
 	MessageWithMap
+	IntMap
+	IntMaps
 */
 package proto3_proto
 
@@ -251,58 +253,95 @@
 	return nil
 }
 
+type IntMap struct {
+	Rtt map[int32]int32 `protobuf:"bytes,1,rep,name=rtt" json:"rtt,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
+}
+
+func (m *IntMap) Reset()                    { *m = IntMap{} }
+func (m *IntMap) String() string            { return proto.CompactTextString(m) }
+func (*IntMap) ProtoMessage()               {}
+func (*IntMap) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+
+func (m *IntMap) GetRtt() map[int32]int32 {
+	if m != nil {
+		return m.Rtt
+	}
+	return nil
+}
+
+type IntMaps struct {
+	Maps []*IntMap `protobuf:"bytes,1,rep,name=maps" json:"maps,omitempty"`
+}
+
+func (m *IntMaps) Reset()                    { *m = IntMaps{} }
+func (m *IntMaps) String() string            { return proto.CompactTextString(m) }
+func (*IntMaps) ProtoMessage()               {}
+func (*IntMaps) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+
+func (m *IntMaps) GetMaps() []*IntMap {
+	if m != nil {
+		return m.Maps
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterType((*Message)(nil), "proto3_proto.Message")
 	proto.RegisterType((*Nested)(nil), "proto3_proto.Nested")
 	proto.RegisterType((*MessageWithMap)(nil), "proto3_proto.MessageWithMap")
+	proto.RegisterType((*IntMap)(nil), "proto3_proto.IntMap")
+	proto.RegisterType((*IntMaps)(nil), "proto3_proto.IntMaps")
 	proto.RegisterEnum("proto3_proto.Message_Humour", Message_Humour_name, Message_Humour_value)
 }
 
 func init() { proto.RegisterFile("proto3_proto/proto3.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 680 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x93, 0x6d, 0x6b, 0xdb, 0x3a,
-	0x14, 0xc7, 0xaf, 0xe3, 0x3c, 0x38, 0xc7, 0x4e, 0xeb, 0xab, 0xf6, 0x82, 0x9a, 0x7b, 0x5f, 0xf8,
-	0x66, 0x30, 0xcc, 0x1e, 0xdc, 0x2d, 0xa3, 0x50, 0xc6, 0xd8, 0x68, 0xbb, 0x96, 0x85, 0xa6, 0x59,
-	0x50, 0xda, 0x95, 0xbd, 0x32, 0x4e, 0xa2, 0x24, 0x66, 0xb1, 0x1c, 0x6c, 0x79, 0xe0, 0xaf, 0xb3,
-	0x2f, 0xba, 0x21, 0xc9, 0x49, 0xdd, 0x92, 0x6e, 0xaf, 0x7c, 0xf4, 0xf7, 0xef, 0xe8, 0x1c, 0xfd,
-	0x75, 0x04, 0x07, 0xab, 0x24, 0xe6, 0xf1, 0x1b, 0x5f, 0x7e, 0x0e, 0xd5, 0xc2, 0x93, 0x1f, 0x64,
-	0x95, 0x7f, 0xb5, 0x0f, 0xe6, 0x71, 0x3c, 0x5f, 0x52, 0x85, 0x8c, 0xb3, 0xd9, 0x61, 0xc0, 0x72,
-	0x05, 0xb6, 0xf7, 0x38, 0x4d, 0xf9, 0x34, 0xe0, 0xc1, 0xa1, 0x08, 0x94, 0xd8, 0xf9, 0xd9, 0x80,
-	0xc6, 0x15, 0x4d, 0xd3, 0x60, 0x4e, 0x11, 0x82, 0x2a, 0x0b, 0x22, 0x8a, 0x35, 0x47, 0x73, 0x9b,
-	0x44, 0xc6, 0xe8, 0x18, 0x8c, 0x45, 0xb8, 0x0c, 0x92, 0x90, 0xe7, 0xb8, 0xe2, 0x68, 0xee, 0x4e,
-	0xf7, 0x3f, 0xaf, 0x5c, 0xd0, 0x2b, 0x92, 0xbd, 0x4f, 0x59, 0x14, 0x67, 0x09, 0xd9, 0xd0, 0xc8,
-	0x01, 0x6b, 0x41, 0xc3, 0xf9, 0x82, 0xfb, 0x21, 0xf3, 0x27, 0x11, 0xd6, 0x1d, 0xcd, 0x6d, 0x11,
-	0x50, 0x5a, 0x8f, 0x9d, 0x45, 0xa2, 0x9e, 0x68, 0x07, 0x57, 0x1d, 0xcd, 0xb5, 0x88, 0x8c, 0xd1,
-	0xff, 0x60, 0x25, 0x34, 0xcd, 0x96, 0xdc, 0x9f, 0xc4, 0x19, 0xe3, 0xb8, 0xe1, 0x68, 0xae, 0x4e,
-	0x4c, 0xa5, 0x9d, 0x09, 0x09, 0x3d, 0x81, 0x16, 0x4f, 0x32, 0xea, 0xa7, 0x93, 0x98, 0xa7, 0x51,
-	0xc0, 0xb0, 0xe1, 0x68, 0xae, 0x41, 0x2c, 0x21, 0x8e, 0x0a, 0x0d, 0xed, 0x43, 0x2d, 0x9d, 0xc4,
-	0x09, 0xc5, 0x4d, 0x47, 0x73, 0x2b, 0x44, 0x2d, 0x90, 0x0d, 0xfa, 0x37, 0x9a, 0xe3, 0x9a, 0xa3,
-	0xbb, 0x55, 0x22, 0x42, 0xf4, 0x2f, 0x34, 0xd3, 0x45, 0x9c, 0x70, 0x5f, 0xe8, 0x7b, 0x8e, 0xee,
-	0xd6, 0x88, 0x21, 0x85, 0x4b, 0x9a, 0xa3, 0x17, 0x50, 0x67, 0x34, 0xe5, 0x74, 0x8a, 0xeb, 0x8e,
-	0xe6, 0x9a, 0xdd, 0xfd, 0xfb, 0x47, 0x1f, 0xc8, 0x7f, 0xa4, 0x60, 0xd0, 0x11, 0x34, 0x12, 0x7f,
-	0x96, 0x31, 0x96, 0x63, 0xdb, 0xd1, 0xff, 0xe8, 0x54, 0x3d, 0xb9, 0x10, 0x2c, 0x7a, 0x07, 0x0d,
-	0x4e, 0x93, 0x24, 0x08, 0x19, 0x06, 0x47, 0x77, 0xcd, 0x6e, 0x67, 0x7b, 0xda, 0xb5, 0x82, 0xce,
-	0x19, 0x4f, 0x72, 0xb2, 0x4e, 0x41, 0xc7, 0xa0, 0xee, 0xbf, 0xeb, 0xcf, 0x42, 0xba, 0x9c, 0x62,
-	0x53, 0x36, 0xfa, 0x8f, 0xb7, 0xbe, 0x6b, 0x6f, 0x94, 0x8d, 0x3f, 0xd2, 0x59, 0x90, 0x2d, 0x79,
-	0x4a, 0x4c, 0x85, 0x5e, 0x08, 0x12, 0xf5, 0x36, 0x99, 0xdf, 0x83, 0x65, 0x46, 0x71, 0x4b, 0x16,
-	0x7f, 0xba, 0xbd, 0xf8, 0x50, 0x92, 0x5f, 0x04, 0xa8, 0x1a, 0x28, 0xb6, 0x92, 0x0a, 0x7a, 0x05,
-	0x46, 0xc0, 0x72, 0xbe, 0x08, 0xd9, 0x1c, 0xef, 0x14, 0x4e, 0xa9, 0x39, 0xf4, 0xd6, 0x73, 0xe8,
-	0x9d, 0xb0, 0x9c, 0x6c, 0x28, 0x74, 0x04, 0x66, 0x14, 0xb0, 0xdc, 0x97, 0xab, 0x14, 0xef, 0xca,
-	0xda, 0xdb, 0x93, 0x40, 0x80, 0xd7, 0x92, 0x43, 0x47, 0x00, 0x69, 0x36, 0x8e, 0x54, 0x53, 0xf8,
-	0xef, 0xe2, 0xac, 0xdb, 0x3a, 0x26, 0x25, 0x10, 0xbd, 0x06, 0x63, 0xb2, 0x08, 0x97, 0xd3, 0x84,
-	0x32, 0x8c, 0x64, 0xa9, 0x47, 0x92, 0x36, 0x58, 0x7b, 0x08, 0x56, 0xd9, 0xf0, 0xf5, 0xe4, 0xa8,
-	0xa7, 0x21, 0x27, 0xe7, 0x19, 0xd4, 0x94, 0x71, 0x95, 0xdf, 0xcc, 0x86, 0x42, 0xde, 0x56, 0x8e,
-	0xb5, 0xf6, 0x0d, 0xd8, 0x0f, 0x5d, 0xdc, 0xb2, 0xeb, 0xf3, 0xfb, 0xbb, 0x3e, 0x72, 0x91, 0x77,
-	0xdb, 0x76, 0x3e, 0x40, 0x5d, 0x0d, 0x14, 0x32, 0xa1, 0x71, 0x33, 0xb8, 0x1c, 0x7c, 0xbe, 0x1d,
-	0xd8, 0x7f, 0x21, 0x03, 0xaa, 0xc3, 0x9b, 0xc1, 0xc8, 0xd6, 0x50, 0x0b, 0x9a, 0xa3, 0xfe, 0xc9,
-	0x70, 0x74, 0xdd, 0x3b, 0xbb, 0xb4, 0x2b, 0x68, 0x17, 0xcc, 0xd3, 0x5e, 0xbf, 0xef, 0x9f, 0x9e,
-	0xf4, 0xfa, 0xe7, 0x5f, 0x6d, 0xbd, 0xd3, 0x85, 0xba, 0x6a, 0x56, 0xbc, 0x99, 0xb1, 0x1c, 0x5f,
-	0xd5, 0x8f, 0x5a, 0x88, 0x57, 0x3a, 0xc9, 0xb8, 0x6a, 0xc8, 0x20, 0x32, 0xee, 0xfc, 0xd0, 0x60,
-	0xa7, 0xf0, 0xec, 0x36, 0xe4, 0x8b, 0xab, 0x60, 0x85, 0x86, 0x60, 0x8d, 0x73, 0x4e, 0xfd, 0x28,
-	0x58, 0xad, 0xc4, 0x1c, 0x68, 0xd2, 0xe7, 0x97, 0x5b, 0x7d, 0x2e, 0x72, 0xbc, 0xd3, 0x9c, 0xd3,
-	0x2b, 0xc5, 0x17, 0x53, 0x35, 0xbe, 0x53, 0xda, 0xef, 0xc1, 0x7e, 0x08, 0x94, 0x0d, 0x33, 0x94,
-	0x61, 0xfb, 0x65, 0xc3, 0xac, 0x92, 0x33, 0xe3, 0xba, 0x2a, 0xfd, 0x2b, 0x00, 0x00, 0xff, 0xff,
-	0x8b, 0x40, 0x3c, 0xbe, 0x3c, 0x05, 0x00, 0x00,
+	// 733 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x53, 0x6d, 0x6f, 0xf3, 0x34,
+	0x14, 0x25, 0x4d, 0x5f, 0xd2, 0x9b, 0x74, 0x0b, 0x5e, 0x91, 0xbc, 0x02, 0x52, 0x28, 0x12, 0x8a,
+	0x78, 0x49, 0xa1, 0xd3, 0xd0, 0x84, 0x10, 0x68, 0x1b, 0x9b, 0xa8, 0xd6, 0x95, 0xca, 0xdd, 0x98,
+	0xf8, 0x14, 0xa5, 0xad, 0xdb, 0x46, 0x34, 0x4e, 0x49, 0x1c, 0xa4, 0xfc, 0x1d, 0xfe, 0x28, 0x8f,
+	0x6c, 0xa7, 0x5d, 0x36, 0x65, 0xcf, 0xf3, 0x29, 0xf6, 0xf1, 0xb9, 0xf7, 0x9c, 0x1c, 0x5f, 0xc3,
+	0xe9, 0x2e, 0x89, 0x79, 0x7c, 0xe6, 0xcb, 0xcf, 0x40, 0x6d, 0x3c, 0xf9, 0x41, 0x56, 0xf9, 0xa8,
+	0x77, 0xba, 0x8e, 0xe3, 0xf5, 0x96, 0x2a, 0xca, 0x3c, 0x5b, 0x0d, 0x02, 0x96, 0x2b, 0x62, 0xef,
+	0x84, 0xd3, 0x94, 0x2f, 0x03, 0x1e, 0x0c, 0xc4, 0x42, 0x81, 0xfd, 0xff, 0x5b, 0xd0, 0xba, 0xa7,
+	0x69, 0x1a, 0xac, 0x29, 0x42, 0x50, 0x67, 0x41, 0x44, 0xb1, 0xe6, 0x68, 0x6e, 0x9b, 0xc8, 0x35,
+	0xba, 0x00, 0x63, 0x13, 0x6e, 0x83, 0x24, 0xe4, 0x39, 0xae, 0x39, 0x9a, 0x7b, 0x34, 0xfc, 0xcc,
+	0x2b, 0x0b, 0x7a, 0x45, 0xb1, 0xf7, 0x7b, 0x16, 0xc5, 0x59, 0x42, 0x0e, 0x6c, 0xe4, 0x80, 0xb5,
+	0xa1, 0xe1, 0x7a, 0xc3, 0xfd, 0x90, 0xf9, 0x8b, 0x08, 0xeb, 0x8e, 0xe6, 0x76, 0x08, 0x28, 0x6c,
+	0xc4, 0xae, 0x23, 0xa1, 0x27, 0xec, 0xe0, 0xba, 0xa3, 0xb9, 0x16, 0x91, 0x6b, 0xf4, 0x05, 0x58,
+	0x09, 0x4d, 0xb3, 0x2d, 0xf7, 0x17, 0x71, 0xc6, 0x38, 0x6e, 0x39, 0x9a, 0xab, 0x13, 0x53, 0x61,
+	0xd7, 0x02, 0x42, 0x5f, 0x42, 0x87, 0x27, 0x19, 0xf5, 0xd3, 0x45, 0xcc, 0xd3, 0x28, 0x60, 0xd8,
+	0x70, 0x34, 0xd7, 0x20, 0x96, 0x00, 0x67, 0x05, 0x86, 0xba, 0xd0, 0x48, 0x17, 0x71, 0x42, 0x71,
+	0xdb, 0xd1, 0xdc, 0x1a, 0x51, 0x1b, 0x64, 0x83, 0xfe, 0x37, 0xcd, 0x71, 0xc3, 0xd1, 0xdd, 0x3a,
+	0x11, 0x4b, 0xf4, 0x29, 0xb4, 0xd3, 0x4d, 0x9c, 0x70, 0x5f, 0xe0, 0x27, 0x8e, 0xee, 0x36, 0x88,
+	0x21, 0x81, 0x3b, 0x9a, 0xa3, 0x6f, 0xa1, 0xc9, 0x68, 0xca, 0xe9, 0x12, 0x37, 0x1d, 0xcd, 0x35,
+	0x87, 0xdd, 0x97, 0xbf, 0x3e, 0x91, 0x67, 0xa4, 0xe0, 0xa0, 0x73, 0x68, 0x25, 0xfe, 0x2a, 0x63,
+	0x2c, 0xc7, 0xb6, 0xa3, 0x7f, 0x30, 0xa9, 0x66, 0x72, 0x2b, 0xb8, 0xe8, 0x67, 0x68, 0x71, 0x9a,
+	0x24, 0x41, 0xc8, 0x30, 0x38, 0xba, 0x6b, 0x0e, 0xfb, 0xd5, 0x65, 0x0f, 0x8a, 0x74, 0xc3, 0x78,
+	0x92, 0x93, 0x7d, 0x09, 0xba, 0x00, 0x75, 0xff, 0x43, 0x7f, 0x15, 0xd2, 0xed, 0x12, 0x9b, 0xd2,
+	0xe8, 0x27, 0xde, 0xfe, 0xae, 0xbd, 0x59, 0x36, 0xff, 0x8d, 0xae, 0x82, 0x6c, 0xcb, 0x53, 0x62,
+	0x2a, 0xea, 0xad, 0x60, 0xa2, 0xd1, 0xa1, 0xf2, 0xdf, 0x60, 0x9b, 0x51, 0xdc, 0x91, 0xe2, 0x5f,
+	0x55, 0x8b, 0x4f, 0x25, 0xf3, 0x4f, 0x41, 0x54, 0x06, 0x8a, 0x56, 0x12, 0x41, 0xdf, 0x83, 0x11,
+	0xb0, 0x9c, 0x6f, 0x42, 0xb6, 0xc6, 0x47, 0x45, 0x52, 0x6a, 0x0e, 0xbd, 0xfd, 0x1c, 0x7a, 0x97,
+	0x2c, 0x27, 0x07, 0x16, 0x3a, 0x07, 0x33, 0x0a, 0x58, 0xee, 0xcb, 0x5d, 0x8a, 0x8f, 0xa5, 0x76,
+	0x75, 0x11, 0x08, 0xe2, 0x83, 0xe4, 0xa1, 0x73, 0x80, 0x34, 0x9b, 0x47, 0xca, 0x14, 0xfe, 0xb8,
+	0xf8, 0xd7, 0x2a, 0xc7, 0xa4, 0x44, 0x44, 0x3f, 0x80, 0xb1, 0xd8, 0x84, 0xdb, 0x65, 0x42, 0x19,
+	0x46, 0x52, 0xea, 0x8d, 0xa2, 0x03, 0xad, 0x37, 0x05, 0xab, 0x1c, 0xf8, 0x7e, 0x72, 0xd4, 0xd3,
+	0x90, 0x93, 0xf3, 0x35, 0x34, 0x54, 0x70, 0xb5, 0xf7, 0xcc, 0x86, 0xa2, 0xfc, 0x54, 0xbb, 0xd0,
+	0x7a, 0x8f, 0x60, 0xbf, 0x4e, 0xb1, 0xa2, 0xeb, 0x37, 0x2f, 0xbb, 0xbe, 0x71, 0x91, 0xcf, 0x6d,
+	0xfb, 0xbf, 0x42, 0x53, 0x0d, 0x14, 0x32, 0xa1, 0xf5, 0x38, 0xb9, 0x9b, 0xfc, 0xf1, 0x34, 0xb1,
+	0x3f, 0x42, 0x06, 0xd4, 0xa7, 0x8f, 0x93, 0x99, 0xad, 0xa1, 0x0e, 0xb4, 0x67, 0xe3, 0xcb, 0xe9,
+	0xec, 0x61, 0x74, 0x7d, 0x67, 0xd7, 0xd0, 0x31, 0x98, 0x57, 0xa3, 0xf1, 0xd8, 0xbf, 0xba, 0x1c,
+	0x8d, 0x6f, 0xfe, 0xb2, 0xf5, 0xfe, 0x10, 0x9a, 0xca, 0xac, 0x78, 0x33, 0x73, 0x39, 0xbe, 0xca,
+	0x8f, 0xda, 0x88, 0x57, 0xba, 0xc8, 0xb8, 0x32, 0x64, 0x10, 0xb9, 0xee, 0xff, 0xa7, 0xc1, 0x51,
+	0x91, 0xd9, 0x53, 0xc8, 0x37, 0xf7, 0xc1, 0x0e, 0x4d, 0xc1, 0x9a, 0xe7, 0x9c, 0xfa, 0x51, 0xb0,
+	0xdb, 0x89, 0x39, 0xd0, 0x64, 0xce, 0xdf, 0x55, 0xe6, 0x5c, 0xd4, 0x78, 0x57, 0x39, 0xa7, 0xf7,
+	0x8a, 0x5f, 0x4c, 0xd5, 0xfc, 0x19, 0xe9, 0xfd, 0x02, 0xf6, 0x6b, 0x42, 0x39, 0x30, 0x43, 0x05,
+	0xd6, 0x2d, 0x07, 0x66, 0x95, 0x93, 0xf9, 0x07, 0x9a, 0x23, 0xc6, 0x85, 0xb7, 0x01, 0xe8, 0x09,
+	0xe7, 0x85, 0xa5, 0xcf, 0x5f, 0x5a, 0x52, 0x14, 0x8f, 0x70, 0xae, 0x2c, 0x08, 0x66, 0xef, 0x47,
+	0x30, 0xf6, 0x40, 0x59, 0xb2, 0x51, 0x21, 0xd9, 0x28, 0x4b, 0x9e, 0x41, 0x4b, 0xf5, 0x4b, 0x91,
+	0x0b, 0xf5, 0x28, 0xd8, 0xa5, 0x85, 0x68, 0xb7, 0x4a, 0x94, 0x48, 0xc6, 0xbc, 0xa9, 0x8e, 0xde,
+	0x05, 0x00, 0x00, 0xff, 0xff, 0x75, 0x38, 0xad, 0x84, 0xe4, 0x05, 0x00, 0x00,
 }