diff --git a/packages/example-angular-app/package-lock.json b/packages/example-angular-app/package-lock.json
index a0f6191d..d1eb7e7c 100644
--- a/packages/example-angular-app/package-lock.json
+++ b/packages/example-angular-app/package-lock.json
@@ -6,7 +6,7 @@
   "packages": {
     "": {
       "name": "@protobuf-ts/example-angular-app",
-      "version": "2.4.0",
+      "version": "2.5.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@angular/animations": "~10.0.6",
@@ -17,11 +17,11 @@
         "@angular/platform-browser": "~10.0.6",
         "@angular/platform-browser-dynamic": "~10.0.6",
         "@angular/router": "~10.0.6",
-        "@protobuf-ts/grpcweb-transport": "^2.4.0",
-        "@protobuf-ts/runtime": "^2.4.0",
-        "@protobuf-ts/runtime-angular": "^2.4.0",
-        "@protobuf-ts/runtime-rpc": "^2.4.0",
-        "@protobuf-ts/twirp-transport": "^2.4.0",
+        "@protobuf-ts/grpcweb-transport": "^2.5.0",
+        "@protobuf-ts/runtime": "^2.5.0",
+        "@protobuf-ts/runtime-angular": "^2.5.0",
+        "@protobuf-ts/runtime-rpc": "^2.5.0",
+        "@protobuf-ts/twirp-transport": "^2.5.0",
         "fast-text-encoding": "^1.0.3",
         "foundation-sites": "^6.6.3",
         "rxjs": "~6.5.4",
@@ -32,7 +32,7 @@
         "@angular-devkit/build-angular": "^0.1000.5",
         "@angular/cli": "^10.0.5",
         "@angular/compiler-cli": "^10.0.6",
-        "@protobuf-ts/plugin": "^2.4.0",
+        "@protobuf-ts/plugin": "^2.5.0",
         "@types/jasmine": "~3.5.0",
         "@types/jasminewd2": "~2.0.3",
         "@types/node": "^12.12.47",
@@ -1803,24 +1803,24 @@
       }
     },
     "node_modules/@protobuf-ts/grpcweb-transport": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@protobuf-ts/grpcweb-transport/-/grpcweb-transport-2.4.0.tgz",
-      "integrity": "sha512-XLJ9QON5MT07Y2OU4BizQpkH64YNpmZGa1xiZ+jvHjTQWYAquIzM2WU0aSgkBJD232SZRG/pZ4LAvQW89ThgJw==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@protobuf-ts/grpcweb-transport/-/grpcweb-transport-2.5.0.tgz",
+      "integrity": "sha512-8NRvhcwkKyLFrV9j6C3aYtlCLvRvlCgQ0957i63NUgvteZQCP0BGwbTVEQT2n43Wh3xO/Xhb+G1nFe04S3RYSA==",
       "dependencies": {
-        "@protobuf-ts/runtime": "^2.4.0",
-        "@protobuf-ts/runtime-rpc": "^2.4.0"
+        "@protobuf-ts/runtime": "^2.5.0",
+        "@protobuf-ts/runtime-rpc": "^2.5.0"
       }
     },
     "node_modules/@protobuf-ts/plugin": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@protobuf-ts/plugin/-/plugin-2.4.0.tgz",
-      "integrity": "sha512-Q3PYzeYrsrZ2Hy/DY+jYCKDWaVjk8lxekhVjVvveN0cdUnawSWCsGkiM2CqeQ2PAWptOmFHIrz3VFqSrOx5sFQ==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@protobuf-ts/plugin/-/plugin-2.5.0.tgz",
+      "integrity": "sha512-+lTtBPZad4gGE9eh9lMn+Fq79u4JB8YY/7uEmJSl8pk+4vMp6W02TxWYBMW4gBh5hzcZHGdEBx90OQxt1MDeJQ==",
       "dev": true,
       "dependencies": {
-        "@protobuf-ts/plugin-framework": "^2.4.0",
-        "@protobuf-ts/protoc": "^2.4.0",
-        "@protobuf-ts/runtime": "^2.4.0",
-        "@protobuf-ts/runtime-rpc": "^2.4.0",
+        "@protobuf-ts/plugin-framework": "^2.5.0",
+        "@protobuf-ts/protoc": "^2.5.0",
+        "@protobuf-ts/runtime": "^2.5.0",
+        "@protobuf-ts/runtime-rpc": "^2.5.0",
         "typescript": "^3.9"
       },
       "bin": {
@@ -1829,60 +1829,60 @@
       }
     },
     "node_modules/@protobuf-ts/plugin-framework": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@protobuf-ts/plugin-framework/-/plugin-framework-2.4.0.tgz",
