diff --git a/apps/dhcp/app/src/main/java/org/onosproject/dhcp/cli/MacIdCompleter.java b/apps/dhcp/app/src/main/java/org/onosproject/dhcp/cli/MacIdCompleter.java
index 16b17b5..acd7983 100644
--- a/apps/dhcp/app/src/main/java/org/onosproject/dhcp/cli/MacIdCompleter.java
+++ b/apps/dhcp/app/src/main/java/org/onosproject/dhcp/cli/MacIdCompleter.java
@@ -15,8 +15,11 @@
  */
 package org.onosproject.dhcp.cli;
 
-import org.apache.karaf.shell.console.Completer;
-import org.apache.karaf.shell.console.completer.StringsCompleter;
+import org.apache.karaf.shell.api.action.lifecycle.Service;
+import org.apache.karaf.shell.api.console.CommandLine;
+import org.apache.karaf.shell.api.console.Completer;
+import org.apache.karaf.shell.api.console.Session;
+import org.apache.karaf.shell.support.completers.StringsCompleter;
 import org.onosproject.cli.AbstractShellCommand;
 import org.onosproject.net.Host;
 import org.onosproject.net.host.HostService;
@@ -28,10 +31,11 @@
 /**
  * MAC ID Completer.
  */
+@Service
 public class MacIdCompleter implements Completer {
 
     @Override
-    public int complete(String buffer, int cursor, List<String> candidates) {
+    public int complete(Session session, CommandLine commandLine, List<String> candidates) {
         // Delegate string completer
         StringsCompleter delegate = new StringsCompleter();
         HostService service = AbstractShellCommand.get(HostService.class);
@@ -43,6 +47,6 @@
         }
 
         // Now let the completer do the work for figuring out what to offer.
-        return delegate.complete(buffer, cursor, candidates);
+        return delegate.complete(session, commandLine, candidates);
     }
 }