diff --git a/apm-network/src/main/proto/RegisterService.proto b/apm-network/src/main/proto/ApplicationRegisterService.proto
similarity index 61%
rename from apm-network/src/main/proto/RegisterService.proto
rename to apm-network/src/main/proto/ApplicationRegisterService.proto
index 16978439b..a40392bb3 100644
--- a/apm-network/src/main/proto/RegisterService.proto
+++ b/apm-network/src/main/proto/ApplicationRegisterService.proto
@@ -1,7 +1,9 @@
 syntax = "proto3";
 
 option java_multiple_files = true;
-option java_package = "org.skywalking.apm.network.trace.proto";
+option java_package = "org.skywalking.apm.network.proto";
+
+import "KeyWithIntegerValue.proto";
 
 //register service for ApplicationCode, this service is called when service starts.
 service ApplicationRegisterService {
@@ -10,11 +12,9 @@ service ApplicationRegisterService {
 }
 
 message Application {
-    string applicationCode = 1;
+    repeated string applicationCode = 1;
 }
 
 message ApplicationMapping {
-    int32 applicationId = 1;
-    Application application = 2;
-}
-
+    repeated KeyWithIntegerValue application = 1;
+}
\ No newline at end of file
diff --git a/apm-network/src/main/proto/DiscoveryService.proto b/apm-network/src/main/proto/DiscoveryService.proto
index e9a986bbe..420b3d6c9 100644
--- a/apm-network/src/main/proto/DiscoveryService.proto
+++ b/apm-network/src/main/proto/DiscoveryService.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 option java_multiple_files = true;
-option java_package = "org.skywalking.apm.network.trace.proto";
+option java_package = "org.skywalking.apm.network.proto";
 
 import "Downstream.proto";
 
@@ -16,7 +16,7 @@ service InstanceDiscoveryService {
 }
 
 message ApplicationInstance {
-    string applicationCode = 1;
+    int32 applicationId = 1;
 }
 
 message ApplicationInstanceMapping {
@@ -45,6 +45,6 @@ message ServiceNameMappingElement {
 
 message ServiceNameElement {
     string serviceName = 1;
-    string ApplicationCode = 2;
+    int32 applicationId = 2;
 }
 
diff --git a/apm-network/src/main/proto/Downstream.proto b/apm-network/src/main/proto/Downstream.proto
index f5c5ec3c2..cbeb2f41a 100644
--- a/apm-network/src/main/proto/Downstream.proto
+++ b/apm-network/src/main/proto/Downstream.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 option java_multiple_files = true;
-option java_package = "org.skywalking.apm.network.collecor.proto";
+option java_package = "org.skywalking.apm.network.proto";
 
 // nothing down stream from collector yet.
 message Downstream {
diff --git a/apm-network/src/main/proto/JVMMetricsService.proto b/apm-network/src/main/proto/JVMMetricsService.proto
index 22680b686..f7419288e 100644
--- a/apm-network/src/main/proto/JVMMetricsService.proto
+++ b/apm-network/src/main/proto/JVMMetricsService.proto
@@ -1,5 +1,5 @@
 option java_multiple_files = true;
-option java_package = "org.skywalking.apm.network.trace.proto";
+option java_package = "org.skywalking.apm.network.proto";
 
 import "Downstream.proto";
 
diff --git a/apm-network/src/main/proto/KeyWithIntegerValue.proto b/apm-network/src/main/proto/KeyWithIntegerValue.proto
new file mode 100644
index 000000000..328ef45a5
--- /dev/null
+++ b/apm-network/src/main/proto/KeyWithIntegerValue.proto
@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+option java_multiple_files = true;
+option java_package = "org.skywalking.apm.network.proto";
+
+message KeyWithIntegerValue {
+    string key = 1;
+    int32 value = 2;
+}
diff --git a/apm-network/src/main/proto/KeyWithStringValue.proto b/apm-network/src/main/proto/KeyWithStringValue.proto
new file mode 100644
index 000000000..e1a3a4e3e
--- /dev/null
+++ b/apm-network/src/main/proto/KeyWithStringValue.proto
@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+option java_multiple_files = true;
+option java_package = "org.skywalking.apm.network.proto";
+
+message KeyWithStringValue {
+    string key = 1;
+    string value = 2;
+}
diff --git a/apm-network/src/main/proto/TraceSegmentService.proto b/apm-network/src/main/proto/TraceSegmentService.proto
index 2134ff219..17592a1ad 100644
--- a/apm-network/src/main/proto/TraceSegmentService.proto
+++ b/apm-network/src/main/proto/TraceSegmentService.proto
@@ -1,9 +1,10 @@
 syntax = "proto3";
 
 option java_multiple_files = true;
-option java_package = "org.skywalking.apm.network.trace.proto";
+option java_package = "org.skywalking.apm.network.proto";
 
 import "Downstream.proto";
+import "KeyWithStringValue.proto";
 
 service TraceSegmentService {
     rpc collect (stream UpstreamSegment) returns (Downstream) {
@@ -48,7 +49,7 @@ message SpanObject {
     int32 componentId = 11;
     string component = 12;
     bool isError = 13;
-    repeated KeyValue tags = 14;
+    repeated KeyWithStringValue tags = 14;
     repeated LogMessage logs = 15;
 }
 
@@ -65,12 +66,7 @@ enum SpanLayer {
     MQ = 3;
 }
 
-message KeyValue {
-    string key = 1;
-    string value = 2;
-}
-
 message LogMessage {
     int64 time = 1;
-    repeated KeyValue data = 2;
+    repeated KeyWithStringValue data = 2;
 }