diff --git a/proto3/models/ani_alarm_notification.proto b/proto3/models/ani_alarm_notification.proto
index d2ddceaefdecfee76ad9c23a8de759f14870a6cb..d49bb9a2d546e1f23e006e9f8267137c7436ab4e 100644
--- a/proto3/models/ani_alarm_notification.proto
+++ b/proto3/models/ani_alarm_notification.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/ani_alarm_notification_alarm.proto";
 import public "models/ani_alarm_notification_ani_id.proto";
 import public "models/cp_info.proto";
diff --git a/proto3/models/ani_alarm_notification_alarm.proto b/proto3/models/ani_alarm_notification_alarm.proto
index 7d21168dbba4956f967cffa92453fe707c1dd56d..80c67c75db1871e35cd7b51478c03d588393429b 100644
--- a/proto3/models/ani_alarm_notification_alarm.proto
+++ b/proto3/models/ani_alarm_notification_alarm.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 
 message AniAlarmNotificationAlarm {
 enum TypeEnum {
diff --git a/proto3/models/ani_alarm_notification_ani_id.proto b/proto3/models/ani_alarm_notification_ani_id.proto
index 43e12f83b58a3bfd59981fe8e87d56ae48d76f36..e04516e129ccdee1f877a6a01aff1362d27a29d5 100644
--- a/proto3/models/ani_alarm_notification_ani_id.proto
+++ b/proto3/models/ani_alarm_notification_ani_id.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 
 message AniAlarmNotificationAniId {
 
diff --git a/proto3/models/ani_alarm_subscription.proto b/proto3/models/ani_alarm_subscription.proto
index 0557f5aeac793523ab90c3eb20ef15025b0a08fe..c7a11a862c9e7b02663f4f644cdb8e14c1efa62c 100644
--- a/proto3/models/ani_alarm_subscription.proto
+++ b/proto3/models/ani_alarm_subscription.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/ani_alarm_subscription_filter_criteria_ani_alarm.proto";
 import public "models/ani_alarm_subscription_links.proto";
 import public "models/time_stamp.proto";
diff --git a/proto3/models/ani_alarm_subscription_filter_criteria_ani_alarm.proto b/proto3/models/ani_alarm_subscription_filter_criteria_ani_alarm.proto
index 776e8f8b8780e85bece794846d6f69ff6c31470e..ac864e5761349c533f45ff8a58d1a7f4aef3564a 100644
--- a/proto3/models/ani_alarm_subscription_filter_criteria_ani_alarm.proto
+++ b/proto3/models/ani_alarm_subscription_filter_criteria_ani_alarm.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/ani_alarm_subscription_filter_criteria_ani_alarm_alarms.proto";
 import public "models/ani_alarm_subscription_filter_criteria_ani_alarm_ani_id.proto";
 import public "models/cp_info.proto";
diff --git a/proto3/models/ani_alarm_subscription_filter_criteria_ani_alarm_alarms.proto b/proto3/models/ani_alarm_subscription_filter_criteria_ani_alarm_alarms.proto
index ec654b3b901bce117fb9fd8c8ba8464e07631509..566aa34d806e888dc57e693d73bbc05aaf14d48b 100644
--- a/proto3/models/ani_alarm_subscription_filter_criteria_ani_alarm_alarms.proto
+++ b/proto3/models/ani_alarm_subscription_filter_criteria_ani_alarm_alarms.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 
 message AniAlarmSubscriptionFilterCriteriaAniAlarmAlarms {
 enum TypeEnum {
diff --git a/proto3/models/ani_alarm_subscription_filter_criteria_ani_alarm_ani_id.proto b/proto3/models/ani_alarm_subscription_filter_criteria_ani_alarm_ani_id.proto
index 706b79954e117ed2c8f86e30fee61b06e7cdd510..564b814a77e9629b73baf071d03c11138a458a88 100644
--- a/proto3/models/ani_alarm_subscription_filter_criteria_ani_alarm_ani_id.proto
+++ b/proto3/models/ani_alarm_subscription_filter_criteria_ani_alarm_ani_id.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 
 message AniAlarmSubscriptionFilterCriteriaAniAlarmAniId {
 
diff --git a/proto3/models/ani_alarm_subscription_links.proto b/proto3/models/ani_alarm_subscription_links.proto
index e843e580612aaf8253d017c10bc72a56a10a7b9a..c8848cb4176747c1e15c84db4beacad67d7e585e 100644
--- a/proto3/models/ani_alarm_subscription_links.proto
+++ b/proto3/models/ani_alarm_subscription_links.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/link_type.proto";
 
 message AniAlarmSubscriptionLinks {
diff --git a/proto3/models/cable_line_info.proto b/proto3/models/cable_line_info.proto
index 8eb5c005c077637c6ac07ff9a5a721a9ef5cdade..9a9026c5104391ea0ef7b957ea2882a3e7f61097 100644
--- a/proto3/models/cable_line_info.proto
+++ b/proto3/models/cable_line_info.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/cable_line_info_cm_info.proto";
 import public "models/cp_info.proto";
 import public "models/time_stamp.proto";
diff --git a/proto3/models/cable_line_info_cm_info.proto b/proto3/models/cable_line_info_cm_info.proto
index 20d4323e4935f3420610fc27f4651414e2d7917e..632c5341bcbcfb780842427b08ac390ae1b4187a 100644
--- a/proto3/models/cable_line_info_cm_info.proto
+++ b/proto3/models/cable_line_info_cm_info.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/cable_line_info_cm_info_cm_dpv_stats.proto";
 import public "models/cable_line_info_cm_info_cm_status.proto";
 import public "models/cable_line_info_cm_info_service_flow_stats.proto";
diff --git a/proto3/models/cable_line_info_cm_info_cm_dpv_stats.proto b/proto3/models/cable_line_info_cm_info_cm_dpv_stats.proto
index 211290cc6c54ebffaba5898a55f0adf1bab37593..845cf1b2023d515af8fe861ea2bb4a47e1a4fab9 100644
--- a/proto3/models/cable_line_info_cm_info_cm_dpv_stats.proto
+++ b/proto3/models/cable_line_info_cm_info_cm_dpv_stats.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/time_stamp.proto";
 
 message CableLineInfoCmInfoCmDpvStats {
diff --git a/proto3/models/cable_line_info_cm_info_cm_status.proto b/proto3/models/cable_line_info_cm_info_cm_status.proto
index 207a0bf18c71844df4223941915050021fba43a0..c9a0ef1105ae654b168f7b6ccae48b2ce85d8f9f 100644
--- a/proto3/models/cable_line_info_cm_info_cm_status.proto
+++ b/proto3/models/cable_line_info_cm_info_cm_status.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/cable_line_info_cm_info_cm_status_cm_reg_state.proto";
 
 message CableLineInfoCmInfoCmStatus {
diff --git a/proto3/models/cable_line_info_cm_info_cm_status_cm_reg_state.proto b/proto3/models/cable_line_info_cm_info_cm_status_cm_reg_state.proto
index 9441a19fe0c0ef17eacf6e2ad74dbd2ccd7248ba..30fc45eec4c5d1a3a65b97d0e3060c22bc5854ea 100644
--- a/proto3/models/cable_line_info_cm_info_cm_status_cm_reg_state.proto
+++ b/proto3/models/cable_line_info_cm_info_cm_status_cm_reg_state.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 
 message CableLineInfoCmInfoCmStatusCmRegState {
 enum TypeEnum {
diff --git a/proto3/models/cable_line_info_cm_info_service_flow_stats.proto b/proto3/models/cable_line_info_cm_info_service_flow_stats.proto
index 333cb207cdcacc00785729f196869fbba9d3b81a..d6f606e3487722cd096299d70e70827d4f585754 100644
--- a/proto3/models/cable_line_info_cm_info_service_flow_stats.proto
+++ b/proto3/models/cable_line_info_cm_info_service_flow_stats.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/cable_line_info_cm_info_service_flow_stats_service_flow_info.proto";
 
 message CableLineInfoCmInfoServiceFlowStats {
diff --git a/proto3/models/cable_line_info_cm_info_service_flow_stats_service_flow_info.proto b/proto3/models/cable_line_info_cm_info_service_flow_stats_service_flow_info.proto
index ee1f1b4c561eb4160dac2dbd663153146652bda6..2a568c17f936b5885441b60bcbc849ea6e8c494d 100644
--- a/proto3/models/cable_line_info_cm_info_service_flow_stats_service_flow_info.proto
+++ b/proto3/models/cable_line_info_cm_info_service_flow_stats_service_flow_info.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/time_stamp.proto";
 
 message CableLineInfoCmInfoServiceFlowStatsServiceFlowInfo {
diff --git a/proto3/models/cm_conn_notification.proto b/proto3/models/cm_conn_notification.proto
index 023f00ba2efecbcd6f696b88eb5edf71af343f74..10b3b472f192d1511c02bafb6551405854920c59 100644
--- a/proto3/models/cm_conn_notification.proto
+++ b/proto3/models/cm_conn_notification.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/cm_conn_notification_cm_if.proto";
 import public "models/cp_info.proto";
 import public "models/time_stamp.proto";
diff --git a/proto3/models/cm_conn_notification_cm_if.proto b/proto3/models/cm_conn_notification_cm_if.proto
index 00f865c7c908a4cb9e23d0b698da6bbb8c1055cd..9b7efeb72a579eb33e7e5063c3622bfa25a95411 100644
--- a/proto3/models/cm_conn_notification_cm_if.proto
+++ b/proto3/models/cm_conn_notification_cm_if.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/cm_conn_notification_cm_if_cm_reg_state.proto";
 
 message CmConnNotificationCmIf {
diff --git a/proto3/models/cm_conn_notification_cm_if_cm_reg_state.proto b/proto3/models/cm_conn_notification_cm_if_cm_reg_state.proto
index a2b1eb9303654e04912e5e007d2f895224a06854..83dc894d85681585d75e7776a05854f07acb14b4 100644
--- a/proto3/models/cm_conn_notification_cm_if_cm_reg_state.proto
+++ b/proto3/models/cm_conn_notification_cm_if_cm_reg_state.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 
 message CmConnNotificationCmIfCmRegState {
 enum TypeEnum {
diff --git a/proto3/models/cm_conn_subscription.proto b/proto3/models/cm_conn_subscription.proto
index 7e6de19368613f49d06b20567e12e92e0a997686..41babadf4e61c9640a3cfc45fb3ce65ef200a279 100644
--- a/proto3/models/cm_conn_subscription.proto
+++ b/proto3/models/cm_conn_subscription.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/cm_conn_subscription_filter_criteria_cm_conn.proto";
 import public "models/cm_conn_subscription_links.proto";
 import public "models/time_stamp.proto";
diff --git a/proto3/models/cm_conn_subscription_filter_criteria_cm_conn.proto b/proto3/models/cm_conn_subscription_filter_criteria_cm_conn.proto
index 5ffda1083d4aac2962fc5610b900c87054ed4bbd..f07b8db40c03d776d92643585c5f05063ec55888 100644
--- a/proto3/models/cm_conn_subscription_filter_criteria_cm_conn.proto
+++ b/proto3/models/cm_conn_subscription_filter_criteria_cm_conn.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/cm_conn_subscription_filter_criteria_cm_conn_cm_if.proto";
 import public "models/cp_info.proto";
 
diff --git a/proto3/models/cm_conn_subscription_filter_criteria_cm_conn_cm_if.proto b/proto3/models/cm_conn_subscription_filter_criteria_cm_conn_cm_if.proto
index f62615c106bd683400ce7246a434a6ce7480de3c..abaeca8b3b7137d9160579c81925c35e9d81d285 100644
--- a/proto3/models/cm_conn_subscription_filter_criteria_cm_conn_cm_if.proto
+++ b/proto3/models/cm_conn_subscription_filter_criteria_cm_conn_cm_if.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/cm_conn_subscription_filter_criteria_cm_conn_cm_if_cm_reg_state.proto";
 
 message CmConnSubscriptionFilterCriteriaCmConnCmIf {
diff --git a/proto3/models/cm_conn_subscription_filter_criteria_cm_conn_cm_if_cm_reg_state.proto b/proto3/models/cm_conn_subscription_filter_criteria_cm_conn_cm_if_cm_reg_state.proto
index 69e39e8e354aeaa7128d0d7d829890ca32a73093..9673390e3216175824178766f3b77a0e1a0325dd 100644
--- a/proto3/models/cm_conn_subscription_filter_criteria_cm_conn_cm_if_cm_reg_state.proto
+++ b/proto3/models/cm_conn_subscription_filter_criteria_cm_conn_cm_if_cm_reg_state.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 
 message CmConnSubscriptionFilterCriteriaCmConnCmIfCmRegState {
 enum TypeEnum {
diff --git a/proto3/models/cm_conn_subscription_links.proto b/proto3/models/cm_conn_subscription_links.proto
index 66e3e30e062ea8f3d9b497b981a2a483ac4a7493..e268a62f8b4a71f725161e0650cbfa3375ade772 100644
--- a/proto3/models/cm_conn_subscription_links.proto
+++ b/proto3/models/cm_conn_subscription_links.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/link_type.proto";
 
 message CmConnSubscriptionLinks {
diff --git a/proto3/models/cp_info.proto b/proto3/models/cp_info.proto
index a24054533547a61502081ffb1a7a5eb1a0f9efd7..61fea1c84125c146a7a5513bb78abe21d28442c4 100644
--- a/proto3/models/cp_info.proto
+++ b/proto3/models/cp_info.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 
 message CpInfo {
 
diff --git a/proto3/models/dev_info_notification.proto b/proto3/models/dev_info_notification.proto
index 0731442e30e9e2597a0d05261f713552dc2c5faa..ffcc54bda252da4b4a75a545716aa40372847c00 100644
--- a/proto3/models/dev_info_notification.proto
+++ b/proto3/models/dev_info_notification.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/device_err_status.proto";
 import public "models/time_stamp.proto";
 
diff --git a/proto3/models/dev_info_subscription.proto b/proto3/models/dev_info_subscription.proto
index 950da03c5fac26bf7ae2528dfeb31232c3600493..b2b16f8737d8b8cef73ef174d2f5900fce75490a 100644
--- a/proto3/models/dev_info_subscription.proto
+++ b/proto3/models/dev_info_subscription.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/dev_info_subscription_filter_criteria_dev_info.proto";
 import public "models/dev_info_subscription_links.proto";
 import public "models/time_stamp.proto";
diff --git a/proto3/models/dev_info_subscription_filter_criteria_dev_info.proto b/proto3/models/dev_info_subscription_filter_criteria_dev_info.proto
index babdeaa9b944b918a4a0c1fd8614b8fdc0af9020..966b847a63c70da4c8e332b0c5dd71dec9b0392f 100644
--- a/proto3/models/dev_info_subscription_filter_criteria_dev_info.proto
+++ b/proto3/models/dev_info_subscription_filter_criteria_dev_info.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/device_err_status.proto";
 
 message DevInfoSubscriptionFilterCriteriaDevInfo {
diff --git a/proto3/models/dev_info_subscription_links.proto b/proto3/models/dev_info_subscription_links.proto
index 77b2e57a8e9881ed971f5b71e0628b8b91aa6da8..3f4ddafe83b37b0dcfa96fa73004c24b52e73946 100644
--- a/proto3/models/dev_info_subscription_links.proto
+++ b/proto3/models/dev_info_subscription_links.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/link_type.proto";
 
 message DevInfoSubscriptionLinks {
diff --git a/proto3/models/device_err_status.proto b/proto3/models/device_err_status.proto
index 45f9f34d954b31126dacde48b074841344ceb4a1..f953045ec38d923b645ea0e82760557fb10b9954 100644
--- a/proto3/models/device_err_status.proto
+++ b/proto3/models/device_err_status.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 
 message DeviceErrStatus {
 enum TypeEnum {
diff --git a/proto3/models/device_info_device_status.proto b/proto3/models/device_info_device_status.proto
index 53f1836cc8b78e6de79da20a44a24aac2dd9b881..cd99b760913ffade17aaab98238c62c12da4bff6 100644
--- a/proto3/models/device_info_device_status.proto
+++ b/proto3/models/device_info_device_status.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 
 message DeviceInfoDeviceStatus {
 enum TypeEnum {
diff --git a/proto3/models/download_diagnostics.proto b/proto3/models/download_diagnostics.proto
index d5a601573e663d0a09f085cd067699792cbc5046..e6d3e88df90f7450a284346615b1aaec9e547a7f 100644
--- a/proto3/models/download_diagnostics.proto
+++ b/proto3/models/download_diagnostics.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/download_diagnostics_diagnostics_state.proto";
 import public "models/time_stamp.proto";
 
diff --git a/proto3/models/download_diagnostics_diagnostics_state.proto b/proto3/models/download_diagnostics_diagnostics_state.proto
index 117177fac12340f93110bc42491cb75af298ffde..89eb9b6671178a2eaa249b4e8e131fa17ed030c9 100644
--- a/proto3/models/download_diagnostics_diagnostics_state.proto
+++ b/proto3/models/download_diagnostics_diagnostics_state.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 
 message DownloadDiagnosticsDiagnosticsState {
 enum TypeEnum {
diff --git a/proto3/models/expiry_notification.proto b/proto3/models/expiry_notification.proto
index dac7c61e0e493362482f0057ffca04a2b03c6e4c..bb43b78b79d5ef4a93a6480c215b06c53a8640ca 100644
--- a/proto3/models/expiry_notification.proto
+++ b/proto3/models/expiry_notification.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/expiry_notification_links.proto";
 import public "models/time_stamp.proto";
 
diff --git a/proto3/models/expiry_notification_links.proto b/proto3/models/expiry_notification_links.proto
index 3ca39036026c3d2c6418a06549e94e9490304634..e677c720eb81fec8ccae4ed21cbf1e81e685317a 100644
--- a/proto3/models/expiry_notification_links.proto
+++ b/proto3/models/expiry_notification_links.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 
 message ExpiryNotificationLinks {
 
diff --git a/proto3/models/fa_info.proto b/proto3/models/fa_info.proto
index c95697d6d856103de637e8856cf9a9c07d463305..c73455abf546295a41446d855ab32caa24617643 100644
--- a/proto3/models/fa_info.proto
+++ b/proto3/models/fa_info.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/cp_info.proto";
 import public "models/fa_info_connectivity_info.proto";
 import public "models/time_stamp.proto";
diff --git a/proto3/models/fa_info_connectivity_info.proto b/proto3/models/fa_info_connectivity_info.proto
index 371c66de344afbe029f3ceda5106e1204c0ca69e..c985670d8424cfc948c3a067b1b19d28add981d8 100644
--- a/proto3/models/fa_info_connectivity_info.proto
+++ b/proto3/models/fa_info_connectivity_info.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/fa_info_connectivity_info_interface_type.proto";
 import public "models/fa_info_connectivity_info_last_mile_tech.proto";
 
diff --git a/proto3/models/fa_info_connectivity_info_interface_type.proto b/proto3/models/fa_info_connectivity_info_interface_type.proto
index 6655c79e5ed9c63b4f75fdc493802ae68d0b6718..37c82ce170a366a4b239ca312b33ff80c0ccec43 100644
--- a/proto3/models/fa_info_connectivity_info_interface_type.proto
+++ b/proto3/models/fa_info_connectivity_info_interface_type.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 
 message FaInfoConnectivityInfoInterfaceType {
 
diff --git a/proto3/models/fa_info_connectivity_info_last_mile_tech.proto b/proto3/models/fa_info_connectivity_info_last_mile_tech.proto
index 812d5648c8aa6e0d85a30d7dce4acf439520d3e4..0daca7c90c876c1f09518c066e996cde792e4e3e 100644
--- a/proto3/models/fa_info_connectivity_info_last_mile_tech.proto
+++ b/proto3/models/fa_info_connectivity_info_last_mile_tech.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 
 message FaInfoConnectivityInfoLastMileTech {
 enum TypeEnum {
diff --git a/proto3/models/ip_ping_diagnostics.proto b/proto3/models/ip_ping_diagnostics.proto
index df5d3e511f72f828de15adf2c1cb1ef2f5a918ce..600a76d0650f7e23d5d84ab199c2455416ded954 100644
--- a/proto3/models/ip_ping_diagnostics.proto
+++ b/proto3/models/ip_ping_diagnostics.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/ip_ping_diagnostics_diagnostics_state.proto";
 option java_outer_classname = "IpPingDiagnosticsProto";
 
diff --git a/proto3/models/ip_ping_diagnostics_diagnostics_state.proto b/proto3/models/ip_ping_diagnostics_diagnostics_state.proto
index 890c312ebc3279614cbe0114c255cccf3b2548b6..f0b4f88ed355f3572caa065c640cd9758d8ac7a1 100644
--- a/proto3/models/ip_ping_diagnostics_diagnostics_state.proto
+++ b/proto3/models/ip_ping_diagnostics_diagnostics_state.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 option java_outer_classname = "IpPingDiagnosticsDiagnosticsStateProto";
+option java_multiple_files=true;
 
 message IPPingDiagnosticsDiagnosticsState {
 
diff --git a/proto3/models/link_type.proto b/proto3/models/link_type.proto
index 17e71e2c2f0edbc364e7d5963164b56a12d92e67..19e20db4ea643461846b34a37b4148926e5a8dfd 100644
--- a/proto3/models/link_type.proto
+++ b/proto3/models/link_type.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 
 message LinkType {
 
diff --git a/proto3/models/onu_alarm_notification.proto b/proto3/models/onu_alarm_notification.proto
index b6894b020f9a69050c8a5695a5bbb53b67188337..dc51e4d7236040b9c57d0d75171d6bc5cff61cb5 100644
--- a/proto3/models/onu_alarm_notification.proto
+++ b/proto3/models/onu_alarm_notification.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/cp_info.proto";
 import public "models/onu_alarm_notification_alarm.proto";
 import public "models/time_stamp.proto";
diff --git a/proto3/models/onu_alarm_notification_alarm.proto b/proto3/models/onu_alarm_notification_alarm.proto
index a378dcb4b188138c477ddb4eadfc64a2a04a1d1a..f05a499359281e31c579924dc49168f06688e2dc 100644
--- a/proto3/models/onu_alarm_notification_alarm.proto
+++ b/proto3/models/onu_alarm_notification_alarm.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 
 message OnuAlarmNotificationAlarm {
 enum TypeEnum {
diff --git a/proto3/models/onu_alarm_subscription.proto b/proto3/models/onu_alarm_subscription.proto
index f19c2d1a2e01820be497eaf5742ab62c04cc6d1b..626b947856afb9fc8da09c80f29e6e036ee692ca 100644
--- a/proto3/models/onu_alarm_subscription.proto
+++ b/proto3/models/onu_alarm_subscription.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/onu_alarm_subscription_filter_criteria_onu_alarm.proto";
 import public "models/onu_alarm_subscription_links.proto";
 import public "models/time_stamp.proto";
diff --git a/proto3/models/onu_alarm_subscription_alarms.proto b/proto3/models/onu_alarm_subscription_alarms.proto
index 2d2f1026be9eb029dc3f126fd32b9160ed7f77c5..a0f95feaca9382f448461c692cd2ebdd967105fb 100644
--- a/proto3/models/onu_alarm_subscription_alarms.proto
+++ b/proto3/models/onu_alarm_subscription_alarms.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 
 message OnuAlarmSubscriptionAlarms {
 enum TypeEnum {
diff --git a/proto3/models/onu_alarm_subscription_filter_criteria_onu_alarm.proto b/proto3/models/onu_alarm_subscription_filter_criteria_onu_alarm.proto
index 16f46b2c4923f69f161f68b8a623c4e7ba3404ae..f4bfca6efc67ea8a88cecbb168f65d730bbd7631 100644
--- a/proto3/models/onu_alarm_subscription_filter_criteria_onu_alarm.proto
+++ b/proto3/models/onu_alarm_subscription_filter_criteria_onu_alarm.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/cp_info.proto";
 import public "models/onu_alarm_subscription_alarms.proto";
 
diff --git a/proto3/models/onu_alarm_subscription_links.proto b/proto3/models/onu_alarm_subscription_links.proto
index d7440f66187968a9480e18118b90e750e5fd1a77..5d0d53ad1e037051cfa0a7202339f09433a03d10 100644
--- a/proto3/models/onu_alarm_subscription_links.proto
+++ b/proto3/models/onu_alarm_subscription_links.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/link_type.proto";
 
 message OnuAlarmSubscriptionLinks {
diff --git a/proto3/models/pon_info.proto b/proto3/models/pon_info.proto
index d032b4cd77b1c9b32cc8b71d96cd7c627b9df295..edc35368c21911f5629073df39c71fc97e6222cb 100644
--- a/proto3/models/pon_info.proto
+++ b/proto3/models/pon_info.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/cp_info.proto";
 import public "models/pon_info_optical_network_info.proto";
 import public "models/time_stamp.proto";
diff --git a/proto3/models/pon_info_optical_network_info.proto b/proto3/models/pon_info_optical_network_info.proto
index 2f638ae6d6a8a990ec7565bfd556248a118116e8..87d449f4a52fbabe43ae058a8ea0a80f2f76ec9b 100644
--- a/proto3/models/pon_info_optical_network_info.proto
+++ b/proto3/models/pon_info_optical_network_info.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/pon_info_optical_network_info_ds_rate.proto";
 import public "models/pon_info_optical_network_info_operational_state.proto";
 import public "models/pon_info_optical_network_info_pon_tech.proto";
diff --git a/proto3/models/pon_info_optical_network_info_ds_rate.proto b/proto3/models/pon_info_optical_network_info_ds_rate.proto
index 8402c16f343d1b23157a953f5799f9b4b9a9555c..d1512449cc88736aa605859b73848cc53727f197 100644
--- a/proto3/models/pon_info_optical_network_info_ds_rate.proto
+++ b/proto3/models/pon_info_optical_network_info_ds_rate.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 
 message PonInfoOpticalNetworkInfoDsRate {
 enum TypeEnum {
diff --git a/proto3/models/pon_info_optical_network_info_operational_state.proto b/proto3/models/pon_info_optical_network_info_operational_state.proto
index a3f49f8b493af610ea7be783988a6ca08acd9bd0..48b0193349cb5d8c9e1ad900ead3f2b3f4ae2465 100644
--- a/proto3/models/pon_info_optical_network_info_operational_state.proto
+++ b/proto3/models/pon_info_optical_network_info_operational_state.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 
 message PonInfoOpticalNetworkInfoOperationalState {
 enum TypeEnum {
diff --git a/proto3/models/pon_info_optical_network_info_pon_tech.proto b/proto3/models/pon_info_optical_network_info_pon_tech.proto
index c6ba507e9a7b7667f17b6f025eb7a5fc3bd4e988..6e0aab29e92d78bfbd8d738ac1aaf3a715c7df95 100644
--- a/proto3/models/pon_info_optical_network_info_pon_tech.proto
+++ b/proto3/models/pon_info_optical_network_info_pon_tech.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 
 message PonInfoOpticalNetworkInfoPonTech {
 enum TypeEnum {
diff --git a/proto3/models/pon_info_optical_network_info_us_rate.proto b/proto3/models/pon_info_optical_network_info_us_rate.proto
index f139b2acc8370b6894c5a94c61331a5b80070cea..23da349b9aefa6e57df286981f75421e4723bdaf 100644
--- a/proto3/models/pon_info_optical_network_info_us_rate.proto
+++ b/proto3/models/pon_info_optical_network_info_us_rate.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 
 message PonInfoOpticalNetworkInfoUsRate {
 enum TypeEnum {
diff --git a/proto3/models/problem_details.proto b/proto3/models/problem_details.proto
index 96f4fc439d0734d8ae68d38dcfdfbc1e6917abb5..92e72a040c40a3e610d30de3f425800cf957ddef 100644
--- a/proto3/models/problem_details.proto
+++ b/proto3/models/problem_details.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 
 message ProblemDetails {
 
diff --git a/proto3/models/subscription.proto b/proto3/models/subscription.proto
index e2b8272fa111848cdabd0f5a621e2c6964491b4e..adb1adf982b1a8240dad3ee0f4b8ca5a575bacbc 100644
--- a/proto3/models/subscription.proto
+++ b/proto3/models/subscription.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 
 import public "models/onu_alarm_subscription.proto";
 import public "models/dev_info_subscription.proto";
diff --git a/proto3/models/subscription_link_list.proto b/proto3/models/subscription_link_list.proto
index 5e777ab831a16f42a0f2b6c4f053076310bab74d..daf9f37a76f6498aaef3c620dd152aa3eca26d4d 100644
--- a/proto3/models/subscription_link_list.proto
+++ b/proto3/models/subscription_link_list.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/subscription_link_list_links.proto";
 
 message SubscriptionLinkList {
diff --git a/proto3/models/subscription_link_list_links.proto b/proto3/models/subscription_link_list_links.proto
index 66a91240191eef18bee14ef44e27a09bd22e93e4..84a31e556ae18b80f93d55b0df6411e7f8ac8790 100644
--- a/proto3/models/subscription_link_list_links.proto
+++ b/proto3/models/subscription_link_list_links.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/subscription_link_list_links_subscription.proto";
 
 message SubscriptionLinkListLinks {
diff --git a/proto3/models/subscription_link_list_links_subscription.proto b/proto3/models/subscription_link_list_links_subscription.proto
index 0d4b18be5f49fb437572166ab71ac1c893d743af..01ac6dab6aad4a5ac803442259ec7dd447800582 100644
--- a/proto3/models/subscription_link_list_links_subscription.proto
+++ b/proto3/models/subscription_link_list_links_subscription.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/subscription_link_list_links_subscription_subscription_type.proto";
 
 message SubscriptionLinkListLinksSubscription {
diff --git a/proto3/models/subscription_link_list_links_subscription_subscription_type.proto b/proto3/models/subscription_link_list_links_subscription_subscription_type.proto
index f1fde352013a2f830c71269c4e3d88b1e8bb84eb..de8013abbc45b4b298c97f456d3b88b511da7e94 100644
--- a/proto3/models/subscription_link_list_links_subscription_subscription_type.proto
+++ b/proto3/models/subscription_link_list_links_subscription_subscription_type.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 
 message SubscriptionLinkListLinksSubscriptionSubscriptionType {
 enum TypeEnum {
diff --git a/proto3/models/time_stamp.proto b/proto3/models/time_stamp.proto
index e2a537b417dc93af8782ce5a5143ff2d2a283d2d..2ac334b70ba45cc23a30a135c8436cca91810c40 100644
--- a/proto3/models/time_stamp.proto
+++ b/proto3/models/time_stamp.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 
 message TimeStamp {
 
diff --git a/proto3/models/trace_route_diagnostics.proto b/proto3/models/trace_route_diagnostics.proto
index dbd80cf2a165695ea9236711a6ea2eb2638b755b..7353c3b7d196411c123ed5bbdf6eea199767e0bf 100644
--- a/proto3/models/trace_route_diagnostics.proto
+++ b/proto3/models/trace_route_diagnostics.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/trace_route_diagnostics_diagnostics_state.proto";
 
 message TraceRouteDiagnostics {
diff --git a/proto3/models/trace_route_diagnostics_diagnostics_state.proto b/proto3/models/trace_route_diagnostics_diagnostics_state.proto
index 5331b7d2e76130500605e52be01d6dc39f382308..e8d9c2299c06af6092040ab2f047aac400249a33 100644
--- a/proto3/models/trace_route_diagnostics_diagnostics_state.proto
+++ b/proto3/models/trace_route_diagnostics_diagnostics_state.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 
 message TraceRouteDiagnosticsDiagnosticsState {
 enum TypeEnum {
diff --git a/proto3/models/upload_diagnostics.proto b/proto3/models/upload_diagnostics.proto
index ff3856141e5146b008591f55faebbd9afaf9a9b0..2d2dda53e3fb6e4ad06c24757be0eb8618841972 100644
--- a/proto3/models/upload_diagnostics.proto
+++ b/proto3/models/upload_diagnostics.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/time_stamp.proto";
 import public "models/upload_diagnostics_diagnostics_state.proto";
 
diff --git a/proto3/models/upload_diagnostics_diagnostics_state.proto b/proto3/models/upload_diagnostics_diagnostics_state.proto
index edefc5b705ceff84756ff64d9b04fcd02506d5a4..7ed6c5e0411137716d2437647441e37f148a8bc7 100644
--- a/proto3/models/upload_diagnostics_diagnostics_state.proto
+++ b/proto3/models/upload_diagnostics_diagnostics_state.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 
 message UploadDiagnosticsDiagnosticsState {
 enum TypeEnum {
diff --git a/proto3/services/cable_line_info_service.proto b/proto3/services/cable_line_info_service.proto
index 5e66622908ed727be7daed541bcb3243e37408a8..22bd4e8d394167f7a35c589d70a68c935ba3ecf5 100644
--- a/proto3/services/cable_line_info_service.proto
+++ b/proto3/services/cable_line_info_service.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/cable_line_info.proto";
 import public "models/cp_info.proto";
 import public "models/problem_details.proto";
diff --git a/proto3/services/optical_network_info_service.proto b/proto3/services/optical_network_info_service.proto
index 1213078348c310a0eae086e1575d3cc1ffdb6559..bf4ae2c2f450085a8a89bc256ddc140be899b61f 100644
--- a/proto3/services/optical_network_info_service.proto
+++ b/proto3/services/optical_network_info_service.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/cp_info.proto";
 import public "models/pon_info.proto";
 import public "models/problem_details.proto";
diff --git a/proto3/services/queries_service.proto b/proto3/services/queries_service.proto
index d3b2337bdb8bd9b14a32c612ed8aa9811da5ee98..4740c9dade81c8ca665d7dde5579cbd67670de01 100644
--- a/proto3/services/queries_service.proto
+++ b/proto3/services/queries_service.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import public "models/cp_info.proto";
 import public "models/device_info.proto";
 import public "models/fa_info.proto";
diff --git a/proto3/services/subscription_service.proto b/proto3/services/subscription_service.proto
index 6a59d4306a4987f0a5d1a1722d3ee955d74dd6f5..e85336fda80e421294ecb13eb649787e7222680e 100644
--- a/proto3/services/subscription_service.proto
+++ b/proto3/services/subscription_service.proto
@@ -12,6 +12,7 @@ syntax = "proto3";
 
 package mec029;
 
+option java_multiple_files=true;
 import "google/protobuf/empty.proto";	
 import public "models/subscription.proto";
 import public "models/problem_details.proto";