diff --git a/client/src/main/java/org/apache/sqoop/client/shell/CloneCommand.java b/client/src/main/java/org/apache/sqoop/client/shell/CloneCommand.java
index 827d168c..a127d616 100644
--- a/client/src/main/java/org/apache/sqoop/client/shell/CloneCommand.java
+++ b/client/src/main/java/org/apache/sqoop/client/shell/CloneCommand.java
@@ -42,7 +42,7 @@ public CloneCommand(Shell shell) {
       Constants.PRE_CLONE, Constants.SUF_INFO);
   }
 
-  public Object execute(List args) {
+  public Object executeCommand(List args) {
     String usageMsg = MessageFormat.format(getResource().getString(Constants
         .RES_CLONE_USAGE), getUsage());
 
diff --git a/client/src/main/java/org/apache/sqoop/client/shell/CreateCommand.java b/client/src/main/java/org/apache/sqoop/client/shell/CreateCommand.java
index ad4d8fd9..6cd2ff5e 100644
--- a/client/src/main/java/org/apache/sqoop/client/shell/CreateCommand.java
+++ b/client/src/main/java/org/apache/sqoop/client/shell/CreateCommand.java
@@ -41,7 +41,7 @@ public CreateCommand(Shell shell) {
       Constants.PRE_CREATE, Constants.SUF_INFO);
   }
 
-  public Object execute(List args) {
+  public Object executeCommand(List args) {
     String usageMsg = MessageFormat.format(getResource().getString(Constants
         .RES_CREATE_USAGE), getUsage());
 
diff --git a/client/src/main/java/org/apache/sqoop/client/shell/DeleteCommand.java b/client/src/main/java/org/apache/sqoop/client/shell/DeleteCommand.java
index 5ab64956..38b2fdad 100644
--- a/client/src/main/java/org/apache/sqoop/client/shell/DeleteCommand.java
+++ b/client/src/main/java/org/apache/sqoop/client/shell/DeleteCommand.java
@@ -42,7 +42,7 @@ public DeleteCommand(Shell shell) {
 
   @Override
   @SuppressWarnings("unchecked")
-  public Object execute(List args) {
+  public Object executeCommand(List args) {
     String usageMsg = MessageFormat.format(getResource().getString(Constants
         .RES_DELETE_USAGE), getUsage());
     if (args.size() == 0) {
diff --git a/client/src/main/java/org/apache/sqoop/client/shell/SetCommand.java b/client/src/main/java/org/apache/sqoop/client/shell/SetCommand.java
index fb6e8c83..6c17e251 100644
--- a/client/src/main/java/org/apache/sqoop/client/shell/SetCommand.java
+++ b/client/src/main/java/org/apache/sqoop/client/shell/SetCommand.java
@@ -40,7 +40,7 @@ protected SetCommand(Shell shell) {
 
   @SuppressWarnings({ "rawtypes", "unchecked" })
   @Override
-  public Object execute(List args) {
+  public Object executeCommand(List args) {
     String usageMsg =  MessageFormat.format(getResource().getString(Constants
         .RES_SET_USAGE), getUsage());
 
@@ -49,7 +49,6 @@ public Object execute(List args) {
       io.out.println();
       return null;
     }
-    resolveVariables(args);
     String func = (String)args.get(0);
     if (func.equals(Constants.FN_SERVER)) {
       if (serverFunction == null) {
diff --git a/client/src/main/java/org/apache/sqoop/client/shell/ShowCommand.java b/client/src/main/java/org/apache/sqoop/client/shell/ShowCommand.java
index efbb8f2a..a043aa33 100644
--- a/client/src/main/java/org/apache/sqoop/client/shell/ShowCommand.java
+++ b/client/src/main/java/org/apache/sqoop/client/shell/ShowCommand.java
@@ -47,7 +47,7 @@ protected ShowCommand(Shell shell) {
 
   @SuppressWarnings({ "rawtypes", "unchecked" })
   @Override
-  public Object execute(List args) {
+  public Object executeCommand(List args) {
     String usageMsg = MessageFormat.format(getResource().getString(Constants
         .RES_SHOW_USAGE), getUsage());
     if (args.size() == 0) {
diff --git a/client/src/main/java/org/apache/sqoop/client/shell/SqoopCommand.java b/client/src/main/java/org/apache/sqoop/client/shell/SqoopCommand.java
index d8183535..df9350f9 100644
--- a/client/src/main/java/org/apache/sqoop/client/shell/SqoopCommand.java
+++ b/client/src/main/java/org/apache/sqoop/client/shell/SqoopCommand.java
@@ -126,6 +126,22 @@ public String getHelp() {
     return help;
   }
 
+  /**
+   * Override execute method
+   */
+  @Override
+  public Object execute(List args) {
+    resolveVariables(args);
+    return executeCommand(args);
+  }
+
+  /**
+   * Abstract executeCommand
+   * @param args list
+   * @return Object
+   */
+  public abstract Object executeCommand(List args);
+
   @SuppressWarnings({ "rawtypes", "unchecked" })
   protected void resolveVariables(List arg) {
     List temp = new ArrayList();
diff --git a/client/src/main/java/org/apache/sqoop/client/shell/SubmissionCommand.java b/client/src/main/java/org/apache/sqoop/client/shell/SubmissionCommand.java
index 2e1fb03b..af4231d5 100644
--- a/client/src/main/java/org/apache/sqoop/client/shell/SubmissionCommand.java
+++ b/client/src/main/java/org/apache/sqoop/client/shell/SubmissionCommand.java
@@ -43,7 +43,7 @@ public SubmissionCommand(Shell shell) {
       Constants.PRE_SUBMISSION, Constants.SUF_INFO);
   }
 
-  public Object execute(List args) {
+  public Object executeCommand(List args) {
     String usageMsg = MessageFormat.format(getResource().getString(Constants
         .RES_SUBMISSION_USAGE), getUsage());
     if (args.size() == 0) {
diff --git a/client/src/main/java/org/apache/sqoop/client/shell/UpdateCommand.java b/client/src/main/java/org/apache/sqoop/client/shell/UpdateCommand.java
index d73b40ec..fcf8862f 100644
--- a/client/src/main/java/org/apache/sqoop/client/shell/UpdateCommand.java
+++ b/client/src/main/java/org/apache/sqoop/client/shell/UpdateCommand.java
@@ -40,7 +40,7 @@ public UpdateCommand(Shell shell) {
       Constants.PRE_UPDATE, Constants.SUF_INFO);
   }
 
-  public Object execute(List args) {
+  public Object executeCommand(List args) {
     String usageMsg = MessageFormat.format(getResource().getString(Constants
         .RES_UPDATE_USAGE), getUsage());
     if (args.size() == 0) {