diff --git a/Dockerfile b/Dockerfile
index 4f924ef..f1c10e6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
-# copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -29,7 +30,7 @@
 RUN go get -u "google.golang.org/grpc" \
     && go get "github.com/golang/protobuf/proto" \
     && go get -v "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway" \
-    && go get -v "github.com/golang/protobuf/protoc-gen-go"
+    && go get -v "github.com/golang/protobuf/protoc-gen-go@v1.3.2"
 RUN mkdir /app
 COPY . /app/
 WORKDIR /app
diff --git a/Makefile b/Makefile
index 64b2e73..fd2e1e5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
-# Copyrigh/ 2019-present Open Networking Foundation
+# Copyright 2019-present Open Networking Foundation
+# Copyright 2019-present Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/config.go b/config.go
index 642f42d..c57c182 100644
--- a/config.go
+++ b/config.go
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018-present Open Networking Foundation
+ * Copyright 2018-present Edgecore Networks Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/data_collector.go b/data_collector.go
index 4572526..ef8e02b 100644
--- a/data_collector.go
+++ b/data_collector.go
@@ -1,4 +1,5 @@
-// Copyright 2018 Open Networking Foundation
+// Copyright 2018-present  Open Networking Foundation
+// Copyright 2018-present  Edgecore Networks Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/demo_test/Dockerfile b/demo_test/Dockerfile
index efd6ce9..d7113ba 100644
--- a/demo_test/Dockerfile
+++ b/demo_test/Dockerfile
@@ -1,4 +1,5 @@
-# copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/demo_test/Makefile b/demo_test/Makefile
index 4ceae91..0e206de 100644
--- a/demo_test/Makefile
+++ b/demo_test/Makefile
@@ -1,4 +1,5 @@
 # Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/demo_test/config.go b/demo_test/config.go