-      "integrity": "sha512-QorGUrqqmKByM3bfxQaLh8T1mpqVVnKTZMSkTOPlqn+0T3fPQOKOZ9Phm4eU1crJbR5Fwq2w7yEpvSg6LhPphA==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@protobuf-ts/plugin-framework/-/plugin-framework-2.5.0.tgz",
+      "integrity": "sha512-bOf6oP4P0rjNp7bS8NSF/4O9a2WqHb3SSl4aNYzsNvtEddmC5laMfaUGr+6IePzgCNNl19w4wG4m981NSFZDqw==",
       "dev": true,
       "dependencies": {
-        "@protobuf-ts/runtime": "^2.4.0",
+        "@protobuf-ts/runtime": "^2.5.0",
         "typescript": "^3.9"
       }
     },
     "node_modules/@protobuf-ts/protoc": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@protobuf-ts/protoc/-/protoc-2.4.0.tgz",
-      "integrity": "sha512-W5xb+xhBgjP/nfntxO2eIyhMc7smeypflj6sH8Tp25H8MPGagE3kuOCe8F7PxOJzLZgHg7bMhubr7EymSaBNmw==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@protobuf-ts/protoc/-/protoc-2.5.0.tgz",
+      "integrity": "sha512-zrvKEOMKRFNb51Rrhghq4zWxoVCDEYmJJSUmbeTWoYl67u2DyWQMbFQy3HkwjF4kmhJUsG6HQdQHdcPBk4Yo6A==",
       "dev": true,
       "bin": {
         "protoc": "protoc.js"
       }
     },
     "node_modules/@protobuf-ts/runtime": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@protobuf-ts/runtime/-/runtime-2.4.0.tgz",
-      "integrity": "sha512-73/dE1ZCnNSmxN+M07Zu916TIx5I+WVpxQaMF3TrgenUiYqqQvNRpmfksmL9iiJBNMZqIts1u/flc3pzRFDy6Q=="
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@protobuf-ts/runtime/-/runtime-2.5.0.tgz",
+      "integrity": "sha512-ClfuZQ3iPVABJ0CXLGI044eox1PtmrIbbXZaHYczdFJjaxxn8U7vnwb1dPBM9JZ2I6H1VLZu8A9Z5nRv7zydsg=="
     },
     "node_modules/@protobuf-ts/runtime-angular": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@protobuf-ts/runtime-angular/-/runtime-angular-2.4.0.tgz",
-      "integrity": "sha512-NI4YepdkU1kOaTP3aDZa/yCrE4PEKCJD1TVItC+0+IVnhkGfN4DzISYGkQAx6oxIOgD0egcmFcPJaBuYGw0A5w==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@protobuf-ts/runtime-angular/-/runtime-angular-2.5.0.tgz",
+      "integrity": "sha512-Nl7aRrAjw5b0y4Y+Fy7q9ME/u+UPexVSjBieTSLU5Q4qX3S9DMc/Bh5k+Zsd+rQeXKqGLlhdTBlS9gjQQWFtCw==",
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
         "@angular/common": "8 - 13",
         "@angular/core": "8 - 13",
-        "@protobuf-ts/runtime": "2.4.0",
-        "@protobuf-ts/runtime-rpc": "2.4.0",
-        "@protobuf-ts/twirp-transport": "2.4.0",
+        "@protobuf-ts/runtime": "2.5.0",
+        "@protobuf-ts/runtime-rpc": "2.5.0",
+        "@protobuf-ts/twirp-transport": "2.5.0",
         "rxjs": "^6.5"
       }
     },
     "node_modules/@protobuf-ts/runtime-rpc": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@protobuf-ts/runtime-rpc/-/runtime-rpc-2.4.0.tgz",
-      "integrity": "sha512-S+q3ZT9rM4iC5tYM2inhvaqd16pW9TKaoHfLmPjZh0X67XuI4RC4STvru0os3aowZn3q0OcDtWIzD+rIJXobiA==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@protobuf-ts/runtime-rpc/-/runtime-rpc-2.5.0.tgz",
+      "integrity": "sha512-zO5W1/66Ok68muvmjG0+ucTWTfzhCUurnqyspqcWGF9DDgGKSmrtR8V1MRV051UoTonOxm7NZZvM6VTbBv9DcA==",
       "dependencies": {
-        "@protobuf-ts/runtime": "^2.4.0"
+        "@protobuf-ts/runtime": "^2.5.0"
       }
     },
     "node_modules/@protobuf-ts/twirp-transport": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@protobuf-ts/twirp-transport/-/twirp-transport-2.4.0.tgz",
