diff --git a/Cargo.lock b/Cargo.lock
index e2ad8883..f1df8cc4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -793,7 +793,7 @@ dependencies = [
  "librespot-protocol 0.1.1",
  "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-bigint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rpassword 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -840,7 +840,7 @@ dependencies = [
  "librespot-protocol 0.1.1",
  "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-bigint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.97 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.97 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -871,7 +871,7 @@ dependencies = [
  "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "pbkdf2 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.97 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.97 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -896,7 +896,7 @@ dependencies = [
  "librespot-protocol 0.1.1",
  "linear-map 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -924,9 +924,9 @@ dependencies = [
 name = "librespot-protocol"
 version = "0.1.1"
 dependencies = [
- "protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "protobuf-codegen 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "protobuf-codegen-pure 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "protobuf-codegen 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "protobuf-codegen-pure 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1311,24 +1311,24 @@ dependencies = [
 
 [[package]]
 name = "protobuf"
-version = "2.8.1"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "protobuf-codegen"
-version = "2.8.1"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "protobuf-codegen-pure"
-version = "2.8.1"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "protobuf-codegen 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "protobuf-codegen 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2455,9 +2455,9 @@ dependencies = [
 "checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b"
 "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
 "checksum proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6c09721c6781493a2a492a96b5a5bf19b65917fe6728884e7c44dd0c60ca3435"
-"checksum protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40361836defdd5871ff7e84096c6f6444af7fc157f8ef1789f54f147687caa20"
-"checksum protobuf-codegen 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "12c6abd78435445fc86898ebbd0521a68438063d4a73e23527b7134e6bf58b4a"
-"checksum protobuf-codegen-pure 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c1646acda5319f5b28b0bff4a484324df43ddae2c0f5a3f3e63c0b26095cd600"
+"checksum protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e86d370532557ae7573551a1ec8235a0f8d6cb276c7c9e6aa490b511c447485"
+"checksum protobuf-codegen 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de113bba758ccf2c1ef816b127c958001b7831136c9bc3f8e9ec695ac4e82b0c"
+"checksum protobuf-codegen-pure 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d1a4febc73bf0cada1d77c459a0c8e5973179f1cfd5b0f1ab789d45b17b6440"
 "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
 "checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
 "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
diff --git a/Cargo.toml b/Cargo.toml
index 3e7019eb..ab03332d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -47,7 +47,7 @@ getopts = "0.2"
 hyper = "0.11"
 log = "0.4"
 num-bigint = "0.2"
-protobuf = "2.8.1"
+protobuf = "~2.14.0"
 rand = "0.7"
 rpassword = "3.0"
 tokio-core = "0.1"
diff --git a/connect/Cargo.toml b/connect/Cargo.toml
index 469ee85e..8be8ec6d 100644
--- a/connect/Cargo.toml
+++ b/connect/Cargo.toml
@@ -22,7 +22,7 @@ futures = "0.1"
 hyper = "0.11"
 log = "0.4"
 num-bigint = "0.2"
-protobuf = "2.8.1"
+protobuf = "~2.14.0"
 rand = "0.7"
 serde = "1.0"
 serde_derive = "1.0"
diff --git a/core/Cargo.toml b/core/Cargo.toml
index e01c9863..ac3418cc 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -25,7 +25,7 @@ log = "0.4"
 num-bigint = "0.2"
 num-integer = "0.1"
 num-traits = "0.2"
-protobuf = "2.8.1"
+protobuf = "~2.14.0"
 rand = "0.7"
 serde = "1.0"
 serde_derive = "1.0"
diff --git a/metadata/Cargo.toml b/metadata/Cargo.toml
index 328ba06e..40ebe4b8 100644
--- a/metadata/Cargo.toml
+++ b/metadata/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2018"
 byteorder = "1.3"
 futures = "0.1"
 linear-map = "1.2"
-protobuf = "2.8.1"
+protobuf = "~2.14.0"
 log = "0.4"
 
 [dependencies.librespot-core]
diff --git a/protocol/Cargo.toml b/protocol/Cargo.toml
index fa6355fe..683f8dae 100644
--- a/protocol/Cargo.toml
+++ b/protocol/Cargo.toml
@@ -8,8 +8,8 @@ license="MIT"
 edition = "2018"
 
 [dependencies]
-protobuf = "~2.8.1"
+protobuf = "~2.14.0"
 
 [build-dependencies]
-protobuf-codegen-pure = "~2.8.1"
-protobuf-codegen = "~2.8.1"
+protobuf-codegen-pure = "~2.14.0"
+protobuf-codegen = "~2.14.0"
diff --git a/protocol/build.rs b/protocol/build.rs
index 3ea25e75..de0b03ba 100644
--- a/protocol/build.rs
+++ b/protocol/build.rs
@@ -29,20 +29,21 @@ fn main() {
         }
 
         // Build the paths to relevant files.
-        let src = &format!("proto/{}.proto", name);
-        let dest = &format!("src/{}.rs", name);
-
+        let src_fname = &format!("proto/{}.proto", name);
+        let dest_fname = &format!("src/{}.rs", name);
+        let src = Path::new(src_fname);
+        let dest = Path::new(dest_fname);
         // Get the contents of the existing generated file.
         let mut existing = "".to_string();
-        if Path::new(dest).exists() {
+        if dest.exists() {
             // Removing CRLF line endings if present.
             existing = read_to_string(dest).unwrap().replace("\r\n", "\n");
         }
 
-        println!("Regenerating {} from {}", dest, src);
+        println!("Regenerating {} from {}", dest.display(), src.display());
 
         // Parse the proto files as the protobuf-codegen-pure crate does.
-        let p = parse_and_typecheck(&["proto"], &[src]).expect("protoc");
+        let p = parse_and_typecheck(&[&Path::new("proto")], &[src]).expect("protoc");
         // But generate them with the protobuf-codegen crate directly.
         // Then we can keep the result in-memory.
         let result = protobuf_codegen::gen(&p.file_descriptors, &p.relative_paths, &customizations);
diff --git a/protocol/src/authentication.rs b/protocol/src/authentication.rs
index ca282991..2dc30125 100644
--- a/protocol/src/authentication.rs
+++ b/protocol/src/authentication.rs
@@ -1,7 +1,7 @@
-// This file is generated by rust-protobuf 2.8.1. Do not edit
+// This file is generated by rust-protobuf 2.14.0. Do not edit
 // @generated
 
-// https://github.com/Manishearth/rust-clippy/issues/702
+// https://github.com/rust-lang/rust-clippy/issues/702
 #![allow(unknown_lints)]
 #![allow(clippy::all)]
 
@@ -24,7 +24,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions;
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_1;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0;
 
 #[derive(PartialEq,Clone,Default)]
 pub struct ClientResponseEncrypted {
@@ -541,10 +541,7 @@ impl ::protobuf::Message for ClientResponseEncrypted {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -593,7 +590,7 @@ impl ::protobuf::Message for ClientResponseEncrypted {
                     |m: &ClientResponseEncrypted| { &m.client_info },
                     |m: &mut ClientResponseEncrypted| { &mut m.client_info },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<ClientResponseEncrypted>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<ClientResponseEncrypted>(
                     "ClientResponseEncrypted",
                     fields,
                     file_descriptor_proto()
@@ -603,10 +600,7 @@ impl ::protobuf::Message for ClientResponseEncrypted {
     }
 
     fn default_instance() -> &'static ClientResponseEncrypted {
-        static mut instance: ::protobuf::lazy::Lazy<ClientResponseEncrypted> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ClientResponseEncrypted,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<ClientResponseEncrypted> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(ClientResponseEncrypted::new)
         }
@@ -635,8 +629,8 @@ impl ::std::fmt::Debug for ClientResponseEncrypted {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ClientResponseEncrypted {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -846,10 +840,7 @@ impl ::protobuf::Message for LoginCredentials {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -868,7 +859,7 @@ impl ::protobuf::Message for LoginCredentials {
                     |m: &LoginCredentials| { &m.auth_data },
                     |m: &mut LoginCredentials| { &mut m.auth_data },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<LoginCredentials>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<LoginCredentials>(
                     "LoginCredentials",
                     fields,
                     file_descriptor_proto()
@@ -878,10 +869,7 @@ impl ::protobuf::Message for LoginCredentials {
     }
 
     fn default_instance() -> &'static LoginCredentials {
-        static mut instance: ::protobuf::lazy::Lazy<LoginCredentials> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const LoginCredentials,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<LoginCredentials> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(LoginCredentials::new)
         }
@@ -904,8 +892,8 @@ impl ::std::fmt::Debug for LoginCredentials {
 }
 
 impl ::protobuf::reflect::ProtobufValue for LoginCredentials {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1093,10 +1081,7 @@ impl ::protobuf::Message for FingerprintResponseUnion {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -1110,7 +1095,7 @@ impl ::protobuf::Message for FingerprintResponseUnion {
                     |m: &FingerprintResponseUnion| { &m.hmac_ripemd },
                     |m: &mut FingerprintResponseUnion| { &mut m.hmac_ripemd },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<FingerprintResponseUnion>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<FingerprintResponseUnion>(
                     "FingerprintResponseUnion",
                     fields,
                     file_descriptor_proto()
@@ -1120,10 +1105,7 @@ impl ::protobuf::Message for FingerprintResponseUnion {
     }
 
     fn default_instance() -> &'static FingerprintResponseUnion {
-        static mut instance: ::protobuf::lazy::Lazy<FingerprintResponseUnion> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const FingerprintResponseUnion,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<FingerprintResponseUnion> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(FingerprintResponseUnion::new)
         }
@@ -1145,8 +1127,8 @@ impl ::std::fmt::Debug for FingerprintResponseUnion {
 }
 
 impl ::protobuf::reflect::ProtobufValue for FingerprintResponseUnion {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1281,10 +1263,7 @@ impl ::protobuf::Message for FingerprintGrainResponse {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -1293,7 +1272,7 @@ impl ::protobuf::Message for FingerprintGrainResponse {
                     |m: &FingerprintGrainResponse| { &m.encrypted_key },
                     |m: &mut FingerprintGrainResponse| { &mut m.encrypted_key },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<FingerprintGrainResponse>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<FingerprintGrainResponse>(
                     "FingerprintGrainResponse",
                     fields,
                     file_descriptor_proto()
@@ -1303,10 +1282,7 @@ impl ::protobuf::Message for FingerprintGrainResponse {
     }
 
     fn default_instance() -> &'static FingerprintGrainResponse {
-        static mut instance: ::protobuf::lazy::Lazy<FingerprintGrainResponse> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const FingerprintGrainResponse,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<FingerprintGrainResponse> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(FingerprintGrainResponse::new)
         }
@@ -1327,8 +1303,8 @@ impl ::std::fmt::Debug for FingerprintGrainResponse {
 }
 
 impl ::protobuf::reflect::ProtobufValue for FingerprintGrainResponse {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1463,10 +1439,7 @@ impl ::protobuf::Message for FingerprintHmacRipemdResponse {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -1475,7 +1448,7 @@ impl ::protobuf::Message for FingerprintHmacRipemdResponse {
                     |m: &FingerprintHmacRipemdResponse| { &m.hmac },
                     |m: &mut FingerprintHmacRipemdResponse| { &mut m.hmac },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<FingerprintHmacRipemdResponse>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<FingerprintHmacRipemdResponse>(
                     "FingerprintHmacRipemdResponse",
                     fields,
                     file_descriptor_proto()
@@ -1485,10 +1458,7 @@ impl ::protobuf::Message for FingerprintHmacRipemdResponse {
     }
 
     fn default_instance() -> &'static FingerprintHmacRipemdResponse {
-        static mut instance: ::protobuf::lazy::Lazy<FingerprintHmacRipemdResponse> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const FingerprintHmacRipemdResponse,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<FingerprintHmacRipemdResponse> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(FingerprintHmacRipemdResponse::new)
         }
@@ -1509,8 +1479,8 @@ impl ::std::fmt::Debug for FingerprintHmacRipemdResponse {
 }
 
 impl ::protobuf::reflect::ProtobufValue for FingerprintHmacRipemdResponse {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1698,10 +1668,7 @@ impl ::protobuf::Message for PeerTicketUnion {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -1715,7 +1682,7 @@ impl ::protobuf::Message for PeerTicketUnion {
                     |m: &PeerTicketUnion| { &m.old_ticket },
                     |m: &mut PeerTicketUnion| { &mut m.old_ticket },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<PeerTicketUnion>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<PeerTicketUnion>(
                     "PeerTicketUnion",
                     fields,
                     file_descriptor_proto()
@@ -1725,10 +1692,7 @@ impl ::protobuf::Message for PeerTicketUnion {
     }
 
     fn default_instance() -> &'static PeerTicketUnion {
-        static mut instance: ::protobuf::lazy::Lazy<PeerTicketUnion> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const PeerTicketUnion,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<PeerTicketUnion> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(PeerTicketUnion::new)
         }
@@ -1750,8 +1714,8 @@ impl ::std::fmt::Debug for PeerTicketUnion {
 }
 
 impl ::protobuf::reflect::ProtobufValue for PeerTicketUnion {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1886,10 +1850,7 @@ impl ::protobuf::Message for PeerTicketPublicKey {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -1898,7 +1859,7 @@ impl ::protobuf::Message for PeerTicketPublicKey {
                     |m: &PeerTicketPublicKey| { &m.public_key },
                     |m: &mut PeerTicketPublicKey| { &mut m.public_key },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<PeerTicketPublicKey>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<PeerTicketPublicKey>(
                     "PeerTicketPublicKey",
                     fields,
                     file_descriptor_proto()
@@ -1908,10 +1869,7 @@ impl ::protobuf::Message for PeerTicketPublicKey {
     }
 
     fn default_instance() -> &'static PeerTicketPublicKey {
-        static mut instance: ::protobuf::lazy::Lazy<PeerTicketPublicKey> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const PeerTicketPublicKey,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<PeerTicketPublicKey> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(PeerTicketPublicKey::new)
         }
@@ -1932,8 +1890,8 @@ impl ::std::fmt::Debug for PeerTicketPublicKey {
 }
 
 impl ::protobuf::reflect::ProtobufValue for PeerTicketPublicKey {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -2117,10 +2075,7 @@ impl ::protobuf::Message for PeerTicketOld {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -2134,7 +2089,7 @@ impl ::protobuf::Message for PeerTicketOld {
                     |m: &PeerTicketOld| { &m.peer_ticket_signature },
                     |m: &mut PeerTicketOld| { &mut m.peer_ticket_signature },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<PeerTicketOld>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<PeerTicketOld>(
                     "PeerTicketOld",
                     fields,
                     file_descriptor_proto()
@@ -2144,10 +2099,7 @@ impl ::protobuf::Message for PeerTicketOld {
     }
 
     fn default_instance() -> &'static PeerTicketOld {
-        static mut instance: ::protobuf::lazy::Lazy<PeerTicketOld> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const PeerTicketOld,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<PeerTicketOld> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(PeerTicketOld::new)
         }
@@ -2169,8 +2121,8 @@ impl ::std::fmt::Debug for PeerTicketOld {
 }
 
 impl ::protobuf::reflect::ProtobufValue for PeerTicketOld {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -2606,10 +2558,7 @@ impl ::protobuf::Message for SystemInfo {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -2663,7 +2612,7 @@ impl ::protobuf::Message for SystemInfo {
                     |m: &SystemInfo| { &m.device_id },
                     |m: &mut SystemInfo| { &mut m.device_id },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<SystemInfo>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<SystemInfo>(
                     "SystemInfo",
                     fields,
                     file_descriptor_proto()
@@ -2673,10 +2622,7 @@ impl ::protobuf::Message for SystemInfo {
     }
 
     fn default_instance() -> &'static SystemInfo {
-        static mut instance: ::protobuf::lazy::Lazy<SystemInfo> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const SystemInfo,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<SystemInfo> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(SystemInfo::new)
         }
@@ -2706,8 +2652,8 @@ impl ::std::fmt::Debug for SystemInfo {
 }
 
 impl ::protobuf::reflect::ProtobufValue for SystemInfo {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -3025,10 +2971,7 @@ impl ::protobuf::Message for LibspotifyAppKey {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -3057,7 +3000,7 @@ impl ::protobuf::Message for LibspotifyAppKey {
                     |m: &LibspotifyAppKey| { &m.callback_hash },
                     |m: &mut LibspotifyAppKey| { &mut m.callback_hash },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<LibspotifyAppKey>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<LibspotifyAppKey>(
                     "LibspotifyAppKey",
                     fields,
                     file_descriptor_proto()
@@ -3067,10 +3010,7 @@ impl ::protobuf::Message for LibspotifyAppKey {
     }
 
     fn default_instance() -> &'static LibspotifyAppKey {
-        static mut instance: ::protobuf::lazy::Lazy<LibspotifyAppKey> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const LibspotifyAppKey,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<LibspotifyAppKey> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(LibspotifyAppKey::new)
         }
@@ -3095,8 +3035,8 @@ impl ::std::fmt::Debug for LibspotifyAppKey {
 }
 
 impl ::protobuf::reflect::ProtobufValue for LibspotifyAppKey {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -3312,10 +3252,7 @@ impl ::protobuf::Message for ClientInfo {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -3334,7 +3271,7 @@ impl ::protobuf::Message for ClientInfo {
                     |m: &ClientInfo| { &m.language },
                     |m: &mut ClientInfo| { &mut m.language },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<ClientInfo>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<ClientInfo>(
                     "ClientInfo",
                     fields,
                     file_descriptor_proto()
@@ -3344,10 +3281,7 @@ impl ::protobuf::Message for ClientInfo {
     }
 
     fn default_instance() -> &'static ClientInfo {
-        static mut instance: ::protobuf::lazy::Lazy<ClientInfo> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ClientInfo,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<ClientInfo> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(ClientInfo::new)
         }
@@ -3370,8 +3304,8 @@ impl ::std::fmt::Debug for ClientInfo {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ClientInfo {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -3503,10 +3437,7 @@ impl ::protobuf::Message for ClientInfoFacebook {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -3515,7 +3446,7 @@ impl ::protobuf::Message for ClientInfoFacebook {
                     |m: &ClientInfoFacebook| { &m.machine_id },
                     |m: &mut ClientInfoFacebook| { &mut m.machine_id },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<ClientInfoFacebook>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<ClientInfoFacebook>(
                     "ClientInfoFacebook",
                     fields,
                     file_descriptor_proto()
@@ -3525,10 +3456,7 @@ impl ::protobuf::Message for ClientInfoFacebook {
     }
 
     fn default_instance() -> &'static ClientInfoFacebook {
-        static mut instance: ::protobuf::lazy::Lazy<ClientInfoFacebook> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ClientInfoFacebook,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<ClientInfoFacebook> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(ClientInfoFacebook::new)
         }
@@ -3549,8 +3477,8 @@ impl ::std::fmt::Debug for ClientInfoFacebook {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ClientInfoFacebook {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -3978,10 +3906,7 @@ impl ::protobuf::Message for APWelcome {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -4025,7 +3950,7 @@ impl ::protobuf::Message for APWelcome {
                     |m: &APWelcome| { &m.fb },
                     |m: &mut APWelcome| { &mut m.fb },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<APWelcome>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<APWelcome>(
                     "APWelcome",
                     fields,
                     file_descriptor_proto()
@@ -4035,10 +3960,7 @@ impl ::protobuf::Message for APWelcome {
     }
 
     fn default_instance() -> &'static APWelcome {
-        static mut instance: ::protobuf::lazy::Lazy<APWelcome> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const APWelcome,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<APWelcome> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(APWelcome::new)
         }
@@ -4066,8 +3988,8 @@ impl ::std::fmt::Debug for APWelcome {
 }
 
 impl ::protobuf::reflect::ProtobufValue for APWelcome {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -4255,10 +4177,7 @@ impl ::protobuf::Message for AccountInfo {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -4272,7 +4191,7 @@ impl ::protobuf::Message for AccountInfo {
                     |m: &AccountInfo| { &m.facebook },
                     |m: &mut AccountInfo| { &mut m.facebook },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<AccountInfo>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<AccountInfo>(
                     "AccountInfo",
                     fields,
                     file_descriptor_proto()
@@ -4282,10 +4201,7 @@ impl ::protobuf::Message for AccountInfo {
     }
 
     fn default_instance() -> &'static AccountInfo {
-        static mut instance: ::protobuf::lazy::Lazy<AccountInfo> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const AccountInfo,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<AccountInfo> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(AccountInfo::new)
         }
@@ -4307,8 +4223,8 @@ impl ::std::fmt::Debug for AccountInfo {
 }
 
 impl ::protobuf::reflect::ProtobufValue for AccountInfo {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -4393,14 +4309,11 @@ impl ::protobuf::Message for AccountInfoSpotify {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let fields = ::std::vec::Vec::new();
-                ::protobuf::reflect::MessageDescriptor::new::<AccountInfoSpotify>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<AccountInfoSpotify>(
                     "AccountInfoSpotify",
                     fields,
                     file_descriptor_proto()
@@ -4410,10 +4323,7 @@ impl ::protobuf::Message for AccountInfoSpotify {
     }
 
     fn default_instance() -> &'static AccountInfoSpotify {
-        static mut instance: ::protobuf::lazy::Lazy<AccountInfoSpotify> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const AccountInfoSpotify,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<AccountInfoSpotify> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(AccountInfoSpotify::new)
         }
@@ -4433,8 +4343,8 @@ impl ::std::fmt::Debug for AccountInfoSpotify {
 }
 
 impl ::protobuf::reflect::ProtobufValue for AccountInfoSpotify {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -4612,10 +4522,7 @@ impl ::protobuf::Message for AccountInfoFacebook {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -4629,7 +4536,7 @@ impl ::protobuf::Message for AccountInfoFacebook {
                     |m: &AccountInfoFacebook| { &m.machine_id },
                     |m: &mut AccountInfoFacebook| { &mut m.machine_id },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<AccountInfoFacebook>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<AccountInfoFacebook>(
                     "AccountInfoFacebook",
                     fields,
                     file_descriptor_proto()
@@ -4639,10 +4546,7 @@ impl ::protobuf::Message for AccountInfoFacebook {
     }
 
     fn default_instance() -> &'static AccountInfoFacebook {
-        static mut instance: ::protobuf::lazy::Lazy<AccountInfoFacebook> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const AccountInfoFacebook,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<AccountInfoFacebook> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(AccountInfoFacebook::new)
         }
@@ -4664,8 +4568,8 @@ impl ::std::fmt::Debug for AccountInfoFacebook {
 }
 
 impl ::protobuf::reflect::ProtobufValue for AccountInfoFacebook {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -4706,13 +4610,10 @@ impl ::protobuf::ProtobufEnum for AuthenticationType {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("AuthenticationType", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<AuthenticationType>("AuthenticationType", file_descriptor_proto())
             })
         }
     }
@@ -4728,8 +4629,8 @@ impl ::std::default::Default for AuthenticationType {
 }
 
 impl ::protobuf::reflect::ProtobufValue for AuthenticationType {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -4761,13 +4662,10 @@ impl ::protobuf::ProtobufEnum for AccountCreation {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("AccountCreation", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<AccountCreation>("AccountCreation", file_descriptor_proto())
             })
         }
     }
@@ -4784,8 +4682,8 @@ impl ::std::default::Default for AccountCreation {
 }
 
 impl ::protobuf::reflect::ProtobufValue for AccountCreation {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -4841,13 +4739,10 @@ impl ::protobuf::ProtobufEnum for CpuFamily {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("CpuFamily", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<CpuFamily>("CpuFamily", file_descriptor_proto())
             })
         }
     }
@@ -4863,8 +4758,8 @@ impl ::std::default::Default for CpuFamily {
 }
 
 impl ::protobuf::reflect::ProtobufValue for CpuFamily {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -4902,13 +4797,10 @@ impl ::protobuf::ProtobufEnum for Brand {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("Brand", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<Brand>("Brand", file_descriptor_proto())
             })
         }
     }
@@ -4924,8 +4816,8 @@ impl ::std::default::Default for Brand {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Brand {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -5020,13 +4912,10 @@ impl ::protobuf::ProtobufEnum for Os {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("Os", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<Os>("Os", file_descriptor_proto())
             })
         }
     }
@@ -5042,8 +4931,8 @@ impl ::std::default::Default for Os {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Os {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -5075,13 +4964,10 @@ impl ::protobuf::ProtobufEnum for AccountType {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("AccountType", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<AccountType>("AccountType", file_descriptor_proto())
             })
         }
     }
@@ -5097,8 +4983,8 @@ impl ::std::default::Default for AccountType {
 }
 
 impl ::protobuf::reflect::ProtobufValue for AccountType {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -5176,10 +5062,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\
     \x10\0\x12\x0c\n\x08Facebook\x10\x01\x1a\0B\0b\x06proto2\
 ";
 
-static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy {
-    lock: ::protobuf::lazy::ONCE_INIT,
-    ptr: 0 as *const ::protobuf::descriptor::FileDescriptorProto,
-};
+static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT;
 
 fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto {
     ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap()
diff --git a/protocol/src/keyexchange.rs b/protocol/src/keyexchange.rs
index f6cec4dd..cfe1aec3 100644
--- a/protocol/src/keyexchange.rs
+++ b/protocol/src/keyexchange.rs
@@ -1,7 +1,7 @@
-// This file is generated by rust-protobuf 2.8.1. Do not edit
+// This file is generated by rust-protobuf 2.14.0. Do not edit
 // @generated
 
-// https://github.com/Manishearth/rust-clippy/issues/702
+// https://github.com/rust-lang/rust-clippy/issues/702
 #![allow(unknown_lints)]
 #![allow(clippy::all)]
 
@@ -24,7 +24,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions;
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_1;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0;
 
 #[derive(PartialEq,Clone,Default)]
 pub struct ClientHello {
@@ -467,10 +467,7 @@ impl ::protobuf::Message for ClientHello {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -514,7 +511,7 @@ impl ::protobuf::Message for ClientHello {
                     |m: &ClientHello| { &m.feature_set },
                     |m: &mut ClientHello| { &mut m.feature_set },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<ClientHello>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<ClientHello>(
                     "ClientHello",
                     fields,
                     file_descriptor_proto()
@@ -524,10 +521,7 @@ impl ::protobuf::Message for ClientHello {
     }
 
     fn default_instance() -> &'static ClientHello {
-        static mut instance: ::protobuf::lazy::Lazy<ClientHello> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ClientHello,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<ClientHello> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(ClientHello::new)
         }
@@ -555,8 +549,8 @@ impl ::std::fmt::Debug for ClientHello {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ClientHello {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -777,10 +771,7 @@ impl ::protobuf::Message for BuildInfo {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -804,7 +795,7 @@ impl ::protobuf::Message for BuildInfo {
                     |m: &BuildInfo| { &m.version },
                     |m: &mut BuildInfo| { &mut m.version },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<BuildInfo>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<BuildInfo>(
                     "BuildInfo",
                     fields,
                     file_descriptor_proto()
@@ -814,10 +805,7 @@ impl ::protobuf::Message for BuildInfo {
     }
 
     fn default_instance() -> &'static BuildInfo {
-        static mut instance: ::protobuf::lazy::Lazy<BuildInfo> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const BuildInfo,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<BuildInfo> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(BuildInfo::new)
         }
@@ -841,8 +829,8 @@ impl ::std::fmt::Debug for BuildInfo {
 }
 
 impl ::protobuf::reflect::ProtobufValue for BuildInfo {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -979,10 +967,7 @@ impl ::protobuf::Message for LoginCryptoHelloUnion {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -991,7 +976,7 @@ impl ::protobuf::Message for LoginCryptoHelloUnion {
                     |m: &LoginCryptoHelloUnion| { &m.diffie_hellman },
                     |m: &mut LoginCryptoHelloUnion| { &mut m.diffie_hellman },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<LoginCryptoHelloUnion>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<LoginCryptoHelloUnion>(
                     "LoginCryptoHelloUnion",
                     fields,
                     file_descriptor_proto()
@@ -1001,10 +986,7 @@ impl ::protobuf::Message for LoginCryptoHelloUnion {
     }
 
     fn default_instance() -> &'static LoginCryptoHelloUnion {
-        static mut instance: ::protobuf::lazy::Lazy<LoginCryptoHelloUnion> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const LoginCryptoHelloUnion,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<LoginCryptoHelloUnion> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(LoginCryptoHelloUnion::new)
         }
@@ -1025,8 +1007,8 @@ impl ::std::fmt::Debug for LoginCryptoHelloUnion {
 }
 
 impl ::protobuf::reflect::ProtobufValue for LoginCryptoHelloUnion {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1197,10 +1179,7 @@ impl ::protobuf::Message for LoginCryptoDiffieHellmanHello {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -1214,7 +1193,7 @@ impl ::protobuf::Message for LoginCryptoDiffieHellmanHello {
                     |m: &LoginCryptoDiffieHellmanHello| { &m.server_keys_known },
                     |m: &mut LoginCryptoDiffieHellmanHello| { &mut m.server_keys_known },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<LoginCryptoDiffieHellmanHello>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<LoginCryptoDiffieHellmanHello>(
                     "LoginCryptoDiffieHellmanHello",
                     fields,
                     file_descriptor_proto()
@@ -1224,10 +1203,7 @@ impl ::protobuf::Message for LoginCryptoDiffieHellmanHello {
     }
 
     fn default_instance() -> &'static LoginCryptoDiffieHellmanHello {
-        static mut instance: ::protobuf::lazy::Lazy<LoginCryptoDiffieHellmanHello> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const LoginCryptoDiffieHellmanHello,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<LoginCryptoDiffieHellmanHello> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(LoginCryptoDiffieHellmanHello::new)
         }
@@ -1249,8 +1225,8 @@ impl ::std::fmt::Debug for LoginCryptoDiffieHellmanHello {
 }
 
 impl ::protobuf::reflect::ProtobufValue for LoginCryptoDiffieHellmanHello {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1402,10 +1378,7 @@ impl ::protobuf::Message for FeatureSet {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -1419,7 +1392,7 @@ impl ::protobuf::Message for FeatureSet {
                     |m: &FeatureSet| { &m.current_location },
                     |m: &mut FeatureSet| { &mut m.current_location },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<FeatureSet>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<FeatureSet>(
                     "FeatureSet",
                     fields,
                     file_descriptor_proto()
@@ -1429,10 +1402,7 @@ impl ::protobuf::Message for FeatureSet {
     }
 
     fn default_instance() -> &'static FeatureSet {
-        static mut instance: ::protobuf::lazy::Lazy<FeatureSet> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const FeatureSet,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<FeatureSet> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(FeatureSet::new)
         }
@@ -1454,8 +1424,8 @@ impl ::std::fmt::Debug for FeatureSet {
 }
 
 impl ::protobuf::reflect::ProtobufValue for FeatureSet {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1694,10 +1664,7 @@ impl ::protobuf::Message for APResponseMessage {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -1716,7 +1683,7 @@ impl ::protobuf::Message for APResponseMessage {
                     |m: &APResponseMessage| { &m.login_failed },
                     |m: &mut APResponseMessage| { &mut m.login_failed },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<APResponseMessage>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<APResponseMessage>(
                     "APResponseMessage",
                     fields,
                     file_descriptor_proto()
@@ -1726,10 +1693,7 @@ impl ::protobuf::Message for APResponseMessage {
     }
 
     fn default_instance() -> &'static APResponseMessage {
-        static mut instance: ::protobuf::lazy::Lazy<APResponseMessage> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const APResponseMessage,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<APResponseMessage> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(APResponseMessage::new)
         }
@@ -1752,8 +1716,8 @@ impl ::std::fmt::Debug for APResponseMessage {
 }
 
 impl ::protobuf::reflect::ProtobufValue for APResponseMessage {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -2150,10 +2114,7 @@ impl ::protobuf::Message for APChallenge {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -2187,7 +2148,7 @@ impl ::protobuf::Message for APChallenge {
                     |m: &APChallenge| { &m.padding },
                     |m: &mut APChallenge| { &mut m.padding },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<APChallenge>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<APChallenge>(
                     "APChallenge",
                     fields,
                     file_descriptor_proto()
@@ -2197,10 +2158,7 @@ impl ::protobuf::Message for APChallenge {
     }
 
     fn default_instance() -> &'static APChallenge {
-        static mut instance: ::protobuf::lazy::Lazy<APChallenge> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const APChallenge,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<APChallenge> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(APChallenge::new)
         }
@@ -2226,8 +2184,8 @@ impl ::std::fmt::Debug for APChallenge {
 }
 
 impl ::protobuf::reflect::ProtobufValue for APChallenge {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -2364,10 +2322,7 @@ impl ::protobuf::Message for LoginCryptoChallengeUnion {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -2376,7 +2331,7 @@ impl ::protobuf::Message for LoginCryptoChallengeUnion {
                     |m: &LoginCryptoChallengeUnion| { &m.diffie_hellman },
                     |m: &mut LoginCryptoChallengeUnion| { &mut m.diffie_hellman },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<LoginCryptoChallengeUnion>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<LoginCryptoChallengeUnion>(
                     "LoginCryptoChallengeUnion",
                     fields,
                     file_descriptor_proto()
@@ -2386,10 +2341,7 @@ impl ::protobuf::Message for LoginCryptoChallengeUnion {
     }
 
     fn default_instance() -> &'static LoginCryptoChallengeUnion {
-        static mut instance: ::protobuf::lazy::Lazy<LoginCryptoChallengeUnion> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const LoginCryptoChallengeUnion,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<LoginCryptoChallengeUnion> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(LoginCryptoChallengeUnion::new)
         }
@@ -2410,8 +2362,8 @@ impl ::std::fmt::Debug for LoginCryptoChallengeUnion {
 }
 
 impl ::protobuf::reflect::ProtobufValue for LoginCryptoChallengeUnion {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -2631,10 +2583,7 @@ impl ::protobuf::Message for LoginCryptoDiffieHellmanChallenge {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -2653,7 +2602,7 @@ impl ::protobuf::Message for LoginCryptoDiffieHellmanChallenge {
                     |m: &LoginCryptoDiffieHellmanChallenge| { &m.gs_signature },
                     |m: &mut LoginCryptoDiffieHellmanChallenge| { &mut m.gs_signature },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<LoginCryptoDiffieHellmanChallenge>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<LoginCryptoDiffieHellmanChallenge>(
                     "LoginCryptoDiffieHellmanChallenge",
                     fields,
                     file_descriptor_proto()
@@ -2663,10 +2612,7 @@ impl ::protobuf::Message for LoginCryptoDiffieHellmanChallenge {
     }
 
     fn default_instance() -> &'static LoginCryptoDiffieHellmanChallenge {
-        static mut instance: ::protobuf::lazy::Lazy<LoginCryptoDiffieHellmanChallenge> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const LoginCryptoDiffieHellmanChallenge,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<LoginCryptoDiffieHellmanChallenge> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(LoginCryptoDiffieHellmanChallenge::new)
         }
@@ -2689,8 +2635,8 @@ impl ::std::fmt::Debug for LoginCryptoDiffieHellmanChallenge {
 }
 
 impl ::protobuf::reflect::ProtobufValue for LoginCryptoDiffieHellmanChallenge {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -2878,10 +2824,7 @@ impl ::protobuf::Message for FingerprintChallengeUnion {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -2895,7 +2838,7 @@ impl ::protobuf::Message for FingerprintChallengeUnion {
                     |m: &FingerprintChallengeUnion| { &m.hmac_ripemd },
                     |m: &mut FingerprintChallengeUnion| { &mut m.hmac_ripemd },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<FingerprintChallengeUnion>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<FingerprintChallengeUnion>(
                     "FingerprintChallengeUnion",
                     fields,
                     file_descriptor_proto()
@@ -2905,10 +2848,7 @@ impl ::protobuf::Message for FingerprintChallengeUnion {
     }
 
     fn default_instance() -> &'static FingerprintChallengeUnion {
-        static mut instance: ::protobuf::lazy::Lazy<FingerprintChallengeUnion> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const FingerprintChallengeUnion,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<FingerprintChallengeUnion> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(FingerprintChallengeUnion::new)
         }
@@ -2930,8 +2870,8 @@ impl ::std::fmt::Debug for FingerprintChallengeUnion {
 }
 
 impl ::protobuf::reflect::ProtobufValue for FingerprintChallengeUnion {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -3066,10 +3006,7 @@ impl ::protobuf::Message for FingerprintGrainChallenge {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -3078,7 +3015,7 @@ impl ::protobuf::Message for FingerprintGrainChallenge {
                     |m: &FingerprintGrainChallenge| { &m.kek },
                     |m: &mut FingerprintGrainChallenge| { &mut m.kek },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<FingerprintGrainChallenge>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<FingerprintGrainChallenge>(
                     "FingerprintGrainChallenge",
                     fields,
                     file_descriptor_proto()
@@ -3088,10 +3025,7 @@ impl ::protobuf::Message for FingerprintGrainChallenge {
     }
 
     fn default_instance() -> &'static FingerprintGrainChallenge {
-        static mut instance: ::protobuf::lazy::Lazy<FingerprintGrainChallenge> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const FingerprintGrainChallenge,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<FingerprintGrainChallenge> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(FingerprintGrainChallenge::new)
         }
@@ -3112,8 +3046,8 @@ impl ::std::fmt::Debug for FingerprintGrainChallenge {
 }
 
 impl ::protobuf::reflect::ProtobufValue for FingerprintGrainChallenge {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -3248,10 +3182,7 @@ impl ::protobuf::Message for FingerprintHmacRipemdChallenge {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -3260,7 +3191,7 @@ impl ::protobuf::Message for FingerprintHmacRipemdChallenge {
                     |m: &FingerprintHmacRipemdChallenge| { &m.challenge },
                     |m: &mut FingerprintHmacRipemdChallenge| { &mut m.challenge },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<FingerprintHmacRipemdChallenge>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<FingerprintHmacRipemdChallenge>(
                     "FingerprintHmacRipemdChallenge",
                     fields,
                     file_descriptor_proto()
@@ -3270,10 +3201,7 @@ impl ::protobuf::Message for FingerprintHmacRipemdChallenge {
     }
 
     fn default_instance() -> &'static FingerprintHmacRipemdChallenge {
-        static mut instance: ::protobuf::lazy::Lazy<FingerprintHmacRipemdChallenge> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const FingerprintHmacRipemdChallenge,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<FingerprintHmacRipemdChallenge> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(FingerprintHmacRipemdChallenge::new)
         }
@@ -3294,8 +3222,8 @@ impl ::std::fmt::Debug for FingerprintHmacRipemdChallenge {
 }
 
 impl ::protobuf::reflect::ProtobufValue for FingerprintHmacRipemdChallenge {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -3432,10 +3360,7 @@ impl ::protobuf::Message for PoWChallengeUnion {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -3444,7 +3369,7 @@ impl ::protobuf::Message for PoWChallengeUnion {
                     |m: &PoWChallengeUnion| { &m.hash_cash },
                     |m: &mut PoWChallengeUnion| { &mut m.hash_cash },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<PoWChallengeUnion>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<PoWChallengeUnion>(
                     "PoWChallengeUnion",
                     fields,
                     file_descriptor_proto()
@@ -3454,10 +3379,7 @@ impl ::protobuf::Message for PoWChallengeUnion {
     }
 
     fn default_instance() -> &'static PoWChallengeUnion {
-        static mut instance: ::protobuf::lazy::Lazy<PoWChallengeUnion> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const PoWChallengeUnion,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<PoWChallengeUnion> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(PoWChallengeUnion::new)
         }
@@ -3478,8 +3400,8 @@ impl ::std::fmt::Debug for PoWChallengeUnion {
 }
 
 impl ::protobuf::reflect::ProtobufValue for PoWChallengeUnion {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -3677,10 +3599,7 @@ impl ::protobuf::Message for PoWHashCashChallenge {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -3699,7 +3618,7 @@ impl ::protobuf::Message for PoWHashCashChallenge {
                     |m: &PoWHashCashChallenge| { &m.target },
                     |m: &mut PoWHashCashChallenge| { &mut m.target },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<PoWHashCashChallenge>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<PoWHashCashChallenge>(
                     "PoWHashCashChallenge",
                     fields,
                     file_descriptor_proto()
@@ -3709,10 +3628,7 @@ impl ::protobuf::Message for PoWHashCashChallenge {
     }
 
     fn default_instance() -> &'static PoWHashCashChallenge {
-        static mut instance: ::protobuf::lazy::Lazy<PoWHashCashChallenge> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const PoWHashCashChallenge,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<PoWHashCashChallenge> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(PoWHashCashChallenge::new)
         }
@@ -3735,8 +3651,8 @@ impl ::std::fmt::Debug for PoWHashCashChallenge {
 }
 
 impl ::protobuf::reflect::ProtobufValue for PoWHashCashChallenge {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -3924,10 +3840,7 @@ impl ::protobuf::Message for CryptoChallengeUnion {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -3941,7 +3854,7 @@ impl ::protobuf::Message for CryptoChallengeUnion {
                     |m: &CryptoChallengeUnion| { &m.rc4_sha1_hmac },
                     |m: &mut CryptoChallengeUnion| { &mut m.rc4_sha1_hmac },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<CryptoChallengeUnion>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<CryptoChallengeUnion>(
                     "CryptoChallengeUnion",
                     fields,
                     file_descriptor_proto()
@@ -3951,10 +3864,7 @@ impl ::protobuf::Message for CryptoChallengeUnion {
     }
 
     fn default_instance() -> &'static CryptoChallengeUnion {
-        static mut instance: ::protobuf::lazy::Lazy<CryptoChallengeUnion> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const CryptoChallengeUnion,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<CryptoChallengeUnion> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(CryptoChallengeUnion::new)
         }
@@ -3976,8 +3886,8 @@ impl ::std::fmt::Debug for CryptoChallengeUnion {
 }
 
 impl ::protobuf::reflect::ProtobufValue for CryptoChallengeUnion {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -4062,14 +3972,11 @@ impl ::protobuf::Message for CryptoShannonChallenge {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let fields = ::std::vec::Vec::new();
-                ::protobuf::reflect::MessageDescriptor::new::<CryptoShannonChallenge>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<CryptoShannonChallenge>(
                     "CryptoShannonChallenge",
                     fields,
                     file_descriptor_proto()
@@ -4079,10 +3986,7 @@ impl ::protobuf::Message for CryptoShannonChallenge {
     }
 
     fn default_instance() -> &'static CryptoShannonChallenge {
-        static mut instance: ::protobuf::lazy::Lazy<CryptoShannonChallenge> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const CryptoShannonChallenge,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<CryptoShannonChallenge> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(CryptoShannonChallenge::new)
         }
@@ -4102,8 +4006,8 @@ impl ::std::fmt::Debug for CryptoShannonChallenge {
 }
 
 impl ::protobuf::reflect::ProtobufValue for CryptoShannonChallenge {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -4188,14 +4092,11 @@ impl ::protobuf::Message for CryptoRc4Sha1HmacChallenge {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let fields = ::std::vec::Vec::new();
-                ::protobuf::reflect::MessageDescriptor::new::<CryptoRc4Sha1HmacChallenge>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<CryptoRc4Sha1HmacChallenge>(
                     "CryptoRc4Sha1HmacChallenge",
                     fields,
                     file_descriptor_proto()
@@ -4205,10 +4106,7 @@ impl ::protobuf::Message for CryptoRc4Sha1HmacChallenge {
     }
 
     fn default_instance() -> &'static CryptoRc4Sha1HmacChallenge {
-        static mut instance: ::protobuf::lazy::Lazy<CryptoRc4Sha1HmacChallenge> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const CryptoRc4Sha1HmacChallenge,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<CryptoRc4Sha1HmacChallenge> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(CryptoRc4Sha1HmacChallenge::new)
         }
@@ -4228,8 +4126,8 @@ impl ::std::fmt::Debug for CryptoRc4Sha1HmacChallenge {
 }
 
 impl ::protobuf::reflect::ProtobufValue for CryptoRc4Sha1HmacChallenge {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -4459,10 +4357,7 @@ impl ::protobuf::Message for UpgradeRequiredMessage {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -4481,7 +4376,7 @@ impl ::protobuf::Message for UpgradeRequiredMessage {
                     |m: &UpgradeRequiredMessage| { &m.http_suffix },
                     |m: &mut UpgradeRequiredMessage| { &mut m.http_suffix },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<UpgradeRequiredMessage>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<UpgradeRequiredMessage>(
                     "UpgradeRequiredMessage",
                     fields,
                     file_descriptor_proto()
@@ -4491,10 +4386,7 @@ impl ::protobuf::Message for UpgradeRequiredMessage {
     }
 
     fn default_instance() -> &'static UpgradeRequiredMessage {
-        static mut instance: ::protobuf::lazy::Lazy<UpgradeRequiredMessage> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const UpgradeRequiredMessage,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<UpgradeRequiredMessage> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(UpgradeRequiredMessage::new)
         }
@@ -4517,8 +4409,8 @@ impl ::std::fmt::Debug for UpgradeRequiredMessage {
 }
 
 impl ::protobuf::reflect::ProtobufValue for UpgradeRequiredMessage {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -4748,10 +4640,7 @@ impl ::protobuf::Message for APLoginFailed {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -4775,7 +4664,7 @@ impl ::protobuf::Message for APLoginFailed {
                     |m: &APLoginFailed| { &m.error_description },
                     |m: &mut APLoginFailed| { &mut m.error_description },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<APLoginFailed>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<APLoginFailed>(
                     "APLoginFailed",
                     fields,
                     file_descriptor_proto()
@@ -4785,10 +4674,7 @@ impl ::protobuf::Message for APLoginFailed {
     }
 
     fn default_instance() -> &'static APLoginFailed {
-        static mut instance: ::protobuf::lazy::Lazy<APLoginFailed> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const APLoginFailed,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<APLoginFailed> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(APLoginFailed::new)
         }
@@ -4812,8 +4698,8 @@ impl ::std::fmt::Debug for APLoginFailed {
 }
 
 impl ::protobuf::reflect::ProtobufValue for APLoginFailed {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -5061,10 +4947,7 @@ impl ::protobuf::Message for ClientResponsePlaintext {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -5083,7 +4966,7 @@ impl ::protobuf::Message for ClientResponsePlaintext {
                     |m: &ClientResponsePlaintext| { &m.crypto_response },
                     |m: &mut ClientResponsePlaintext| { &mut m.crypto_response },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<ClientResponsePlaintext>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<ClientResponsePlaintext>(
                     "ClientResponsePlaintext",
                     fields,
                     file_descriptor_proto()
@@ -5093,10 +4976,7 @@ impl ::protobuf::Message for ClientResponsePlaintext {
     }
 
     fn default_instance() -> &'static ClientResponsePlaintext {
-        static mut instance: ::protobuf::lazy::Lazy<ClientResponsePlaintext> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ClientResponsePlaintext,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<ClientResponsePlaintext> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(ClientResponsePlaintext::new)
         }
@@ -5119,8 +4999,8 @@ impl ::std::fmt::Debug for ClientResponsePlaintext {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ClientResponsePlaintext {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -5257,10 +5137,7 @@ impl ::protobuf::Message for LoginCryptoResponseUnion {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -5269,7 +5146,7 @@ impl ::protobuf::Message for LoginCryptoResponseUnion {
                     |m: &LoginCryptoResponseUnion| { &m.diffie_hellman },
                     |m: &mut LoginCryptoResponseUnion| { &mut m.diffie_hellman },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<LoginCryptoResponseUnion>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<LoginCryptoResponseUnion>(
                     "LoginCryptoResponseUnion",
                     fields,
                     file_descriptor_proto()
@@ -5279,10 +5156,7 @@ impl ::protobuf::Message for LoginCryptoResponseUnion {
     }
 
     fn default_instance() -> &'static LoginCryptoResponseUnion {
-        static mut instance: ::protobuf::lazy::Lazy<LoginCryptoResponseUnion> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const LoginCryptoResponseUnion,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<LoginCryptoResponseUnion> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(LoginCryptoResponseUnion::new)
         }
@@ -5303,8 +5177,8 @@ impl ::std::fmt::Debug for LoginCryptoResponseUnion {
 }
 
 impl ::protobuf::reflect::ProtobufValue for LoginCryptoResponseUnion {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -5439,10 +5313,7 @@ impl ::protobuf::Message for LoginCryptoDiffieHellmanResponse {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -5451,7 +5322,7 @@ impl ::protobuf::Message for LoginCryptoDiffieHellmanResponse {
                     |m: &LoginCryptoDiffieHellmanResponse| { &m.hmac },
                     |m: &mut LoginCryptoDiffieHellmanResponse| { &mut m.hmac },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<LoginCryptoDiffieHellmanResponse>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<LoginCryptoDiffieHellmanResponse>(
                     "LoginCryptoDiffieHellmanResponse",
                     fields,
                     file_descriptor_proto()
@@ -5461,10 +5332,7 @@ impl ::protobuf::Message for LoginCryptoDiffieHellmanResponse {
     }
 
     fn default_instance() -> &'static LoginCryptoDiffieHellmanResponse {
-        static mut instance: ::protobuf::lazy::Lazy<LoginCryptoDiffieHellmanResponse> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const LoginCryptoDiffieHellmanResponse,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<LoginCryptoDiffieHellmanResponse> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(LoginCryptoDiffieHellmanResponse::new)
         }
@@ -5485,8 +5353,8 @@ impl ::std::fmt::Debug for LoginCryptoDiffieHellmanResponse {
 }
 
 impl ::protobuf::reflect::ProtobufValue for LoginCryptoDiffieHellmanResponse {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -5623,10 +5491,7 @@ impl ::protobuf::Message for PoWResponseUnion {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -5635,7 +5500,7 @@ impl ::protobuf::Message for PoWResponseUnion {
                     |m: &PoWResponseUnion| { &m.hash_cash },
                     |m: &mut PoWResponseUnion| { &mut m.hash_cash },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<PoWResponseUnion>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<PoWResponseUnion>(
                     "PoWResponseUnion",
                     fields,
                     file_descriptor_proto()
@@ -5645,10 +5510,7 @@ impl ::protobuf::Message for PoWResponseUnion {
     }
 
     fn default_instance() -> &'static PoWResponseUnion {
-        static mut instance: ::protobuf::lazy::Lazy<PoWResponseUnion> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const PoWResponseUnion,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<PoWResponseUnion> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(PoWResponseUnion::new)
         }
@@ -5669,8 +5531,8 @@ impl ::std::fmt::Debug for PoWResponseUnion {
 }
 
 impl ::protobuf::reflect::ProtobufValue for PoWResponseUnion {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -5805,10 +5667,7 @@ impl ::protobuf::Message for PoWHashCashResponse {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -5817,7 +5676,7 @@ impl ::protobuf::Message for PoWHashCashResponse {
                     |m: &PoWHashCashResponse| { &m.hash_suffix },
                     |m: &mut PoWHashCashResponse| { &mut m.hash_suffix },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<PoWHashCashResponse>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<PoWHashCashResponse>(
                     "PoWHashCashResponse",
                     fields,
                     file_descriptor_proto()
@@ -5827,10 +5686,7 @@ impl ::protobuf::Message for PoWHashCashResponse {
     }
 
     fn default_instance() -> &'static PoWHashCashResponse {
-        static mut instance: ::protobuf::lazy::Lazy<PoWHashCashResponse> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const PoWHashCashResponse,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<PoWHashCashResponse> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(PoWHashCashResponse::new)
         }
@@ -5851,8 +5707,8 @@ impl ::std::fmt::Debug for PoWHashCashResponse {
 }
 
 impl ::protobuf::reflect::ProtobufValue for PoWHashCashResponse {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -6040,10 +5896,7 @@ impl ::protobuf::Message for CryptoResponseUnion {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -6057,7 +5910,7 @@ impl ::protobuf::Message for CryptoResponseUnion {
                     |m: &CryptoResponseUnion| { &m.rc4_sha1_hmac },
                     |m: &mut CryptoResponseUnion| { &mut m.rc4_sha1_hmac },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<CryptoResponseUnion>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<CryptoResponseUnion>(
                     "CryptoResponseUnion",
                     fields,
                     file_descriptor_proto()
@@ -6067,10 +5920,7 @@ impl ::protobuf::Message for CryptoResponseUnion {
     }
 
     fn default_instance() -> &'static CryptoResponseUnion {
-        static mut instance: ::protobuf::lazy::Lazy<CryptoResponseUnion> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const CryptoResponseUnion,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<CryptoResponseUnion> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(CryptoResponseUnion::new)
         }
@@ -6092,8 +5942,8 @@ impl ::std::fmt::Debug for CryptoResponseUnion {
 }
 
 impl ::protobuf::reflect::ProtobufValue for CryptoResponseUnion {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -6212,10 +6062,7 @@ impl ::protobuf::Message for CryptoShannonResponse {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -6224,7 +6071,7 @@ impl ::protobuf::Message for CryptoShannonResponse {
                     |m: &CryptoShannonResponse| { &m.dummy },
                     |m: &mut CryptoShannonResponse| { &mut m.dummy },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<CryptoShannonResponse>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<CryptoShannonResponse>(
                     "CryptoShannonResponse",
                     fields,
                     file_descriptor_proto()
@@ -6234,10 +6081,7 @@ impl ::protobuf::Message for CryptoShannonResponse {
     }
 
     fn default_instance() -> &'static CryptoShannonResponse {
-        static mut instance: ::protobuf::lazy::Lazy<CryptoShannonResponse> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const CryptoShannonResponse,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<CryptoShannonResponse> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(CryptoShannonResponse::new)
         }
@@ -6258,8 +6102,8 @@ impl ::std::fmt::Debug for CryptoShannonResponse {
 }
 
 impl ::protobuf::reflect::ProtobufValue for CryptoShannonResponse {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -6378,10 +6222,7 @@ impl ::protobuf::Message for CryptoRc4Sha1HmacResponse {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -6390,7 +6231,7 @@ impl ::protobuf::Message for CryptoRc4Sha1HmacResponse {
                     |m: &CryptoRc4Sha1HmacResponse| { &m.dummy },
                     |m: &mut CryptoRc4Sha1HmacResponse| { &mut m.dummy },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<CryptoRc4Sha1HmacResponse>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<CryptoRc4Sha1HmacResponse>(
                     "CryptoRc4Sha1HmacResponse",
                     fields,
                     file_descriptor_proto()
@@ -6400,10 +6241,7 @@ impl ::protobuf::Message for CryptoRc4Sha1HmacResponse {
     }
 
     fn default_instance() -> &'static CryptoRc4Sha1HmacResponse {
-        static mut instance: ::protobuf::lazy::Lazy<CryptoRc4Sha1HmacResponse> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const CryptoRc4Sha1HmacResponse,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<CryptoRc4Sha1HmacResponse> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(CryptoRc4Sha1HmacResponse::new)
         }
@@ -6424,8 +6262,8 @@ impl ::std::fmt::Debug for CryptoRc4Sha1HmacResponse {
 }
 
 impl ::protobuf::reflect::ProtobufValue for CryptoRc4Sha1HmacResponse {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -6466,13 +6304,10 @@ impl ::protobuf::ProtobufEnum for Product {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("Product", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<Product>("Product", file_descriptor_proto())
             })
         }
     }
@@ -6488,8 +6323,8 @@ impl ::std::default::Default for Product {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Product {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -6521,13 +6356,10 @@ impl ::protobuf::ProtobufEnum for ProductFlags {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("ProductFlags", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<ProductFlags>("ProductFlags", file_descriptor_proto())
             })
         }
     }
@@ -6543,8 +6375,8 @@ impl ::std::default::Default for ProductFlags {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ProductFlags {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -6642,13 +6474,10 @@ impl ::protobuf::ProtobufEnum for Platform {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("Platform", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<Platform>("Platform", file_descriptor_proto())
             })
         }
     }
@@ -6664,8 +6493,8 @@ impl ::std::default::Default for Platform {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Platform {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -6697,13 +6526,10 @@ impl ::protobuf::ProtobufEnum for Fingerprint {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("Fingerprint", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<Fingerprint>("Fingerprint", file_descriptor_proto())
             })
         }
     }
@@ -6719,8 +6545,8 @@ impl ::std::default::Default for Fingerprint {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Fingerprint {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -6752,13 +6578,10 @@ impl ::protobuf::ProtobufEnum for Cryptosuite {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("Cryptosuite", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<Cryptosuite>("Cryptosuite", file_descriptor_proto())
             })
         }
     }
@@ -6774,8 +6597,8 @@ impl ::std::default::Default for Cryptosuite {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Cryptosuite {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -6804,13 +6627,10 @@ impl ::protobuf::ProtobufEnum for Powscheme {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("Powscheme", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<Powscheme>("Powscheme", file_descriptor_proto())
             })
         }
     }
@@ -6826,8 +6646,8 @@ impl ::std::default::Default for Powscheme {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Powscheme {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -6886,13 +6706,10 @@ impl ::protobuf::ProtobufEnum for ErrorCode {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("ErrorCode", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<ErrorCode>("ErrorCode", file_descriptor_proto())
             })
         }
     }
@@ -6908,8 +6725,8 @@ impl ::std::default::Default for ErrorCode {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ErrorCode {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -7007,10 +6824,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\
     \0B\0b\x06proto2\
 ";
 
-static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy {
-    lock: ::protobuf::lazy::ONCE_INIT,
-    ptr: 0 as *const ::protobuf::descriptor::FileDescriptorProto,
-};
+static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT;
 
 fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto {
     ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap()
diff --git a/protocol/src/mercury.rs b/protocol/src/mercury.rs
index 3b371f7a..ab6f5f9a 100644
--- a/protocol/src/mercury.rs
+++ b/protocol/src/mercury.rs
@@ -1,7 +1,7 @@
-// This file is generated by rust-protobuf 2.8.1. Do not edit
+// This file is generated by rust-protobuf 2.14.0. Do not edit
 // @generated
 
-// https://github.com/Manishearth/rust-clippy/issues/702
+// https://github.com/rust-lang/rust-clippy/issues/702
 #![allow(unknown_lints)]
 #![allow(clippy::all)]
 
@@ -24,7 +24,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions;
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_1;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0;
 
 #[derive(PartialEq,Clone,Default)]
 pub struct MercuryMultiGetRequest {
@@ -151,10 +151,7 @@ impl ::protobuf::Message for MercuryMultiGetRequest {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -163,7 +160,7 @@ impl ::protobuf::Message for MercuryMultiGetRequest {
                     |m: &MercuryMultiGetRequest| { &m.request },
                     |m: &mut MercuryMultiGetRequest| { &mut m.request },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<MercuryMultiGetRequest>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<MercuryMultiGetRequest>(
                     "MercuryMultiGetRequest",
                     fields,
                     file_descriptor_proto()
@@ -173,10 +170,7 @@ impl ::protobuf::Message for MercuryMultiGetRequest {
     }
 
     fn default_instance() -> &'static MercuryMultiGetRequest {
-        static mut instance: ::protobuf::lazy::Lazy<MercuryMultiGetRequest> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const MercuryMultiGetRequest,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<MercuryMultiGetRequest> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(MercuryMultiGetRequest::new)
         }
@@ -197,8 +191,8 @@ impl ::std::fmt::Debug for MercuryMultiGetRequest {
 }
 
 impl ::protobuf::reflect::ProtobufValue for MercuryMultiGetRequest {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -327,10 +321,7 @@ impl ::protobuf::Message for MercuryMultiGetReply {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -339,7 +330,7 @@ impl ::protobuf::Message for MercuryMultiGetReply {
                     |m: &MercuryMultiGetReply| { &m.reply },
                     |m: &mut MercuryMultiGetReply| { &mut m.reply },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<MercuryMultiGetReply>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<MercuryMultiGetReply>(
                     "MercuryMultiGetReply",
                     fields,
                     file_descriptor_proto()
@@ -349,10 +340,7 @@ impl ::protobuf::Message for MercuryMultiGetReply {
     }
 
     fn default_instance() -> &'static MercuryMultiGetReply {
-        static mut instance: ::protobuf::lazy::Lazy<MercuryMultiGetReply> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const MercuryMultiGetReply,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<MercuryMultiGetReply> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(MercuryMultiGetReply::new)
         }
@@ -373,8 +361,8 @@ impl ::std::fmt::Debug for MercuryMultiGetReply {
 }
 
 impl ::protobuf::reflect::ProtobufValue for MercuryMultiGetReply {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -644,10 +632,7 @@ impl ::protobuf::Message for MercuryRequest {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -671,7 +656,7 @@ impl ::protobuf::Message for MercuryRequest {
                     |m: &MercuryRequest| { &m.etag },
                     |m: &mut MercuryRequest| { &mut m.etag },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<MercuryRequest>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<MercuryRequest>(
                     "MercuryRequest",
                     fields,
                     file_descriptor_proto()
@@ -681,10 +666,7 @@ impl ::protobuf::Message for MercuryRequest {
     }
 
     fn default_instance() -> &'static MercuryRequest {
-        static mut instance: ::protobuf::lazy::Lazy<MercuryRequest> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const MercuryRequest,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<MercuryRequest> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(MercuryRequest::new)
         }
@@ -708,8 +690,8 @@ impl ::std::fmt::Debug for MercuryRequest {
 }
 
 impl ::protobuf::reflect::ProtobufValue for MercuryRequest {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1074,10 +1056,7 @@ impl ::protobuf::Message for MercuryReply {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -1116,7 +1095,7 @@ impl ::protobuf::Message for MercuryReply {
                     |m: &MercuryReply| { &m.body },
                     |m: &mut MercuryReply| { &mut m.body },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<MercuryReply>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<MercuryReply>(
                     "MercuryReply",
                     fields,
                     file_descriptor_proto()
@@ -1126,10 +1105,7 @@ impl ::protobuf::Message for MercuryReply {
     }
 
     fn default_instance() -> &'static MercuryReply {
-        static mut instance: ::protobuf::lazy::Lazy<MercuryReply> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const MercuryReply,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<MercuryReply> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(MercuryReply::new)
         }
@@ -1156,8 +1132,8 @@ impl ::std::fmt::Debug for MercuryReply {
 }
 
 impl ::protobuf::reflect::ProtobufValue for MercuryReply {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1192,13 +1168,10 @@ impl ::protobuf::ProtobufEnum for MercuryReply_CachePolicy {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("MercuryReply_CachePolicy", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<MercuryReply_CachePolicy>("MercuryReply.CachePolicy", file_descriptor_proto())
             })
         }
     }
@@ -1215,8 +1188,8 @@ impl ::std::default::Default for MercuryReply_CachePolicy {
 }
 
 impl ::protobuf::reflect::ProtobufValue for MercuryReply_CachePolicy {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -1516,10 +1489,7 @@ impl ::protobuf::Message for Header {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -1548,7 +1518,7 @@ impl ::protobuf::Message for Header {
                     |m: &Header| { &m.user_fields },
                     |m: &mut Header| { &mut m.user_fields },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<Header>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<Header>(
                     "Header",
                     fields,
                     file_descriptor_proto()
@@ -1558,10 +1528,7 @@ impl ::protobuf::Message for Header {
     }
 
     fn default_instance() -> &'static Header {
-        static mut instance: ::protobuf::lazy::Lazy<Header> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Header,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Header> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Header::new)
         }
@@ -1586,8 +1553,8 @@ impl ::std::fmt::Debug for Header {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Header {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1765,10 +1732,7 @@ impl ::protobuf::Message for UserField {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -1782,7 +1746,7 @@ impl ::protobuf::Message for UserField {
                     |m: &UserField| { &m.value },
                     |m: &mut UserField| { &mut m.value },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<UserField>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<UserField>(
                     "UserField",
                     fields,
                     file_descriptor_proto()
@@ -1792,10 +1756,7 @@ impl ::protobuf::Message for UserField {
     }
 
     fn default_instance() -> &'static UserField {
-        static mut instance: ::protobuf::lazy::Lazy<UserField> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const UserField,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<UserField> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(UserField::new)
         }
@@ -1817,8 +1778,8 @@ impl ::std::fmt::Debug for UserField {
 }
 
 impl ::protobuf::reflect::ProtobufValue for UserField {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1843,10 +1804,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\
     \x12\x0f\n\x05value\x18\x02\x20\x01(\x0cB\0:\0B\0b\x06proto2\
 ";
 
-static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy {
-    lock: ::protobuf::lazy::ONCE_INIT,
-    ptr: 0 as *const ::protobuf::descriptor::FileDescriptorProto,
-};
+static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT;
 
 fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto {
     ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap()
diff --git a/protocol/src/metadata.rs b/protocol/src/metadata.rs
index 571cd7d2..99635e70 100644
--- a/protocol/src/metadata.rs
+++ b/protocol/src/metadata.rs
@@ -1,7 +1,7 @@
-// This file is generated by rust-protobuf 2.8.1. Do not edit
+// This file is generated by rust-protobuf 2.14.0. Do not edit
 // @generated
 
-// https://github.com/Manishearth/rust-clippy/issues/702
+// https://github.com/rust-lang/rust-clippy/issues/702
 #![allow(unknown_lints)]
 #![allow(clippy::all)]
 
@@ -24,7 +24,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions;
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_1;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0;
 
 #[derive(PartialEq,Clone,Default)]
 pub struct TopTracks {
@@ -197,10 +197,7 @@ impl ::protobuf::Message for TopTracks {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -214,7 +211,7 @@ impl ::protobuf::Message for TopTracks {
                     |m: &TopTracks| { &m.track },
                     |m: &mut TopTracks| { &mut m.track },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<TopTracks>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<TopTracks>(
                     "TopTracks",
                     fields,
                     file_descriptor_proto()
@@ -224,10 +221,7 @@ impl ::protobuf::Message for TopTracks {
     }
 
     fn default_instance() -> &'static TopTracks {
-        static mut instance: ::protobuf::lazy::Lazy<TopTracks> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const TopTracks,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<TopTracks> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(TopTracks::new)
         }
@@ -249,8 +243,8 @@ impl ::std::fmt::Debug for TopTracks {
 }
 
 impl ::protobuf::reflect::ProtobufValue for TopTracks {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -435,10 +429,7 @@ impl ::protobuf::Message for ActivityPeriod {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -457,7 +448,7 @@ impl ::protobuf::Message for ActivityPeriod {
                     |m: &ActivityPeriod| { &m.decade },
                     |m: &mut ActivityPeriod| { &mut m.decade },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<ActivityPeriod>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<ActivityPeriod>(
                     "ActivityPeriod",
                     fields,
                     file_descriptor_proto()
@@ -467,10 +458,7 @@ impl ::protobuf::Message for ActivityPeriod {
     }
 
     fn default_instance() -> &'static ActivityPeriod {
-        static mut instance: ::protobuf::lazy::Lazy<ActivityPeriod> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ActivityPeriod,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<ActivityPeriod> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(ActivityPeriod::new)
         }
@@ -493,8 +481,8 @@ impl ::std::fmt::Debug for ActivityPeriod {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ActivityPeriod {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1297,10 +1285,7 @@ impl ::protobuf::Message for Artist {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -1389,7 +1374,7 @@ impl ::protobuf::Message for Artist {
                     |m: &Artist| { &m.portrait_group },
                     |m: &mut Artist| { &mut m.portrait_group },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<Artist>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<Artist>(
                     "Artist",
                     fields,
                     file_descriptor_proto()
@@ -1399,10 +1384,7 @@ impl ::protobuf::Message for Artist {
     }
 
     fn default_instance() -> &'static Artist {
-        static mut instance: ::protobuf::lazy::Lazy<Artist> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Artist,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Artist> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Artist::new)
         }
@@ -1439,8 +1421,8 @@ impl ::std::fmt::Debug for Artist {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Artist {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1569,10 +1551,7 @@ impl ::protobuf::Message for AlbumGroup {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -1581,7 +1560,7 @@ impl ::protobuf::Message for AlbumGroup {
                     |m: &AlbumGroup| { &m.album },
                     |m: &mut AlbumGroup| { &mut m.album },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<AlbumGroup>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<AlbumGroup>(
                     "AlbumGroup",
                     fields,
                     file_descriptor_proto()
@@ -1591,10 +1570,7 @@ impl ::protobuf::Message for AlbumGroup {
     }
 
     fn default_instance() -> &'static AlbumGroup {
-        static mut instance: ::protobuf::lazy::Lazy<AlbumGroup> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const AlbumGroup,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<AlbumGroup> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(AlbumGroup::new)
         }
@@ -1615,8 +1591,8 @@ impl ::std::fmt::Debug for AlbumGroup {
 }
 
 impl ::protobuf::reflect::ProtobufValue for AlbumGroup {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1867,10 +1843,7 @@ impl ::protobuf::Message for Date {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -1899,7 +1872,7 @@ impl ::protobuf::Message for Date {
                     |m: &Date| { &m.minute },
                     |m: &mut Date| { &mut m.minute },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<Date>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<Date>(
                     "Date",
                     fields,
                     file_descriptor_proto()
@@ -1909,10 +1882,7 @@ impl ::protobuf::Message for Date {
     }
 
     fn default_instance() -> &'static Date {
-        static mut instance: ::protobuf::lazy::Lazy<Date> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Date,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Date> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Date::new)
         }
@@ -1937,8 +1907,8 @@ impl ::std::fmt::Debug for Date {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Date {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -2740,10 +2710,7 @@ impl ::protobuf::Message for Album {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -2832,7 +2799,7 @@ impl ::protobuf::Message for Album {
                     |m: &Album| { &m.cover_group },
                     |m: &mut Album| { &mut m.cover_group },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<Album>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<Album>(
                     "Album",
                     fields,
                     file_descriptor_proto()
@@ -2842,10 +2809,7 @@ impl ::protobuf::Message for Album {
     }
 
     fn default_instance() -> &'static Album {
-        static mut instance: ::protobuf::lazy::Lazy<Album> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Album,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Album> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Album::new)
         }
@@ -2882,8 +2846,8 @@ impl ::std::fmt::Debug for Album {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Album {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -2921,13 +2885,10 @@ impl ::protobuf::ProtobufEnum for Album_Type {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("Album_Type", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<Album_Type>("Album.Type", file_descriptor_proto())
             })
         }
     }
@@ -2944,8 +2905,8 @@ impl ::std::default::Default for Album_Type {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Album_Type {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -3640,10 +3601,7 @@ impl ::protobuf::Message for Track {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -3722,7 +3680,7 @@ impl ::protobuf::Message for Track {
                     |m: &Track| { &m.preview },
                     |m: &mut Track| { &mut m.preview },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<Track>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<Track>(
                     "Track",
                     fields,
                     file_descriptor_proto()
@@ -3732,10 +3690,7 @@ impl ::protobuf::Message for Track {
     }
 
     fn default_instance() -> &'static Track {
-        static mut instance: ::protobuf::lazy::Lazy<Track> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Track,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Track> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Track::new)
         }
@@ -3770,8 +3725,8 @@ impl ::std::fmt::Debug for Track {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Track {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -3998,10 +3953,7 @@ impl ::protobuf::Message for Image {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -4025,7 +3977,7 @@ impl ::protobuf::Message for Image {
                     |m: &Image| { &m.height },
                     |m: &mut Image| { &mut m.height },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<Image>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<Image>(
                     "Image",
                     fields,
                     file_descriptor_proto()
@@ -4035,10 +3987,7 @@ impl ::protobuf::Message for Image {
     }
 
     fn default_instance() -> &'static Image {
-        static mut instance: ::protobuf::lazy::Lazy<Image> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Image,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Image> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Image::new)
         }
@@ -4062,8 +4011,8 @@ impl ::std::fmt::Debug for Image {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Image {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -4101,13 +4050,10 @@ impl ::protobuf::ProtobufEnum for Image_Size {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("Image_Size", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<Image_Size>("Image.Size", file_descriptor_proto())
             })
         }
     }
@@ -4123,8 +4069,8 @@ impl ::std::default::Default for Image_Size {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Image_Size {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -4253,10 +4199,7 @@ impl ::protobuf::Message for ImageGroup {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -4265,7 +4208,7 @@ impl ::protobuf::Message for ImageGroup {
                     |m: &ImageGroup| { &m.image },
                     |m: &mut ImageGroup| { &mut m.image },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<ImageGroup>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<ImageGroup>(
                     "ImageGroup",
                     fields,
                     file_descriptor_proto()
@@ -4275,10 +4218,7 @@ impl ::protobuf::Message for ImageGroup {
     }
 
     fn default_instance() -> &'static ImageGroup {
-        static mut instance: ::protobuf::lazy::Lazy<ImageGroup> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ImageGroup,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<ImageGroup> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(ImageGroup::new)
         }
@@ -4299,8 +4239,8 @@ impl ::std::fmt::Debug for ImageGroup {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ImageGroup {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -4518,10 +4458,7 @@ impl ::protobuf::Message for Biography {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -4540,7 +4477,7 @@ impl ::protobuf::Message for Biography {
                     |m: &Biography| { &m.portrait_group },
                     |m: &mut Biography| { &mut m.portrait_group },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<Biography>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<Biography>(
                     "Biography",
                     fields,
                     file_descriptor_proto()
@@ -4550,10 +4487,7 @@ impl ::protobuf::Message for Biography {
     }
 
     fn default_instance() -> &'static Biography {
-        static mut instance: ::protobuf::lazy::Lazy<Biography> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Biography,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Biography> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Biography::new)
         }
@@ -4576,8 +4510,8 @@ impl ::std::fmt::Debug for Biography {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Biography {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -4785,10 +4719,7 @@ impl ::protobuf::Message for Disc {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -4807,7 +4738,7 @@ impl ::protobuf::Message for Disc {
                     |m: &Disc| { &m.track },
                     |m: &mut Disc| { &mut m.track },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<Disc>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<Disc>(
                     "Disc",
                     fields,
                     file_descriptor_proto()
@@ -4817,10 +4748,7 @@ impl ::protobuf::Message for Disc {
     }
 
     fn default_instance() -> &'static Disc {
-        static mut instance: ::protobuf::lazy::Lazy<Disc> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Disc,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Disc> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Disc::new)
         }
@@ -4843,8 +4771,8 @@ impl ::std::fmt::Debug for Disc {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Disc {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -5005,10 +4933,7 @@ impl ::protobuf::Message for Copyright {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -5022,7 +4947,7 @@ impl ::protobuf::Message for Copyright {
                     |m: &Copyright| { &m.text },
                     |m: &mut Copyright| { &mut m.text },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<Copyright>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<Copyright>(
                     "Copyright",
                     fields,
                     file_descriptor_proto()
@@ -5032,10 +4957,7 @@ impl ::protobuf::Message for Copyright {
     }
 
     fn default_instance() -> &'static Copyright {
-        static mut instance: ::protobuf::lazy::Lazy<Copyright> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Copyright,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Copyright> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Copyright::new)
         }
@@ -5057,8 +4979,8 @@ impl ::std::fmt::Debug for Copyright {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Copyright {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -5090,13 +5012,10 @@ impl ::protobuf::ProtobufEnum for Copyright_Type {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("Copyright_Type", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<Copyright_Type>("Copyright.Type", file_descriptor_proto())
             })
         }
     }
@@ -5112,8 +5031,8 @@ impl ::std::default::Default for Copyright_Type {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Copyright_Type {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -5390,10 +5309,7 @@ impl ::protobuf::Message for Restriction {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -5422,7 +5338,7 @@ impl ::protobuf::Message for Restriction {
                     |m: &Restriction| { &m.catalogue_str },
                     |m: &mut Restriction| { &mut m.catalogue_str },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<Restriction>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<Restriction>(
                     "Restriction",
                     fields,
                     file_descriptor_proto()
@@ -5432,10 +5348,7 @@ impl ::protobuf::Message for Restriction {
     }
 
     fn default_instance() -> &'static Restriction {
-        static mut instance: ::protobuf::lazy::Lazy<Restriction> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Restriction,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Restriction> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Restriction::new)
         }
@@ -5460,8 +5373,8 @@ impl ::std::fmt::Debug for Restriction {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Restriction {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -5502,13 +5415,10 @@ impl ::protobuf::ProtobufEnum for Restriction_Catalogue {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("Restriction_Catalogue", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<Restriction_Catalogue>("Restriction.Catalogue", file_descriptor_proto())
             })
         }
     }
@@ -5524,8 +5434,8 @@ impl ::std::default::Default for Restriction_Catalogue {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Restriction_Catalogue {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -5554,13 +5464,10 @@ impl ::protobuf::ProtobufEnum for Restriction_Type {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("Restriction_Type", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<Restriction_Type>("Restriction.Type", file_descriptor_proto())
             })
         }
     }
@@ -5576,8 +5483,8 @@ impl ::std::default::Default for Restriction_Type {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Restriction_Type {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -5749,10 +5656,7 @@ impl ::protobuf::Message for Availability {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -5766,7 +5670,7 @@ impl ::protobuf::Message for Availability {
                     |m: &Availability| { &m.start },
                     |m: &mut Availability| { &mut m.start },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<Availability>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<Availability>(
                     "Availability",
                     fields,
                     file_descriptor_proto()
@@ -5776,10 +5680,7 @@ impl ::protobuf::Message for Availability {
     }
 
     fn default_instance() -> &'static Availability {
-        static mut instance: ::protobuf::lazy::Lazy<Availability> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Availability,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Availability> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Availability::new)
         }
@@ -5801,8 +5702,8 @@ impl ::std::fmt::Debug for Availability {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Availability {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -6033,10 +5934,7 @@ impl ::protobuf::Message for SalePeriod {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -6055,7 +5953,7 @@ impl ::protobuf::Message for SalePeriod {
                     |m: &SalePeriod| { &m.end },
                     |m: &mut SalePeriod| { &mut m.end },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<SalePeriod>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<SalePeriod>(
                     "SalePeriod",
                     fields,
                     file_descriptor_proto()
@@ -6065,10 +5963,7 @@ impl ::protobuf::Message for SalePeriod {
     }
 
     fn default_instance() -> &'static SalePeriod {
-        static mut instance: ::protobuf::lazy::Lazy<SalePeriod> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const SalePeriod,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<SalePeriod> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(SalePeriod::new)
         }
@@ -6091,8 +5986,8 @@ impl ::std::fmt::Debug for SalePeriod {
 }
 
 impl ::protobuf::reflect::ProtobufValue for SalePeriod {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -6270,10 +6165,7 @@ impl ::protobuf::Message for ExternalId {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -6287,7 +6179,7 @@ impl ::protobuf::Message for ExternalId {
                     |m: &ExternalId| { &m.id },
                     |m: &mut ExternalId| { &mut m.id },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<ExternalId>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<ExternalId>(
                     "ExternalId",
                     fields,
                     file_descriptor_proto()
@@ -6297,10 +6189,7 @@ impl ::protobuf::Message for ExternalId {
     }
 
     fn default_instance() -> &'static ExternalId {
-        static mut instance: ::protobuf::lazy::Lazy<ExternalId> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ExternalId,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<ExternalId> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(ExternalId::new)
         }
@@ -6322,8 +6211,8 @@ impl ::std::fmt::Debug for ExternalId {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ExternalId {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -6484,10 +6373,7 @@ impl ::protobuf::Message for AudioFile {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -6501,7 +6387,7 @@ impl ::protobuf::Message for AudioFile {
                     |m: &AudioFile| { &m.format },
                     |m: &mut AudioFile| { &mut m.format },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<AudioFile>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<AudioFile>(
                     "AudioFile",
                     fields,
                     file_descriptor_proto()
@@ -6511,10 +6397,7 @@ impl ::protobuf::Message for AudioFile {
     }
 
     fn default_instance() -> &'static AudioFile {
-        static mut instance: ::protobuf::lazy::Lazy<AudioFile> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const AudioFile,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<AudioFile> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(AudioFile::new)
         }
@@ -6536,8 +6419,8 @@ impl ::std::fmt::Debug for AudioFile {
 }
 
 impl ::protobuf::reflect::ProtobufValue for AudioFile {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -6605,13 +6488,10 @@ impl ::protobuf::ProtobufEnum for AudioFile_Format {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("AudioFile_Format", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<AudioFile_Format>("AudioFile.Format", file_descriptor_proto())
             })
         }
     }
@@ -6627,8 +6507,8 @@ impl ::std::default::Default for AudioFile_Format {
 }
 
 impl ::protobuf::reflect::ProtobufValue for AudioFile_Format {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -6760,10 +6640,7 @@ impl ::protobuf::Message for VideoFile {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -6772,7 +6649,7 @@ impl ::protobuf::Message for VideoFile {
                     |m: &VideoFile| { &m.file_id },
                     |m: &mut VideoFile| { &mut m.file_id },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<VideoFile>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<VideoFile>(
                     "VideoFile",
                     fields,
                     file_descriptor_proto()
@@ -6782,10 +6659,7 @@ impl ::protobuf::Message for VideoFile {
     }
 
     fn default_instance() -> &'static VideoFile {
-        static mut instance: ::protobuf::lazy::Lazy<VideoFile> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const VideoFile,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<VideoFile> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(VideoFile::new)
         }
@@ -6806,8 +6680,8 @@ impl ::std::fmt::Debug for VideoFile {
 }
 
 impl ::protobuf::reflect::ProtobufValue for VideoFile {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -7656,10 +7530,7 @@ impl ::protobuf::Message for Show {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -7758,7 +7629,7 @@ impl ::protobuf::Message for Show {
                     |m: &Show| { &m.passthrough },
                     |m: &mut Show| { &mut m.passthrough },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<Show>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<Show>(
                     "Show",
                     fields,
                     file_descriptor_proto()
@@ -7768,10 +7639,7 @@ impl ::protobuf::Message for Show {
     }
 
     fn default_instance() -> &'static Show {
-        static mut instance: ::protobuf::lazy::Lazy<Show> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Show,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Show> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Show::new)
         }
@@ -7810,8 +7678,8 @@ impl ::std::fmt::Debug for Show {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Show {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -7846,13 +7714,10 @@ impl ::protobuf::ProtobufEnum for Show_MediaType {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("Show_MediaType", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<Show_MediaType>("Show.MediaType", file_descriptor_proto())
             })
         }
     }
@@ -7868,8 +7733,8 @@ impl ::std::default::Default for Show_MediaType {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Show_MediaType {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -7904,13 +7769,10 @@ impl ::protobuf::ProtobufEnum for Show_ConsumptionOrder {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("Show_ConsumptionOrder", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<Show_ConsumptionOrder>("Show.ConsumptionOrder", file_descriptor_proto())
             })
         }
     }
@@ -7927,8 +7789,8 @@ impl ::std::default::Default for Show_ConsumptionOrder {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Show_ConsumptionOrder {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -7963,13 +7825,10 @@ impl ::protobuf::ProtobufEnum for Show_PassthroughEnum {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("Show_PassthroughEnum", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<Show_PassthroughEnum>("Show.PassthroughEnum", file_descriptor_proto())
             })
         }
     }
@@ -7985,8 +7844,8 @@ impl ::std::default::Default for Show_PassthroughEnum {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Show_PassthroughEnum {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -9114,10 +8973,7 @@ impl ::protobuf::Message for Episode {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -9246,7 +9102,7 @@ impl ::protobuf::Message for Episode {
                     |m: &Episode| { &m.original_audio },
                     |m: &mut Episode| { &mut m.original_audio },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<Episode>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<Episode>(
                     "Episode",
                     fields,
                     file_descriptor_proto()
@@ -9256,10 +9112,7 @@ impl ::protobuf::Message for Episode {
     }
 
     fn default_instance() -> &'static Episode {
-        static mut instance: ::protobuf::lazy::Lazy<Episode> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Episode,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Episode> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Episode::new)
         }
@@ -9304,8 +9157,8 @@ impl ::std::fmt::Debug for Episode {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Episode {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -9480,10 +9333,7 @@ impl ::protobuf::Message for Category {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -9497,7 +9347,7 @@ impl ::protobuf::Message for Category {
                     |m: &Category| { &m.subcategories },
                     |m: &mut Category| { &mut m.subcategories },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<Category>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<Category>(
                     "Category",
                     fields,
                     file_descriptor_proto()
@@ -9507,10 +9357,7 @@ impl ::protobuf::Message for Category {
     }
 
     fn default_instance() -> &'static Category {
-        static mut instance: ::protobuf::lazy::Lazy<Category> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Category,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Category> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Category::new)
         }
@@ -9532,8 +9379,8 @@ impl ::std::fmt::Debug for Category {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Category {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -9665,10 +9512,7 @@ impl ::protobuf::Message for OriginalAudio {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -9677,7 +9521,7 @@ impl ::protobuf::Message for OriginalAudio {
                     |m: &OriginalAudio| { &m.uuid },
                     |m: &mut OriginalAudio| { &mut m.uuid },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<OriginalAudio>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<OriginalAudio>(
                     "OriginalAudio",
                     fields,
                     file_descriptor_proto()
@@ -9687,10 +9531,7 @@ impl ::protobuf::Message for OriginalAudio {
     }
 
     fn default_instance() -> &'static OriginalAudio {
-        static mut instance: ::protobuf::lazy::Lazy<OriginalAudio> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const OriginalAudio,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<OriginalAudio> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(OriginalAudio::new)
         }
@@ -9711,8 +9552,8 @@ impl ::std::fmt::Debug for OriginalAudio {
 }
 
 impl ::protobuf::reflect::ProtobufValue for OriginalAudio {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -9843,10 +9684,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\
     \x18\x01\x20\x01(\x0cB\0:\0B\0b\x06proto2\
 ";
 
-static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy {
-    lock: ::protobuf::lazy::ONCE_INIT,
-    ptr: 0 as *const ::protobuf::descriptor::FileDescriptorProto,
-};
+static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT;
 
 fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto {
     ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap()
diff --git a/protocol/src/playlist4changes.rs b/protocol/src/playlist4changes.rs
index 3fefbdd1..7022f152 100644
--- a/protocol/src/playlist4changes.rs
+++ b/protocol/src/playlist4changes.rs
@@ -1,7 +1,7 @@
-// This file is generated by rust-protobuf 2.8.1. Do not edit
+// This file is generated by rust-protobuf 2.14.0. Do not edit
 // @generated
 
-// https://github.com/Manishearth/rust-clippy/issues/702
+// https://github.com/rust-lang/rust-clippy/issues/702
 #![allow(unknown_lints)]
 #![allow(clippy::all)]
 
@@ -24,7 +24,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions;
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_1;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0;
 
 #[derive(PartialEq,Clone,Default)]
 pub struct ChangeInfo {
@@ -385,10 +385,7 @@ impl ::protobuf::Message for ChangeInfo {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -432,7 +429,7 @@ impl ::protobuf::Message for ChangeInfo {
                     |m: &ChangeInfo| { &m.migration },
                     |m: &mut ChangeInfo| { &mut m.migration },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<ChangeInfo>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<ChangeInfo>(
                     "ChangeInfo",
                     fields,
                     file_descriptor_proto()
@@ -442,10 +439,7 @@ impl ::protobuf::Message for ChangeInfo {
     }
 
     fn default_instance() -> &'static ChangeInfo {
-        static mut instance: ::protobuf::lazy::Lazy<ChangeInfo> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ChangeInfo,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<ChangeInfo> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(ChangeInfo::new)
         }
@@ -473,8 +467,8 @@ impl ::std::fmt::Debug for ChangeInfo {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ChangeInfo {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -700,10 +694,7 @@ impl ::protobuf::Message for Delta {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -722,7 +713,7 @@ impl ::protobuf::Message for Delta {
                     |m: &Delta| { &m.info },
                     |m: &mut Delta| { &mut m.info },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<Delta>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<Delta>(
                     "Delta",
                     fields,
                     file_descriptor_proto()
@@ -732,10 +723,7 @@ impl ::protobuf::Message for Delta {
     }
 
     fn default_instance() -> &'static Delta {
-        static mut instance: ::protobuf::lazy::Lazy<Delta> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Delta,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Delta> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Delta::new)
         }
@@ -758,8 +746,8 @@ impl ::std::fmt::Debug for Delta {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Delta {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -988,10 +976,7 @@ impl ::protobuf::Message for Merge {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -1010,7 +995,7 @@ impl ::protobuf::Message for Merge {
                     |m: &Merge| { &m.info },
                     |m: &mut Merge| { &mut m.info },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<Merge>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<Merge>(
                     "Merge",
                     fields,
                     file_descriptor_proto()
@@ -1020,10 +1005,7 @@ impl ::protobuf::Message for Merge {
     }
 
     fn default_instance() -> &'static Merge {
-        static mut instance: ::protobuf::lazy::Lazy<Merge> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Merge,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Merge> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Merge::new)
         }
@@ -1046,8 +1028,8 @@ impl ::std::fmt::Debug for Merge {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Merge {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1264,10 +1246,7 @@ impl ::protobuf::Message for ChangeSet {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -1286,7 +1265,7 @@ impl ::protobuf::Message for ChangeSet {
                     |m: &ChangeSet| { &m.merge },
                     |m: &mut ChangeSet| { &mut m.merge },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<ChangeSet>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<ChangeSet>(
                     "ChangeSet",
                     fields,
                     file_descriptor_proto()
@@ -1296,10 +1275,7 @@ impl ::protobuf::Message for ChangeSet {
     }
 
     fn default_instance() -> &'static ChangeSet {
-        static mut instance: ::protobuf::lazy::Lazy<ChangeSet> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ChangeSet,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<ChangeSet> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(ChangeSet::new)
         }
@@ -1322,8 +1298,8 @@ impl ::std::fmt::Debug for ChangeSet {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ChangeSet {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1358,13 +1334,10 @@ impl ::protobuf::ProtobufEnum for ChangeSet_Kind {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("ChangeSet_Kind", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<ChangeSet_Kind>("ChangeSet.Kind", file_descriptor_proto())
             })
         }
     }
@@ -1380,8 +1353,8 @@ impl ::std::default::Default for ChangeSet_Kind {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ChangeSet_Kind {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -1564,10 +1537,7 @@ impl ::protobuf::Message for RevisionTaggedChangeSet {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -1581,7 +1551,7 @@ impl ::protobuf::Message for RevisionTaggedChangeSet {
                     |m: &RevisionTaggedChangeSet| { &m.change_set },
                     |m: &mut RevisionTaggedChangeSet| { &mut m.change_set },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<RevisionTaggedChangeSet>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<RevisionTaggedChangeSet>(
                     "RevisionTaggedChangeSet",
                     fields,
                     file_descriptor_proto()
@@ -1591,10 +1561,7 @@ impl ::protobuf::Message for RevisionTaggedChangeSet {
     }
 
     fn default_instance() -> &'static RevisionTaggedChangeSet {
-        static mut instance: ::protobuf::lazy::Lazy<RevisionTaggedChangeSet> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const RevisionTaggedChangeSet,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<RevisionTaggedChangeSet> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(RevisionTaggedChangeSet::new)
         }
@@ -1616,8 +1583,8 @@ impl ::std::fmt::Debug for RevisionTaggedChangeSet {
 }
 
 impl ::protobuf::reflect::ProtobufValue for RevisionTaggedChangeSet {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1838,10 +1805,7 @@ impl ::protobuf::Message for Diff {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -1860,7 +1824,7 @@ impl ::protobuf::Message for Diff {
                     |m: &Diff| { &m.to_revision },
                     |m: &mut Diff| { &mut m.to_revision },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<Diff>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<Diff>(
                     "Diff",
                     fields,
                     file_descriptor_proto()
@@ -1870,10 +1834,7 @@ impl ::protobuf::Message for Diff {
     }
 
     fn default_instance() -> &'static Diff {
-        static mut instance: ::protobuf::lazy::Lazy<Diff> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Diff,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Diff> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Diff::new)
         }
@@ -1896,8 +1857,8 @@ impl ::std::fmt::Debug for Diff {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Diff {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -2258,10 +2219,7 @@ impl ::protobuf::Message for ListDump {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -2295,7 +2253,7 @@ impl ::protobuf::Message for ListDump {
                     |m: &ListDump| { &m.pendingDeltas },
                     |m: &mut ListDump| { &mut m.pendingDeltas },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<ListDump>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<ListDump>(
                     "ListDump",
                     fields,
                     file_descriptor_proto()
@@ -2305,10 +2263,7 @@ impl ::protobuf::Message for ListDump {
     }
 
     fn default_instance() -> &'static ListDump {
-        static mut instance: ::protobuf::lazy::Lazy<ListDump> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ListDump,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<ListDump> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(ListDump::new)
         }
@@ -2334,8 +2289,8 @@ impl ::std::fmt::Debug for ListDump {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ListDump {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -2662,10 +2617,7 @@ impl ::protobuf::Message for ListChanges {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -2699,7 +2651,7 @@ impl ::protobuf::Message for ListChanges {
                     |m: &ListChanges| { &m.nonces },
                     |m: &mut ListChanges| { &mut m.nonces },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<ListChanges>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<ListChanges>(
                     "ListChanges",
                     fields,
                     file_descriptor_proto()
@@ -2709,10 +2661,7 @@ impl ::protobuf::Message for ListChanges {
     }
 
     fn default_instance() -> &'static ListChanges {
-        static mut instance: ::protobuf::lazy::Lazy<ListChanges> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ListChanges,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<ListChanges> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(ListChanges::new)
         }
@@ -2738,8 +2687,8 @@ impl ::std::fmt::Debug for ListChanges {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ListChanges {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -3427,10 +3376,7 @@ impl ::protobuf::Message for SelectedListContent {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -3504,7 +3450,7 @@ impl ::protobuf::Message for SelectedListContent {
                     |m: &SelectedListContent| { &m.owner_username },
                     |m: &mut SelectedListContent| { &mut m.owner_username },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<SelectedListContent>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<SelectedListContent>(
                     "SelectedListContent",
                     fields,
                     file_descriptor_proto()
@@ -3514,10 +3460,7 @@ impl ::protobuf::Message for SelectedListContent {
     }
 
     fn default_instance() -> &'static SelectedListContent {
-        static mut instance: ::protobuf::lazy::Lazy<SelectedListContent> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const SelectedListContent,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<SelectedListContent> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(SelectedListContent::new)
         }
@@ -3551,8 +3494,8 @@ impl ::std::fmt::Debug for SelectedListContent {
 }
 
 impl ::protobuf::reflect::ProtobufValue for SelectedListContent {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -3600,10 +3543,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\
     \x20\x01(\tB\0:\0B\0b\x06proto2\
 ";
 
-static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy {
-    lock: ::protobuf::lazy::ONCE_INIT,
-    ptr: 0 as *const ::protobuf::descriptor::FileDescriptorProto,
-};
+static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT;
 
 fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto {
     ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap()
diff --git a/protocol/src/playlist4content.rs b/protocol/src/playlist4content.rs
index c92f6870..58b5bea3 100644
--- a/protocol/src/playlist4content.rs
+++ b/protocol/src/playlist4content.rs
@@ -1,7 +1,7 @@
-// This file is generated by rust-protobuf 2.8.1. Do not edit
+// This file is generated by rust-protobuf 2.14.0. Do not edit
 // @generated
 
-// https://github.com/Manishearth/rust-clippy/issues/702
+// https://github.com/rust-lang/rust-clippy/issues/702
 #![allow(unknown_lints)]
 #![allow(clippy::all)]
 
@@ -24,7 +24,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions;
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_1;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0;
 
 #[derive(PartialEq,Clone,Default)]
 pub struct Item {
@@ -205,10 +205,7 @@ impl ::protobuf::Message for Item {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -222,7 +219,7 @@ impl ::protobuf::Message for Item {
                     |m: &Item| { &m.attributes },
                     |m: &mut Item| { &mut m.attributes },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<Item>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<Item>(
                     "Item",
                     fields,
                     file_descriptor_proto()
@@ -232,10 +229,7 @@ impl ::protobuf::Message for Item {
     }
 
     fn default_instance() -> &'static Item {
-        static mut instance: ::protobuf::lazy::Lazy<Item> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Item,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Item> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Item::new)
         }
@@ -257,8 +251,8 @@ impl ::std::fmt::Debug for Item {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Item {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -453,10 +447,7 @@ impl ::protobuf::Message for ListItems {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -475,7 +466,7 @@ impl ::protobuf::Message for ListItems {
                     |m: &ListItems| { &m.items },
                     |m: &mut ListItems| { &mut m.items },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<ListItems>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<ListItems>(
                     "ListItems",
                     fields,
                     file_descriptor_proto()
@@ -485,10 +476,7 @@ impl ::protobuf::Message for ListItems {
     }
 
     fn default_instance() -> &'static ListItems {
-        static mut instance: ::protobuf::lazy::Lazy<ListItems> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ListItems,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<ListItems> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(ListItems::new)
         }
@@ -511,8 +499,8 @@ impl ::std::fmt::Debug for ListItems {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ListItems {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -664,10 +652,7 @@ impl ::protobuf::Message for ContentRange {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -681,7 +666,7 @@ impl ::protobuf::Message for ContentRange {
                     |m: &ContentRange| { &m.length },
                     |m: &mut ContentRange| { &mut m.length },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<ContentRange>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<ContentRange>(
                     "ContentRange",
                     fields,
                     file_descriptor_proto()
@@ -691,10 +676,7 @@ impl ::protobuf::Message for ContentRange {
     }
 
     fn default_instance() -> &'static ContentRange {
-        static mut instance: ::protobuf::lazy::Lazy<ContentRange> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ContentRange,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<ContentRange> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(ContentRange::new)
         }
@@ -716,8 +698,8 @@ impl ::std::fmt::Debug for ContentRange {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ContentRange {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1296,10 +1278,7 @@ impl ::protobuf::Message for ListContentSelection {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -1368,7 +1347,7 @@ impl ::protobuf::Message for ListContentSelection {
                     |m: &ListContentSelection| { &m.resolveAction },
                     |m: &mut ListContentSelection| { &mut m.resolveAction },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<ListContentSelection>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<ListContentSelection>(
                     "ListContentSelection",
                     fields,
                     file_descriptor_proto()
@@ -1378,10 +1357,7 @@ impl ::protobuf::Message for ListContentSelection {
     }
 
     fn default_instance() -> &'static ListContentSelection {
-        static mut instance: ::protobuf::lazy::Lazy<ListContentSelection> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ListContentSelection,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<ListContentSelection> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(ListContentSelection::new)
         }
@@ -1414,8 +1390,8 @@ impl ::std::fmt::Debug for ListContentSelection {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ListContentSelection {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1439,10 +1415,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\
     ionB\0:\0B\0b\x06proto2\
 ";
 
-static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy {
-    lock: ::protobuf::lazy::ONCE_INIT,
-    ptr: 0 as *const ::protobuf::descriptor::FileDescriptorProto,
-};
+static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT;
 
 fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto {
     ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap()
diff --git a/protocol/src/playlist4issues.rs b/protocol/src/playlist4issues.rs
index 54aa1627..3448f5c5 100644
--- a/protocol/src/playlist4issues.rs
+++ b/protocol/src/playlist4issues.rs
@@ -1,7 +1,7 @@
-// This file is generated by rust-protobuf 2.8.1. Do not edit
+// This file is generated by rust-protobuf 2.14.0. Do not edit
 // @generated
 
-// https://github.com/Manishearth/rust-clippy/issues/702
+// https://github.com/rust-lang/rust-clippy/issues/702
 #![allow(unknown_lints)]
 #![allow(clippy::all)]
 
@@ -24,7 +24,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions;
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_1;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0;
 
 #[derive(PartialEq,Clone,Default)]
 pub struct ClientIssue {
@@ -199,10 +199,7 @@ impl ::protobuf::Message for ClientIssue {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -221,7 +218,7 @@ impl ::protobuf::Message for ClientIssue {
                     |m: &ClientIssue| { &m.repeatCount },
                     |m: &mut ClientIssue| { &mut m.repeatCount },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<ClientIssue>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<ClientIssue>(
                     "ClientIssue",
                     fields,
                     file_descriptor_proto()
@@ -231,10 +228,7 @@ impl ::protobuf::Message for ClientIssue {
     }
 
     fn default_instance() -> &'static ClientIssue {
-        static mut instance: ::protobuf::lazy::Lazy<ClientIssue> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ClientIssue,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<ClientIssue> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(ClientIssue::new)
         }
@@ -257,8 +251,8 @@ impl ::std::fmt::Debug for ClientIssue {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ClientIssue {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -302,13 +296,10 @@ impl ::protobuf::ProtobufEnum for ClientIssue_Level {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("ClientIssue_Level", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<ClientIssue_Level>("ClientIssue.Level", file_descriptor_proto())
             })
         }
     }
@@ -324,8 +315,8 @@ impl ::std::default::Default for ClientIssue_Level {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ClientIssue_Level {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -369,13 +360,10 @@ impl ::protobuf::ProtobufEnum for ClientIssue_Code {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("ClientIssue_Code", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<ClientIssue_Code>("ClientIssue.Code", file_descriptor_proto())
             })
         }
     }
@@ -391,8 +379,8 @@ impl ::std::default::Default for ClientIssue_Code {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ClientIssue_Code {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -536,10 +524,7 @@ impl ::protobuf::Message for ClientResolveAction {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -553,7 +538,7 @@ impl ::protobuf::Message for ClientResolveAction {
                     |m: &ClientResolveAction| { &m.initiator },
                     |m: &mut ClientResolveAction| { &mut m.initiator },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<ClientResolveAction>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<ClientResolveAction>(
                     "ClientResolveAction",
                     fields,
                     file_descriptor_proto()
@@ -563,10 +548,7 @@ impl ::protobuf::Message for ClientResolveAction {
     }
 
     fn default_instance() -> &'static ClientResolveAction {
-        static mut instance: ::protobuf::lazy::Lazy<ClientResolveAction> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ClientResolveAction,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<ClientResolveAction> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(ClientResolveAction::new)
         }
@@ -588,8 +570,8 @@ impl ::std::fmt::Debug for ClientResolveAction {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ClientResolveAction {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -636,13 +618,10 @@ impl ::protobuf::ProtobufEnum for ClientResolveAction_Code {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("ClientResolveAction_Code", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<ClientResolveAction_Code>("ClientResolveAction.Code", file_descriptor_proto())
             })
         }
     }
@@ -658,8 +637,8 @@ impl ::std::default::Default for ClientResolveAction_Code {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ClientResolveAction_Code {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -694,13 +673,10 @@ impl ::protobuf::ProtobufEnum for ClientResolveAction_Initiator {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("ClientResolveAction_Initiator", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<ClientResolveAction_Initiator>("ClientResolveAction.Initiator", file_descriptor_proto())
             })
         }
     }
@@ -716,8 +692,8 @@ impl ::std::default::Default for ClientResolveAction_Initiator {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ClientResolveAction_Initiator {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -743,10 +719,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\
     \x10\x01\x12\x14\n\x10INITIATOR_CLIENT\x10\x02\x1a\0:\0B\0b\x06proto2\
 ";
 
-static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy {
-    lock: ::protobuf::lazy::ONCE_INIT,
-    ptr: 0 as *const ::protobuf::descriptor::FileDescriptorProto,
-};
+static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT;
 
 fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto {
     ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap()
diff --git a/protocol/src/playlist4meta.rs b/protocol/src/playlist4meta.rs
index 145105e7..f3a0b661 100644
--- a/protocol/src/playlist4meta.rs
+++ b/protocol/src/playlist4meta.rs
@@ -1,7 +1,7 @@
-// This file is generated by rust-protobuf 2.8.1. Do not edit
+// This file is generated by rust-protobuf 2.14.0. Do not edit
 // @generated
 
-// https://github.com/Manishearth/rust-clippy/issues/702
+// https://github.com/rust-lang/rust-clippy/issues/702
 #![allow(unknown_lints)]
 #![allow(clippy::all)]
 
@@ -24,7 +24,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions;
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_1;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0;
 
 #[derive(PartialEq,Clone,Default)]
 pub struct ListChecksum {
@@ -187,10 +187,7 @@ impl ::protobuf::Message for ListChecksum {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -204,7 +201,7 @@ impl ::protobuf::Message for ListChecksum {
                     |m: &ListChecksum| { &m.sha1 },
                     |m: &mut ListChecksum| { &mut m.sha1 },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<ListChecksum>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<ListChecksum>(
                     "ListChecksum",
                     fields,
                     file_descriptor_proto()
@@ -214,10 +211,7 @@ impl ::protobuf::Message for ListChecksum {
     }
 
     fn default_instance() -> &'static ListChecksum {
-        static mut instance: ::protobuf::lazy::Lazy<ListChecksum> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ListChecksum,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<ListChecksum> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(ListChecksum::new)
         }
@@ -239,8 +233,8 @@ impl ::std::fmt::Debug for ListChecksum {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ListChecksum {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -355,10 +349,7 @@ impl ::protobuf::Message for DownloadFormat {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -367,7 +358,7 @@ impl ::protobuf::Message for DownloadFormat {
                     |m: &DownloadFormat| { &m.codec },
                     |m: &mut DownloadFormat| { &mut m.codec },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<DownloadFormat>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<DownloadFormat>(
                     "DownloadFormat",
                     fields,
                     file_descriptor_proto()
@@ -377,10 +368,7 @@ impl ::protobuf::Message for DownloadFormat {
     }
 
     fn default_instance() -> &'static DownloadFormat {
-        static mut instance: ::protobuf::lazy::Lazy<DownloadFormat> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const DownloadFormat,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<DownloadFormat> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(DownloadFormat::new)
         }
@@ -401,8 +389,8 @@ impl ::std::fmt::Debug for DownloadFormat {
 }
 
 impl ::protobuf::reflect::ProtobufValue for DownloadFormat {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -440,13 +428,10 @@ impl ::protobuf::ProtobufEnum for DownloadFormat_Codec {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("DownloadFormat_Codec", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<DownloadFormat_Codec>("DownloadFormat.Codec", file_descriptor_proto())
             })
         }
     }
@@ -462,8 +447,8 @@ impl ::std::default::Default for DownloadFormat_Codec {
 }
 
 impl ::protobuf::reflect::ProtobufValue for DownloadFormat_Codec {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -944,10 +929,7 @@ impl ::protobuf::Message for ListAttributes {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -1001,7 +983,7 @@ impl ::protobuf::Message for ListAttributes {
                     |m: &ListAttributes| { &m.client_id },
                     |m: &mut ListAttributes| { &mut m.client_id },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<ListAttributes>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<ListAttributes>(
                     "ListAttributes",
                     fields,
                     file_descriptor_proto()
@@ -1011,10 +993,7 @@ impl ::protobuf::Message for ListAttributes {
     }
 
     fn default_instance() -> &'static ListAttributes {
-        static mut instance: ::protobuf::lazy::Lazy<ListAttributes> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ListAttributes,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<ListAttributes> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(ListAttributes::new)
         }
@@ -1044,8 +1023,8 @@ impl ::std::fmt::Debug for ListAttributes {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ListAttributes {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1518,10 +1497,7 @@ impl ::protobuf::Message for ItemAttributes {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -1575,7 +1551,7 @@ impl ::protobuf::Message for ItemAttributes {
                     |m: &ItemAttributes| { &m.public },
                     |m: &mut ItemAttributes| { &mut m.public },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<ItemAttributes>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<ItemAttributes>(
                     "ItemAttributes",
                     fields,
                     file_descriptor_proto()
@@ -1585,10 +1561,7 @@ impl ::protobuf::Message for ItemAttributes {
     }
 
     fn default_instance() -> &'static ItemAttributes {
-        static mut instance: ::protobuf::lazy::Lazy<ItemAttributes> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ItemAttributes,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<ItemAttributes> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(ItemAttributes::new)
         }
@@ -1618,8 +1591,8 @@ impl ::std::fmt::Debug for ItemAttributes {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ItemAttributes {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1797,10 +1770,7 @@ impl ::protobuf::Message for StringAttribute {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -1814,7 +1784,7 @@ impl ::protobuf::Message for StringAttribute {
                     |m: &StringAttribute| { &m.value },
                     |m: &mut StringAttribute| { &mut m.value },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<StringAttribute>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<StringAttribute>(
                     "StringAttribute",
                     fields,
                     file_descriptor_proto()
@@ -1824,10 +1794,7 @@ impl ::protobuf::Message for StringAttribute {
     }
 
     fn default_instance() -> &'static StringAttribute {
-        static mut instance: ::protobuf::lazy::Lazy<StringAttribute> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const StringAttribute,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<StringAttribute> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(StringAttribute::new)
         }
@@ -1849,8 +1816,8 @@ impl ::std::fmt::Debug for StringAttribute {
 }
 
 impl ::protobuf::reflect::ProtobufValue for StringAttribute {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1979,10 +1946,7 @@ impl ::protobuf::Message for StringAttributes {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -1991,7 +1955,7 @@ impl ::protobuf::Message for StringAttributes {
                     |m: &StringAttributes| { &m.attribute },
                     |m: &mut StringAttributes| { &mut m.attribute },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<StringAttributes>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<StringAttributes>(
                     "StringAttributes",
                     fields,
                     file_descriptor_proto()
@@ -2001,10 +1965,7 @@ impl ::protobuf::Message for StringAttributes {
     }
 
     fn default_instance() -> &'static StringAttributes {
-        static mut instance: ::protobuf::lazy::Lazy<StringAttributes> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const StringAttributes,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<StringAttributes> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(StringAttributes::new)
         }
@@ -2025,8 +1986,8 @@ impl ::std::fmt::Debug for StringAttributes {
 }
 
 impl ::protobuf::reflect::ProtobufValue for StringAttributes {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -2056,10 +2017,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\
     tribute\x18\x01\x20\x03(\x0b2\x10.StringAttributeB\0:\0B\0b\x06proto2\
 ";
 
-static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy {
-    lock: ::protobuf::lazy::ONCE_INIT,
-    ptr: 0 as *const ::protobuf::descriptor::FileDescriptorProto,
-};
+static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT;
 
 fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto {
     ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap()
diff --git a/protocol/src/playlist4ops.rs b/protocol/src/playlist4ops.rs
index db92f760..b16fe5d3 100644
--- a/protocol/src/playlist4ops.rs
+++ b/protocol/src/playlist4ops.rs
@@ -1,7 +1,7 @@
-// This file is generated by rust-protobuf 2.8.1. Do not edit
+// This file is generated by rust-protobuf 2.14.0. Do not edit
 // @generated
 
-// https://github.com/Manishearth/rust-clippy/issues/702
+// https://github.com/rust-lang/rust-clippy/issues/702
 #![allow(unknown_lints)]
 #![allow(clippy::all)]
 
@@ -24,7 +24,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions;
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_1;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0;
 
 #[derive(PartialEq,Clone,Default)]
 pub struct Add {
@@ -301,10 +301,7 @@ impl ::protobuf::Message for Add {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -333,7 +330,7 @@ impl ::protobuf::Message for Add {
                     |m: &Add| { &m.addFirst },
                     |m: &mut Add| { &mut m.addFirst },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<Add>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<Add>(
                     "Add",
                     fields,
                     file_descriptor_proto()
@@ -343,10 +340,7 @@ impl ::protobuf::Message for Add {
     }
 
     fn default_instance() -> &'static Add {
-        static mut instance: ::protobuf::lazy::Lazy<Add> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Add,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Add> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Add::new)
         }
@@ -371,8 +365,8 @@ impl ::std::fmt::Debug for Add {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Add {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -753,10 +747,7 @@ impl ::protobuf::Message for Rem {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -795,7 +786,7 @@ impl ::protobuf::Message for Rem {
                     |m: &Rem| { &m.itemsAsKey },
                     |m: &mut Rem| { &mut m.itemsAsKey },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<Rem>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<Rem>(
                     "Rem",
                     fields,
                     file_descriptor_proto()
@@ -805,10 +796,7 @@ impl ::protobuf::Message for Rem {
     }
 
     fn default_instance() -> &'static Rem {
-        static mut instance: ::protobuf::lazy::Lazy<Rem> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Rem,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Rem> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Rem::new)
         }
@@ -835,8 +823,8 @@ impl ::std::fmt::Debug for Rem {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Rem {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1174,10 +1162,7 @@ impl ::protobuf::Message for Mov {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -1211,7 +1196,7 @@ impl ::protobuf::Message for Mov {
                     |m: &Mov| { &m.uris_checksum },
                     |m: &mut Mov| { &mut m.uris_checksum },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<Mov>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<Mov>(
                     "Mov",
                     fields,
                     file_descriptor_proto()
@@ -1221,10 +1206,7 @@ impl ::protobuf::Message for Mov {
     }
 
     fn default_instance() -> &'static Mov {
-        static mut instance: ::protobuf::lazy::Lazy<Mov> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Mov,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Mov> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Mov::new)
         }
@@ -1250,8 +1232,8 @@ impl ::std::fmt::Debug for Mov {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Mov {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1423,10 +1405,7 @@ impl ::protobuf::Message for ItemAttributesPartialState {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -1440,7 +1419,7 @@ impl ::protobuf::Message for ItemAttributesPartialState {
                     |m: &ItemAttributesPartialState| { &m.no_value },
                     |m: &mut ItemAttributesPartialState| { &mut m.no_value },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<ItemAttributesPartialState>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<ItemAttributesPartialState>(
                     "ItemAttributesPartialState",
                     fields,
                     file_descriptor_proto()
@@ -1450,10 +1429,7 @@ impl ::protobuf::Message for ItemAttributesPartialState {
     }
 
     fn default_instance() -> &'static ItemAttributesPartialState {
-        static mut instance: ::protobuf::lazy::Lazy<ItemAttributesPartialState> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ItemAttributesPartialState,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<ItemAttributesPartialState> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(ItemAttributesPartialState::new)
         }
@@ -1475,8 +1451,8 @@ impl ::std::fmt::Debug for ItemAttributesPartialState {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ItemAttributesPartialState {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1535,13 +1511,10 @@ impl ::protobuf::ProtobufEnum for ItemAttributesPartialState_ItemAttributeKind {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("ItemAttributesPartialState_ItemAttributeKind", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<ItemAttributesPartialState_ItemAttributeKind>("ItemAttributesPartialState.ItemAttributeKind", file_descriptor_proto())
             })
         }
     }
@@ -1557,8 +1530,8 @@ impl ::std::default::Default for ItemAttributesPartialState_ItemAttributeKind {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ItemAttributesPartialState_ItemAttributeKind {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -1730,10 +1703,7 @@ impl ::protobuf::Message for ListAttributesPartialState {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -1747,7 +1717,7 @@ impl ::protobuf::Message for ListAttributesPartialState {
                     |m: &ListAttributesPartialState| { &m.no_value },
                     |m: &mut ListAttributesPartialState| { &mut m.no_value },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<ListAttributesPartialState>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<ListAttributesPartialState>(
                     "ListAttributesPartialState",
                     fields,
                     file_descriptor_proto()
@@ -1757,10 +1727,7 @@ impl ::protobuf::Message for ListAttributesPartialState {
     }
 
     fn default_instance() -> &'static ListAttributesPartialState {
-        static mut instance: ::protobuf::lazy::Lazy<ListAttributesPartialState> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ListAttributesPartialState,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<ListAttributesPartialState> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(ListAttributesPartialState::new)
         }
@@ -1782,8 +1749,8 @@ impl ::std::fmt::Debug for ListAttributesPartialState {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ListAttributesPartialState {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1833,13 +1800,10 @@ impl ::protobuf::ProtobufEnum for ListAttributesPartialState_ListAttributeKind {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("ListAttributesPartialState_ListAttributeKind", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<ListAttributesPartialState_ListAttributeKind>("ListAttributesPartialState.ListAttributeKind", file_descriptor_proto())
             })
         }
     }
@@ -1855,8 +1819,8 @@ impl ::std::default::Default for ListAttributesPartialState_ListAttributeKind {
 }
 
 impl ::protobuf::reflect::ProtobufValue for ListAttributesPartialState_ListAttributeKind {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -2179,10 +2143,7 @@ impl ::protobuf::Message for UpdateItemAttributes {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -2211,7 +2172,7 @@ impl ::protobuf::Message for UpdateItemAttributes {
                     |m: &UpdateItemAttributes| { &m.old_attributes_checksum },
                     |m: &mut UpdateItemAttributes| { &mut m.old_attributes_checksum },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<UpdateItemAttributes>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<UpdateItemAttributes>(
                     "UpdateItemAttributes",
                     fields,
                     file_descriptor_proto()
@@ -2221,10 +2182,7 @@ impl ::protobuf::Message for UpdateItemAttributes {
     }
 
     fn default_instance() -> &'static UpdateItemAttributes {
-        static mut instance: ::protobuf::lazy::Lazy<UpdateItemAttributes> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const UpdateItemAttributes,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<UpdateItemAttributes> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(UpdateItemAttributes::new)
         }
@@ -2249,8 +2207,8 @@ impl ::std::fmt::Debug for UpdateItemAttributes {
 }
 
 impl ::protobuf::reflect::ProtobufValue for UpdateItemAttributes {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -2540,10 +2498,7 @@ impl ::protobuf::Message for UpdateListAttributes {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -2567,7 +2522,7 @@ impl ::protobuf::Message for UpdateListAttributes {
                     |m: &UpdateListAttributes| { &m.old_attributes_checksum },
                     |m: &mut UpdateListAttributes| { &mut m.old_attributes_checksum },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<UpdateListAttributes>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<UpdateListAttributes>(
                     "UpdateListAttributes",
                     fields,
                     file_descriptor_proto()
@@ -2577,10 +2532,7 @@ impl ::protobuf::Message for UpdateListAttributes {
     }
 
     fn default_instance() -> &'static UpdateListAttributes {
-        static mut instance: ::protobuf::lazy::Lazy<UpdateListAttributes> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const UpdateListAttributes,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<UpdateListAttributes> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(UpdateListAttributes::new)
         }
@@ -2604,8 +2556,8 @@ impl ::std::fmt::Debug for UpdateListAttributes {
 }
 
 impl ::protobuf::reflect::ProtobufValue for UpdateListAttributes {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -2975,10 +2927,7 @@ impl ::protobuf::Message for Op {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -3012,7 +2961,7 @@ impl ::protobuf::Message for Op {
                     |m: &Op| { &m.update_list_attributes },
                     |m: &mut Op| { &mut m.update_list_attributes },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<Op>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<Op>(
                     "Op",
                     fields,
                     file_descriptor_proto()
@@ -3022,10 +2971,7 @@ impl ::protobuf::Message for Op {
     }
 
     fn default_instance() -> &'static Op {
-        static mut instance: ::protobuf::lazy::Lazy<Op> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Op,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Op> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Op::new)
         }
@@ -3051,8 +2997,8 @@ impl ::std::fmt::Debug for Op {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Op {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -3096,13 +3042,10 @@ impl ::protobuf::ProtobufEnum for Op_Kind {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("Op_Kind", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<Op_Kind>("Op.Kind", file_descriptor_proto())
             })
         }
     }
@@ -3118,8 +3061,8 @@ impl ::std::default::Default for Op_Kind {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Op_Kind {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -3248,10 +3191,7 @@ impl ::protobuf::Message for OpList {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -3260,7 +3200,7 @@ impl ::protobuf::Message for OpList {
                     |m: &OpList| { &m.ops },
                     |m: &mut OpList| { &mut m.ops },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<OpList>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<OpList>(
                     "OpList",
                     fields,
                     file_descriptor_proto()
@@ -3270,10 +3210,7 @@ impl ::protobuf::Message for OpList {
     }
 
     fn default_instance() -> &'static OpList {
-        static mut instance: ::protobuf::lazy::Lazy<OpList> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const OpList,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<OpList> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(OpList::new)
         }
@@ -3294,8 +3231,8 @@ impl ::std::fmt::Debug for OpList {
 }
 
 impl ::protobuf::reflect::ProtobufValue for OpList {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -3353,10 +3290,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\
     \x18\x01\x20\x03(\x0b2\x03.OpB\0:\0B\0b\x06proto2\
 ";
 
-static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy {
-    lock: ::protobuf::lazy::ONCE_INIT,
-    ptr: 0 as *const ::protobuf::descriptor::FileDescriptorProto,
-};
+static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT;
 
 fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto {
     ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap()
diff --git a/protocol/src/pubsub.rs b/protocol/src/pubsub.rs
index a0daca49..15d4e2a0 100644
--- a/protocol/src/pubsub.rs
+++ b/protocol/src/pubsub.rs
@@ -1,7 +1,7 @@
-// This file is generated by rust-protobuf 2.8.1. Do not edit
+// This file is generated by rust-protobuf 2.14.0. Do not edit
 // @generated
 
-// https://github.com/Manishearth/rust-clippy/issues/702
+// https://github.com/rust-lang/rust-clippy/issues/702
 #![allow(unknown_lints)]
 #![allow(clippy::all)]
 
@@ -24,7 +24,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions;
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_1;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0;
 
 #[derive(PartialEq,Clone,Default)]
 pub struct Subscription {
@@ -220,10 +220,7 @@ impl ::protobuf::Message for Subscription {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -242,7 +239,7 @@ impl ::protobuf::Message for Subscription {
                     |m: &Subscription| { &m.status_code },
                     |m: &mut Subscription| { &mut m.status_code },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<Subscription>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<Subscription>(
                     "Subscription",
                     fields,
                     file_descriptor_proto()
@@ -252,10 +249,7 @@ impl ::protobuf::Message for Subscription {
     }
 
     fn default_instance() -> &'static Subscription {
-        static mut instance: ::protobuf::lazy::Lazy<Subscription> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Subscription,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Subscription> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Subscription::new)
         }
@@ -278,8 +272,8 @@ impl ::std::fmt::Debug for Subscription {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Subscription {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -289,10 +283,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\
     us_code\x18\x03\x20\x01(\x05B\0:\0B\0b\x06proto2\
 ";
 
-static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy {
-    lock: ::protobuf::lazy::ONCE_INIT,
-    ptr: 0 as *const ::protobuf::descriptor::FileDescriptorProto,
-};
+static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT;
 
 fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto {
     ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap()
diff --git a/protocol/src/spirc.rs b/protocol/src/spirc.rs
index e68f8110..ee626a2a 100644
--- a/protocol/src/spirc.rs
+++ b/protocol/src/spirc.rs
@@ -1,7 +1,7 @@
-// This file is generated by rust-protobuf 2.8.1. Do not edit
+// This file is generated by rust-protobuf 2.14.0. Do not edit
 // @generated
 
-// https://github.com/Manishearth/rust-clippy/issues/702
+// https://github.com/rust-lang/rust-clippy/issues/702
 #![allow(unknown_lints)]
 #![allow(clippy::all)]
 
@@ -24,7 +24,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions;
 
 /// Generated files are compatible only with the same version
 /// of protobuf runtime.
-const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_1;
+// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0;
 
 #[derive(PartialEq,Clone,Default)]
 pub struct Frame {
@@ -725,10 +725,7 @@ impl ::protobuf::Message for Frame {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -807,7 +804,7 @@ impl ::protobuf::Message for Frame {
                     |m: &Frame| { &m.metadata },
                     |m: &mut Frame| { &mut m.metadata },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<Frame>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<Frame>(
                     "Frame",
                     fields,
                     file_descriptor_proto()
@@ -817,10 +814,7 @@ impl ::protobuf::Message for Frame {
     }
 
     fn default_instance() -> &'static Frame {
-        static mut instance: ::protobuf::lazy::Lazy<Frame> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Frame,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Frame> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Frame::new)
         }
@@ -855,8 +849,8 @@ impl ::std::fmt::Debug for Frame {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Frame {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1377,10 +1371,7 @@ impl ::protobuf::Message for DeviceState {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -1439,7 +1430,7 @@ impl ::protobuf::Message for DeviceState {
                     |m: &DeviceState| { &m.metadata },
                     |m: &mut DeviceState| { &mut m.metadata },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<DeviceState>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<DeviceState>(
                     "DeviceState",
                     fields,
                     file_descriptor_proto()
@@ -1449,10 +1440,7 @@ impl ::protobuf::Message for DeviceState {
     }
 
     fn default_instance() -> &'static DeviceState {
-        static mut instance: ::protobuf::lazy::Lazy<DeviceState> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const DeviceState,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<DeviceState> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(DeviceState::new)
         }
@@ -1483,8 +1471,8 @@ impl ::std::fmt::Debug for DeviceState {
 }
 
 impl ::protobuf::reflect::ProtobufValue for DeviceState {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1669,10 +1657,7 @@ impl ::protobuf::Message for Capability {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -1691,7 +1676,7 @@ impl ::protobuf::Message for Capability {
                     |m: &Capability| { &m.stringValue },
                     |m: &mut Capability| { &mut m.stringValue },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<Capability>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<Capability>(
                     "Capability",
                     fields,
                     file_descriptor_proto()
@@ -1701,10 +1686,7 @@ impl ::protobuf::Message for Capability {
     }
 
     fn default_instance() -> &'static Capability {
-        static mut instance: ::protobuf::lazy::Lazy<Capability> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Capability,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Capability> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Capability::new)
         }
@@ -1727,8 +1709,8 @@ impl ::std::fmt::Debug for Capability {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Capability {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -1860,10 +1842,7 @@ impl ::protobuf::Message for Goodbye {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -1872,7 +1851,7 @@ impl ::protobuf::Message for Goodbye {
                     |m: &Goodbye| { &m.reason },
                     |m: &mut Goodbye| { &mut m.reason },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<Goodbye>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<Goodbye>(
                     "Goodbye",
                     fields,
                     file_descriptor_proto()
@@ -1882,10 +1861,7 @@ impl ::protobuf::Message for Goodbye {
     }
 
     fn default_instance() -> &'static Goodbye {
-        static mut instance: ::protobuf::lazy::Lazy<Goodbye> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Goodbye,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Goodbye> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Goodbye::new)
         }
@@ -1906,8 +1882,8 @@ impl ::std::fmt::Debug for Goodbye {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Goodbye {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -2551,10 +2527,7 @@ impl ::protobuf::Message for State {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -2633,7 +2606,7 @@ impl ::protobuf::Message for State {
                     |m: &State| { &m.ad },
                     |m: &mut State| { &mut m.ad },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<State>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<State>(
                     "State",
                     fields,
                     file_descriptor_proto()
@@ -2643,10 +2616,7 @@ impl ::protobuf::Message for State {
     }
 
     fn default_instance() -> &'static State {
-        static mut instance: ::protobuf::lazy::Lazy<State> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const State,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<State> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(State::new)
         }
@@ -2681,8 +2651,8 @@ impl ::std::fmt::Debug for State {
 }
 
 impl ::protobuf::reflect::ProtobufValue for State {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -2939,10 +2909,7 @@ impl ::protobuf::Message for TrackRef {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -2966,7 +2933,7 @@ impl ::protobuf::Message for TrackRef {
                     |m: &TrackRef| { &m.context },
                     |m: &mut TrackRef| { &mut m.context },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<TrackRef>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<TrackRef>(
                     "TrackRef",
                     fields,
                     file_descriptor_proto()
@@ -2976,10 +2943,7 @@ impl ::protobuf::Message for TrackRef {
     }
 
     fn default_instance() -> &'static TrackRef {
-        static mut instance: ::protobuf::lazy::Lazy<TrackRef> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const TrackRef,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<TrackRef> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(TrackRef::new)
         }
@@ -3003,8 +2967,8 @@ impl ::std::fmt::Debug for TrackRef {
 }
 
 impl ::protobuf::reflect::ProtobufValue for TrackRef {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -3478,10 +3442,7 @@ impl ::protobuf::Message for Ad {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -3530,7 +3491,7 @@ impl ::protobuf::Message for Ad {
                     |m: &Ad| { &m.gid },
                     |m: &mut Ad| { &mut m.gid },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<Ad>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<Ad>(
                     "Ad",
                     fields,
                     file_descriptor_proto()
@@ -3540,10 +3501,7 @@ impl ::protobuf::Message for Ad {
     }
 
     fn default_instance() -> &'static Ad {
-        static mut instance: ::protobuf::lazy::Lazy<Ad> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Ad,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Ad> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Ad::new)
         }
@@ -3572,8 +3530,8 @@ impl ::std::fmt::Debug for Ad {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Ad {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -3751,10 +3709,7 @@ impl ::protobuf::Message for Metadata {
     }
 
     fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
                 let mut fields = ::std::vec::Vec::new();
@@ -3768,7 +3723,7 @@ impl ::protobuf::Message for Metadata {
                     |m: &Metadata| { &m.metadata },
                     |m: &mut Metadata| { &mut m.metadata },
                 ));
-                ::protobuf::reflect::MessageDescriptor::new::<Metadata>(
+                ::protobuf::reflect::MessageDescriptor::new_pb_name::<Metadata>(
                     "Metadata",
                     fields,
                     file_descriptor_proto()
@@ -3778,10 +3733,7 @@ impl ::protobuf::Message for Metadata {
     }
 
     fn default_instance() -> &'static Metadata {
-        static mut instance: ::protobuf::lazy::Lazy<Metadata> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const Metadata,
-        };
+        static mut instance: ::protobuf::lazy::Lazy<Metadata> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             instance.get(Metadata::new)
         }
@@ -3803,8 +3755,8 @@ impl ::std::fmt::Debug for Metadata {
 }
 
 impl ::protobuf::reflect::ProtobufValue for Metadata {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Message(self)
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Message(self)
     }
 }
 
@@ -3893,13 +3845,10 @@ impl ::protobuf::ProtobufEnum for MessageType {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("MessageType", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<MessageType>("MessageType", file_descriptor_proto())
             })
         }
     }
@@ -3916,8 +3865,8 @@ impl ::std::default::Default for MessageType {
 }
 
 impl ::protobuf::reflect::ProtobufValue for MessageType {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -3985,13 +3934,10 @@ impl ::protobuf::ProtobufEnum for CapabilityType {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("CapabilityType", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<CapabilityType>("CapabilityType", file_descriptor_proto())
             })
         }
     }
@@ -4008,8 +3954,8 @@ impl ::std::default::Default for CapabilityType {
 }
 
 impl ::protobuf::reflect::ProtobufValue for CapabilityType {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -4047,13 +3993,10 @@ impl ::protobuf::ProtobufEnum for PlayStatus {
     }
 
     fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor {
-        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy {
-            lock: ::protobuf::lazy::ONCE_INIT,
-            ptr: 0 as *const ::protobuf::reflect::EnumDescriptor,
-        };
+        static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT;
         unsafe {
             descriptor.get(|| {
-                ::protobuf::reflect::EnumDescriptor::new("PlayStatus", file_descriptor_proto())
+                ::protobuf::reflect::EnumDescriptor::new_pb_name::<PlayStatus>("PlayStatus", file_descriptor_proto())
             })
         }
     }
@@ -4069,8 +4012,8 @@ impl ::std::default::Default for PlayStatus {
 }
 
 impl ::protobuf::reflect::ProtobufValue for PlayStatus {
-    fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef {
-        ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor())
+    fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef {
+        ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor())
     }
 }
 
@@ -4143,10 +4086,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\
     se\x10\x02\x12\x16\n\x12kPlayStatusLoading\x10\x03\x1a\0B\0b\x06proto2\
 ";
 
-static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy {
-    lock: ::protobuf::lazy::ONCE_INIT,
-    ptr: 0 as *const ::protobuf::descriptor::FileDescriptorProto,
-};
+static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT;
 
 fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto {
     ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap()