diff --git a/cli/main.py b/cli/main.py
index b3d012d..3f3157e 100755
--- a/cli/main.py
+++ b/cli/main.py
@@ -273,6 +273,9 @@
             kw['mac_address'] = opts.mac_address
         else:
             raise Exception('Either IP address or Mac Address is needed')
+        # Pass any extra arguments past '--' to the device as custom arguments
+        kw['extra_args'] = line
+
         device = voltha_pb2.Device(**kw)
         device = stub.CreateDevice(device)
         self.poutput('success (device id = {})'.format(device.id))
diff --git a/voltha/protos/device.proto b/voltha/protos/device.proto
index 39ec13e..a4174f5 100644
--- a/voltha/protos/device.proto
+++ b/voltha/protos/device.proto
@@ -148,6 +148,7 @@
         string host_and_port = 21;
 
     };
+    string extra_args = 23;  // Used to pass additional device specific arguments
 
     ProxyAddress proxy_address = 19;