-      "integrity": "sha512-YzCq4gnzx//YTzGPZ2Zka92c+VkdY2WK3enipJGYea74L1osNhMyYFCSOH/t1d2Tn1pecgqmy2PVJJ2dQCPzoQ==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@protobuf-ts/twirp-transport/-/twirp-transport-2.5.0.tgz",
+      "integrity": "sha512-sAoQiXfgBxqa+/U7w8TRPNsU7tSIFZvFAoEBCjZv6njnJHUDvBndaS6OyZ3HOOBOPy+YDIlnq52Vc1ZTf5XtuQ==",
       "dependencies": {
-        "@protobuf-ts/runtime": "^2.4.0",
-        "@protobuf-ts/runtime-rpc": "^2.4.0"
+        "@protobuf-ts/runtime": "^2.5.0",
+        "@protobuf-ts/runtime-rpc": "^2.5.0"
       }
     },
     "node_modules/@schematics/angular": {
@@ -2641,9 +2641,9 @@
       "dev": true
     },
     "node_modules/async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "dev": true,
       "dependencies": {
         "lodash": "^4.17.14"
@@ -17495,71 +17495,71 @@
       }
     },
     "@protobuf-ts/grpcweb-transport": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@protobuf-ts/grpcweb-transport/-/grpcweb-transport-2.4.0.tgz",
-      "integrity": "sha512-XLJ9QON5MT07Y2OU4BizQpkH64YNpmZGa1xiZ+jvHjTQWYAquIzM2WU0aSgkBJD232SZRG/pZ4LAvQW89ThgJw==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@protobuf-ts/grpcweb-transport/-/grpcweb-transport-2.5.0.tgz",
+      "integrity": "sha512-8NRvhcwkKyLFrV9j6C3aYtlCLvRvlCgQ0957i63NUgvteZQCP0BGwbTVEQT2n43Wh3xO/Xhb+G1nFe04S3RYSA==",
       "requires": {
-        "@protobuf-ts/runtime": "^2.4.0",
-        "@protobuf-ts/runtime-rpc": "^2.4.0"
+        "@protobuf-ts/runtime": "^2.5.0",
+        "@protobuf-ts/runtime-rpc": "^2.5.0"
       }
     },
     "@protobuf-ts/plugin": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@protobuf-ts/plugin/-/plugin-2.4.0.tgz",
-      "integrity": "sha512-Q3PYzeYrsrZ2Hy/DY+jYCKDWaVjk8lxekhVjVvveN0cdUnawSWCsGkiM2CqeQ2PAWptOmFHIrz3VFqSrOx5sFQ==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@protobuf-ts/plugin/-/plugin-2.5.0.tgz",
+      "integrity": "sha512-+lTtBPZad4gGE9eh9lMn+Fq79u4JB8YY/7uEmJSl8pk+4vMp6W02TxWYBMW4gBh5hzcZHGdEBx90OQxt1MDeJQ==",
       "dev": true,
       "requires": {
-        "@protobuf-ts/plugin-framework": "^2.4.0",
-        "@protobuf-ts/protoc": "^2.4.0",
-        "@protobuf-ts/runtime": "^2.4.0",
-        "@protobuf-ts/runtime-rpc": "^2.4.0",
+        "@protobuf-ts/plugin-framework": "^2.5.0",
+        "@protobuf-ts/protoc": "^2.5.0",
+        "@protobuf-ts/runtime": "^2.5.0",
+        "@protobuf-ts/runtime-rpc": "^2.5.0",
         "typescript": "^3.9"
       }
     },
     "@protobuf-ts/plugin-framework": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@protobuf-ts/plugin-framework/-/plugin-framework-2.4.0.tgz",
-      "integrity": "sha512-QorGUrqqmKByM3bfxQaLh8T1mpqVVnKTZMSkTOPlqn+0T3fPQOKOZ9Phm4eU1crJbR5Fwq2w7yEpvSg6LhPphA==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@protobuf-ts/plugin-framework/-/plugin-framework-2.5.0.tgz",
+      "integrity": "sha512-bOf6oP4P0rjNp7bS8NSF/4O9a2WqHb3SSl4aNYzsNvtEddmC5laMfaUGr+6IePzgCNNl19w4wG4m981NSFZDqw==",
       "dev": true,
       "requires": {
-        "@protobuf-ts/runtime": "^2.4.0",
+        "@protobuf-ts/runtime": "^2.5.0",
         "typescript": "^3.9"
       }
     },
     "@protobuf-ts/protoc": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@protobuf-ts/protoc/-/protoc-2.4.0.tgz",