index e8bd589..167da60 100644
--- a/demo_test/config.go
+++ b/demo_test/config.go
@@ -1,5 +1,6 @@
 /*
  * Copyright 2018-present Open Networking Foundation
+ * Copyright 2018-present Edgecore Networks Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/Makefile b/demo_test/functional_test/Makefile
index 1b5ea3b..5cd57f7 100644
--- a/demo_test/functional_test/Makefile
+++ b/demo_test/functional_test/Makefile
@@ -1,4 +1,5 @@
 # Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/README b/demo_test/functional_test/README
index daba620..9b4169d 100644
--- a/demo_test/functional_test/README
+++ b/demo_test/functional_test/README
@@ -1,4 +1,5 @@
-// Copyright 2018 Open Networking Foundation
+// Copyright 2018-present Open Networking Foundation
+// Copyright 2018-present Edgecore Networks Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/importer.robot b/demo_test/functional_test/importer.robot
index 389028b..516a51e 100644
--- a/demo_test/functional_test/importer.robot
+++ b/demo_test/functional_test/importer.robot
@@ -1,4 +1,5 @@
-# Copyright 2018 Open Networking Foundation
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/robot-mock-olt.yaml b/demo_test/functional_test/robot-mock-olt.yaml
index 9daea3a..e91d76c 100644
--- a/demo_test/functional_test/robot-mock-olt.yaml
+++ b/demo_test/functional_test/robot-mock-olt.yaml
@@ -1,6 +1,7 @@
 ---
 
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/test_cli.go b/demo_test/functional_test/test_cli.go
index 81cfe07..392ccfb 100644
--- a/demo_test/functional_test/test_cli.go
+++ b/demo_test/functional_test/test_cli.go
@@ -1,4 +1,5 @@
 // Copyright 2018-present Open Networking Foundation
+// Copyright 2018-present Edgecore Networks Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/add_device_to_monitor.expected b/demo_test/functional_test/tests/add_device_to_monitor.expected
index 64812fb..52a9dc5 100644
--- a/demo_test/functional_test/tests/add_device_to_monitor.expected
+++ b/demo_test/functional_test/tests/add_device_to_monitor.expected
@@ -1,4 +1,5 @@
-// Copyright 2018 Open Networking Foundation
+// Copyright 2018-present Open Networking Foundation
+// Copyright 2018-present Edgecore Networks Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/add_device_to_monitor.tc b/demo_test/functional_test/tests/add_device_to_monitor.tc
index 4584e81..ca070a6 100755
--- a/demo_test/functional_test/tests/add_device_to_monitor.tc
+++ b/demo_test/functional_test/tests/add_device_to_monitor.tc
@@ -1,6 +1,8 @@
 #!/bin/bash  
 
-# Copyrigh/ 2019-present Open Networking Foundation
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
+
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/clear_all_subscribed_events.expected b/demo_test/functional_test/tests/clear_all_subscribed_events.expected
index f05a3fd..ae8f5b4 100644
--- a/demo_test/functional_test/tests/clear_all_subscribed_events.expected
+++ b/demo_test/functional_test/tests/clear_all_subscribed_events.expected
@@ -1,4 +1,5 @@
-// Copyright 2018 Open Networking Foundation
+// Copyright 2018-present Open Networking Foundation
+// Copyright 2018-present Edgecore Networks Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/clear_all_subscribed_events.tc b/demo_test/functional_test/tests/clear_all_subscribed_events.tc
index b88f318..559083f 100755
--- a/demo_test/functional_test/tests/clear_all_subscribed_events.tc
+++ b/demo_test/functional_test/tests/clear_all_subscribed_events.tc
@@ -1,6 +1,7 @@
 #!/bin/bash  
 
-# Copyrigh/ 2019-present Open Networking Foundation
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/configure_data_polling_interval.expected b/demo_test/functional_test/tests/configure_data_polling_interval.expected
index 66e93bb..99ba02a 100644
--- a/demo_test/functional_test/tests/configure_data_polling_interval.expected
+++ b/demo_test/functional_test/tests/configure_data_polling_interval.expected
@@ -1,4 +1,5 @@
-// Copyright 2018 Open Networking Foundation
+// Copyright 2018-present Open Networking Foundation
+// Copyright 2018-present Edgecore Networks Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/configure_data_polling_interval.tc b/demo_test/functional_test/tests/configure_data_polling_interval.tc
index 01202ce..5403523 100755
--- a/demo_test/functional_test/tests/configure_data_polling_interval.tc
+++ b/demo_test/functional_test/tests/configure_data_polling_interval.tc
@@ -1,6 +1,7 @@
 #!/bin/bash  
 
-# Copyrigh/ 2019-present Open Networking Foundation
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/delete_monitored_device.expected b/demo_test/functional_test/tests/delete_monitored_device.expected
index 65763d9..f4541cf 100644
--- a/demo_test/functional_test/tests/delete_monitored_device.expected
+++ b/demo_test/functional_test/tests/delete_monitored_device.expected
@@ -1,4 +1,5 @@
-// Copyright 2018 Open Networking Foundation
+// Copyright 2018-present Open Networking Foundation
+// Copyright 2018-present Edgecore Networks Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/delete_monitored_device.tc b/demo_test/functional_test/tests/delete_monitored_device.tc
index 7c99273..61d8b0e 100755
--- a/demo_test/functional_test/tests/delete_monitored_device.tc
+++ b/demo_test/functional_test/tests/delete_monitored_device.tc
@@ -1,6 +1,8 @@
 #!/bin/bash  
 
-# Copyrigh/ 2019-present Open Networking Foundation
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
+
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/list_device_monitored.expected b/demo_test/functional_test/tests/list_device_monitored.expected
index 4acf927..53623aa 100644
--- a/demo_test/functional_test/tests/list_device_monitored.expected
+++ b/demo_test/functional_test/tests/list_device_monitored.expected
@@ -1,4 +1,5 @@
-// Copyright 2018 Open Networking Foundation
+// Copyright 2018-present Open Networking Foundation
+// Copyright 2018-present Edgecore Networks Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/list_device_monitored.tc b/demo_test/functional_test/tests/list_device_monitored.tc
index 5e4bc01..3ceb2b2 100755
--- a/demo_test/functional_test/tests/list_device_monitored.tc
+++ b/demo_test/functional_test/tests/list_device_monitored.tc
@@ -1,6 +1,7 @@
 #!/bin/bash  
 
-# Copyrigh/ 2019-present Open Networking Foundation
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/list_subscribed_events.expected b/demo_test/functional_test/tests/list_subscribed_events.expected
index 0b07d01..f0c4280 100644
--- a/demo_test/functional_test/tests/list_subscribed_events.expected
+++ b/demo_test/functional_test/tests/list_subscribed_events.expected
@@ -1,4 +1,5 @@
-// Copyright 2018 Open Networking Foundation
+// Copyright 2018-present Open Networking Foundation
+// Copyright 2018-present Edgecore Networks Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/list_subscribed_events.tc b/demo_test/functional_test/tests/list_subscribed_events.tc
index 47f47e4..1dcb979 100755
--- a/demo_test/functional_test/tests/list_subscribed_events.tc
+++ b/demo_test/functional_test/tests/list_subscribed_events.tc
@@ -1,6 +1,7 @@
 #!/bin/bash  
 
-# Copyrigh/ 2019-present Open Networking Foundation
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/list_supported_events.expected b/demo_test/functional_test/tests/list_supported_events.expected
index 0b07d01..f0c4280 100644
--- a/demo_test/functional_test/tests/list_supported_events.expected
+++ b/demo_test/functional_test/tests/list_supported_events.expected
@@ -1,4 +1,5 @@
-// Copyright 2018 Open Networking Foundation
+// Copyright 2018-present Open Networking Foundation
+// Copyright 2018-present Edgecore Networks Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/list_supported_events.tc b/demo_test/functional_test/tests/list_supported_events.tc
index 8f23e06..1b3e4a4 100755
--- a/demo_test/functional_test/tests/list_supported_events.tc
+++ b/demo_test/functional_test/tests/list_supported_events.tc
@@ -1,6 +1,7 @@
 #!/bin/bash  
 
-# Copyrigh/ 2019-present Open Networking Foundation
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/subscribe_events.expected b/demo_test/functional_test/tests/subscribe_events.expected
index 1778144..5e70409 100644
--- a/demo_test/functional_test/tests/subscribe_events.expected
+++ b/demo_test/functional_test/tests/subscribe_events.expected
@@ -1,4 +1,5 @@
-// Copyright 2018 Open Networking Foundation
+// Copyright 2018-present Open Networking Foundation
+// Copyright 2018-present Edgecore Networks Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/subscribe_events.tc b/demo_test/functional_test/tests/subscribe_events.tc
index ef108e9..cc607cb 100755
--- a/demo_test/functional_test/tests/subscribe_events.tc
+++ b/demo_test/functional_test/tests/subscribe_events.tc
@@ -1,6 +1,7 @@
 #!/bin/bash  
 
-# Copyrigh/ 2019-present Open Networking Foundation
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/unsubscribe_events.expected b/demo_test/functional_test/tests/unsubscribe_events.expected
index fd1b1cb..3635676 100644
--- a/demo_test/functional_test/tests/unsubscribe_events.expected
+++ b/demo_test/functional_test/tests/unsubscribe_events.expected
@@ -1,4 +1,5 @@
-// Copyright 2018 Open Networking Foundation
+// Copyright 2018-present Open Networking Foundation
+// Copyright 2018-present Edgecore Networks Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/unsubscribe_events.tc b/demo_test/functional_test/tests/unsubscribe_events.tc
index 96d069a..5a57434 100755
--- a/demo_test/functional_test/tests/unsubscribe_events.tc
+++ b/demo_test/functional_test/tests/unsubscribe_events.tc
@@ -1,6 +1,7 @@
 #!/bin/bash  
 
-# Copyrigh/ 2019-present Open Networking Foundation
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/validate_ip.expected b/demo_test/functional_test/tests/validate_ip.expected
index d4f0fc3..0a1961c 100644
--- a/demo_test/functional_test/tests/validate_ip.expected
+++ b/demo_test/functional_test/tests/validate_ip.expected
@@ -1,4 +1,5 @@
-// Copyright 2018 Open Networking Foundation
+// Copyright 2018-present Open Networking Foundation
+// Copyright 2018-present Edgecore Networks Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/demo_test/functional_test/tests/validate_ip.tc b/demo_test/functional_test/tests/validate_ip.tc
index de13243..3ea739c 100755
--- a/demo_test/functional_test/tests/validate_ip.tc
+++ b/demo_test/functional_test/tests/validate_ip.tc
@@ -1,6 +1,7 @@
 #!/bin/bash  
 
-# Copyrigh/ 2019-present Open Networking Foundation
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/demo_test/kafka_ip.sh b/demo_test/kafka_ip.sh
index 433ab38..a05f7fe 100755
--- a/demo_test/kafka_ip.sh
+++ b/demo_test/kafka_ip.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
-# Copyright 2018 Open Networking Foundation
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/demo_test/test.go b/demo_test/test.go
index 8d929a0..f397052 100644
--- a/demo_test/test.go
+++ b/demo_test/test.go
@@ -1,4 +1,5 @@
-// Copyright 2018 Open Networking Foundation
+// Copyright 2018-present Open Networking Foundation
+// Copyright 2018-present Edgecore Networks Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/event_subscriber.go b/event_subscriber.go
index 160b599..3285f3d 100644
--- a/event_subscriber.go
+++ b/event_subscriber.go
@@ -1,4 +1,5 @@
-// Copyright 2018 Open Networking Foundation
+// Copyright 2018-present Open Networking Foundation
+// Copyright 2018-present Edgecore Networks Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/kubernetes/deploy-redfish-importer.yaml b/kubernetes/deploy-redfish-importer.yaml
index b94b099..ebdc0f3 100755
--- a/kubernetes/deploy-redfish-importer.yaml
+++ b/kubernetes/deploy-redfish-importer.yaml
@@ -1,4 +1,5 @@
 # Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present  Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/kubernetes/run-demotest-port-forward.sh b/kubernetes/run-demotest-port-forward.sh
index 1bc5a8d..3619693 100644
--- a/kubernetes/run-demotest-port-forward.sh
+++ b/kubernetes/run-demotest-port-forward.sh
@@ -1,4 +1,5 @@
 # Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present  Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/kubernetes/start-demotest-port-forward.sh b/kubernetes/start-demotest-port-forward.sh
index 9b9b4df..c3137b9 100644
--- a/kubernetes/start-demotest-port-forward.sh
+++ b/kubernetes/start-demotest-port-forward.sh
@@ -1,4 +1,5 @@
 # Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present  Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/main.go b/main.go
index 930fbd2..c847f53 100644
--- a/main.go
+++ b/main.go
@@ -1,4 +1,5 @@
-// Copyright 2018 Open Networking Foundation
+// Copyright 2018-present Open Networking Foundation
+// Copyright 2018-present Edgecore Networks Corporation
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/mock-redfish-server/Dockerfile b/mock-redfish-server/Dockerfile
index 40476df..2c874a6 100644
--- a/mock-redfish-server/Dockerfile
+++ b/mock-redfish-server/Dockerfile
@@ -1,4 +1,5 @@
-# copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/mock-redfish-server/Makefile b/mock-redfish-server/Makefile
index 0b5362e..c6607cc 100644
--- a/mock-redfish-server/Makefile
+++ b/mock-redfish-server/Makefile
@@ -1,4 +1,5 @@
 # Copyright 2018-present Open Networking Foundation
+# Copyright 2018-present Edgecore Networks Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.