-      "integrity": "sha512-W5xb+xhBgjP/nfntxO2eIyhMc7smeypflj6sH8Tp25H8MPGagE3kuOCe8F7PxOJzLZgHg7bMhubr7EymSaBNmw==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@protobuf-ts/protoc/-/protoc-2.5.0.tgz",
+      "integrity": "sha512-zrvKEOMKRFNb51Rrhghq4zWxoVCDEYmJJSUmbeTWoYl67u2DyWQMbFQy3HkwjF4kmhJUsG6HQdQHdcPBk4Yo6A==",
       "dev": true
     },
     "@protobuf-ts/runtime": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@protobuf-ts/runtime/-/runtime-2.4.0.tgz",
-      "integrity": "sha512-73/dE1ZCnNSmxN+M07Zu916TIx5I+WVpxQaMF3TrgenUiYqqQvNRpmfksmL9iiJBNMZqIts1u/flc3pzRFDy6Q=="
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@protobuf-ts/runtime/-/runtime-2.5.0.tgz",
+      "integrity": "sha512-ClfuZQ3iPVABJ0CXLGI044eox1PtmrIbbXZaHYczdFJjaxxn8U7vnwb1dPBM9JZ2I6H1VLZu8A9Z5nRv7zydsg=="
     },
     "@protobuf-ts/runtime-angular": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@protobuf-ts/runtime-angular/-/runtime-angular-2.4.0.tgz",
-      "integrity": "sha512-NI4YepdkU1kOaTP3aDZa/yCrE4PEKCJD1TVItC+0+IVnhkGfN4DzISYGkQAx6oxIOgD0egcmFcPJaBuYGw0A5w==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@protobuf-ts/runtime-angular/-/runtime-angular-2.5.0.tgz",
+      "integrity": "sha512-Nl7aRrAjw5b0y4Y+Fy7q9ME/u+UPexVSjBieTSLU5Q4qX3S9DMc/Bh5k+Zsd+rQeXKqGLlhdTBlS9gjQQWFtCw==",
       "requires": {
         "tslib": "^2.0.0"
       }
     },
     "@protobuf-ts/runtime-rpc": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@protobuf-ts/runtime-rpc/-/runtime-rpc-2.4.0.tgz",
-      "integrity": "sha512-S+q3ZT9rM4iC5tYM2inhvaqd16pW9TKaoHfLmPjZh0X67XuI4RC4STvru0os3aowZn3q0OcDtWIzD+rIJXobiA==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@protobuf-ts/runtime-rpc/-/runtime-rpc-2.5.0.tgz",
+      "integrity": "sha512-zO5W1/66Ok68muvmjG0+ucTWTfzhCUurnqyspqcWGF9DDgGKSmrtR8V1MRV051UoTonOxm7NZZvM6VTbBv9DcA==",
       "requires": {
-        "@protobuf-ts/runtime": "^2.4.0"
+        "@protobuf-ts/runtime": "^2.5.0"
       }
     },
     "@protobuf-ts/twirp-transport": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@protobuf-ts/twirp-transport/-/twirp-transport-2.4.0.tgz",
-      "integrity": "sha512-YzCq4gnzx//YTzGPZ2Zka92c+VkdY2WK3enipJGYea74L1osNhMyYFCSOH/t1d2Tn1pecgqmy2PVJJ2dQCPzoQ==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@protobuf-ts/twirp-transport/-/twirp-transport-2.5.0.tgz",
+      "integrity": "sha512-sAoQiXfgBxqa+/U7w8TRPNsU7tSIFZvFAoEBCjZv6njnJHUDvBndaS6OyZ3HOOBOPy+YDIlnq52Vc1ZTf5XtuQ==",
       "requires": {
-        "@protobuf-ts/runtime": "^2.4.0",
-        "@protobuf-ts/runtime-rpc": "^2.4.0"
+        "@protobuf-ts/runtime": "^2.5.0",
+        "@protobuf-ts/runtime-rpc": "^2.5.0"
       }
     },
     "@schematics/angular": {
@@ -18224,9 +18224,9 @@
       "dev": true
     },
     "async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "dev": true,
       "requires": {
         "lodash": "^4.17.14"