diff --git a/src/cli/onehook b/src/cli/onehook
index a85de08f2b..68ecb63794 100755
--- a/src/cli/onehook
+++ b/src/cli/onehook
@@ -254,9 +254,9 @@ CommandParser::CmdParser.new(ARGV) do
         [Admin]: locks only Admin actions.
     EOT
 
-    command :lock, lock_desc, :hookid,
+    command :lock, lock_desc, [:range, :hookid_list],
             :options => [USE, MANAGE, ADMIN, ALL] do
-        helper.perform_action(args[0], options, 'Hook locked') do |t|
+        helper.perform_actions(args[0], options, 'Hook locked') do |t|
             if !options[:use].nil?
                 level = 1
             elsif !options[:manage].nil?
@@ -277,8 +277,8 @@ CommandParser::CmdParser.new(ARGV) do
         Valid states are: All.
     EOT
 
-    command :unlock, unlock_desc, :hookid do
-        helper.perform_action(args[0], options, 'Hook unlocked') do |t|
+    command :unlock, unlock_desc, [:range, :hookid_list] do
+        helper.perform_actions(args[0], options, 'Hook unlocked') do |t|
             t.unlock
         end
     end
diff --git a/src/cli/oneimage b/src/cli/oneimage
index 5087032a66..b55b822581 100755
--- a/src/cli/oneimage
+++ b/src/cli/oneimage
@@ -434,9 +434,9 @@ CommandParser::CmdParser.new(ARGV) do
         [Admin]: locks only Admin actions.
     EOT
 
-    command :lock, lock_desc, :imageid,
+    command :lock, lock_desc, [:range, :imageid_list],
             :options => [USE, MANAGE, ADMIN, ALL] do
-        helper.perform_action(args[0], options, 'Image locked') do |i|
+        helper.perform_actions(args[0], options, 'Image locked') do |i|
             if !options[:use].nil?
                 level = 1
             elsif !options[:manage].nil?
@@ -457,8 +457,8 @@ CommandParser::CmdParser.new(ARGV) do
         Valid states are: All.
     EOT
 
-    command :unlock, unlock_desc, :imageid do
-        helper.perform_action(args[0], options, 'Image unlocked') do |i|
+    command :unlock, unlock_desc, [:range, :imageid_list] do
+        helper.perform_actions(args[0], options, 'Image unlocked') do |i|
             i.unlock
         end
     end
diff --git a/src/cli/onemarketapp b/src/cli/onemarketapp
index d948c2feb8..dd32341a9b 100755
--- a/src/cli/onemarketapp
+++ b/src/cli/onemarketapp
@@ -438,11 +438,11 @@ CommandParser::CmdParser.new(ARGV) do
         [Admin]: locks only Admin actions.
     EOT
 
-    command :lock, lock_desc, :appid,
+    command :lock, lock_desc, [:range, :appid_list],
             :options => [USE, MANAGE, ADMIN, ALL] do
-        helper.perform_action(args[0],
-                              options,
-                              'MarketPlaceApp locked') do |app|
+        helper.perform_actions(args[0],
+                               options,
+                               'MarketPlaceApp locked') do |app|
             if !options[:use].nil?
                 level = 1
             elsif !options[:manage].nil?
@@ -463,10 +463,10 @@ CommandParser::CmdParser.new(ARGV) do
         Valid states are: All.
     EOT
 
-    command :unlock, unlock_desc, :appid do
-        helper.perform_action(args[0],
-                              options,
-                              'MarketPlaceApp unlocked') do |app|
+    command :unlock, unlock_desc, [:range, :appid_list] do
+        helper.perform_actions(args[0],
+                               options,
+                               'MarketPlaceApp unlocked') do |app|
             app.unlock
         end
     end
diff --git a/src/cli/onetemplate b/src/cli/onetemplate
index 8b771fc9c6..8cfcb20a10 100755
--- a/src/cli/onetemplate
+++ b/src/cli/onetemplate
@@ -395,9 +395,9 @@ CommandParser::CmdParser.new(ARGV) do
         [Admin]: locks only Admin actions.
     EOT
 
-    command :lock, lock_desc, :templateid,
+    command :lock, lock_desc, [:range, :templateid_list],
             :options => [USE, MANAGE, ADMIN, ALL] do
-        helper.perform_action(args[0], options, 'Template locked') do |t|
+        helper.perform_actions(args[0], options, 'Template locked') do |t|
             if !options[:use].nil?
                 level = 1
             elsif !options[:manage].nil?
@@ -418,8 +418,8 @@ CommandParser::CmdParser.new(ARGV) do
         Valid states are: All.
     EOT
 
-    command :unlock, unlock_desc, :templateid do
-        helper.perform_action(args[0], options, 'Template unlocked') do |t|
+    command :unlock, unlock_desc, [:range, :templateid_list] do
+        helper.perform_actions(args[0], options, 'Template unlocked') do |t|
             t.unlock
         end
     end
diff --git a/src/cli/onevm b/src/cli/onevm
index f62a777130..35195982f2 100755
--- a/src/cli/onevm
+++ b/src/cli/onevm
@@ -1324,9 +1324,9 @@ CommandParser::CmdParser.new(ARGV) do
         Valid states are: All.
     EOT
 
-    command :lock, lock_desc, :vmid,
+    command :lock, lock_desc, [:range, :vmid_list],
             :options => [USE, MANAGE, ADMIN, ALL] do
-        helper.perform_action(args[0], options, 'VM locked') do |vm|
+        helper.perform_actions(args[0], options, 'VM locked') do |vm|
             if !options[:use].nil?
                 level = 1
             elsif !options[:manage].nil?
@@ -1347,8 +1347,8 @@ CommandParser::CmdParser.new(ARGV) do
         Valid states are: All.
     EOT
 
-    command :unlock, unlock_desc, :vmid do
-        helper.perform_action(args[0], options, 'VM unlocked') do |vm|
+    command :unlock, unlock_desc, [:range, :vmid_list] do
+        helper.perform_actions(args[0], options, 'VM unlocked') do |vm|
             vm.unlock
         end
     end
@@ -1361,7 +1361,7 @@ CommandParser::CmdParser.new(ARGV) do
         You can configure the actions in /etc/one/cli/onevm.yaml
     EOT
 
-    command :'create-chart', create_chart_desc, [:range, :vmid_list] do
+    command :'create-chart', create_chart_desc, :vmid do
         charters = helper.get_charters
 
         if charters.nil?
diff --git a/src/cli/onevmgroup b/src/cli/onevmgroup
index 97475c8b1b..709047d184 100755
--- a/src/cli/onevmgroup
+++ b/src/cli/onevmgroup
@@ -231,9 +231,9 @@ CommandParser::CmdParser.new(ARGV) do
         [Admin]: locks only Admin actions.
     EOT
 
-    command :lock, lock_desc, :vmgroupid,
+    command :lock, lock_desc, [:range, :vmgroupid_list],
             :options => [USE, MANAGE, ADMIN, ALL] do
-        helper.perform_action(args[0], options, 'VMGroup locked') do |vmg|
+        helper.perform_actions(args[0], options, 'VMGroup locked') do |vmg|
             if !options[:use].nil?
                 level = 1
             elsif !options[:manage].nil?
@@ -254,8 +254,8 @@ CommandParser::CmdParser.new(ARGV) do
         Valid states are: All.
     EOT
 
-    command :unlock, unlock_desc, :vmgroupid do
-        helper.perform_action(args[0], options, 'VMGroup unlocked') do |vmg|
+    command :unlock, unlock_desc, [:range, :vmgroupid_list] do
+        helper.perform_actions(args[0], options, 'VMGroup unlocked') do |vmg|
             vmg.unlock
         end
     end
diff --git a/src/cli/onevnet b/src/cli/onevnet
index 335431fb50..5a750b0fad 100755
--- a/src/cli/onevnet
+++ b/src/cli/onevnet
@@ -379,9 +379,9 @@ CommandParser::CmdParser.new(ARGV) do
         [Admin]: locks only Admin actions.
     EOT
 
-    command :lock, lock_desc, :vnetid,
+    command :lock, lock_desc, [:range, :vnetid_list],
             :options => [USE, MANAGE, ADMIN, ALL] do
-        helper.perform_action(args[0], options, 'VNet locked') do |vnet|
+        helper.perform_actions(args[0], options, 'VNet locked') do |vnet|
             if !options[:use].nil?
                 level = 1
             elsif !options[:manage].nil?
@@ -402,8 +402,8 @@ CommandParser::CmdParser.new(ARGV) do
         Valid states are: All.
     EOT
 
-    command :unlock, unlock_desc, :vnetid do
-        helper.perform_action(args[0], options, 'VNet unlocked') do |vnet|
+    command :unlock, unlock_desc, [:range, :vnetid_list] do
+        helper.perform_actions(args[0], options, 'VNet unlocked') do |vnet|
             vnet.unlock
         end
     end
diff --git a/src/cli/onevntemplate b/src/cli/onevntemplate
index 733275ad7b..110d111001 100755
--- a/src/cli/onevntemplate
+++ b/src/cli/onevntemplate
@@ -339,9 +339,9 @@ CommandParser::CmdParser.new(ARGV) do
         [Admin]: locks only Admin actions.
     EOT
 
-    command :lock, lock_desc, :templateid,
+    command :lock, lock_desc, [:range, :templateid_list],
             :options => [USE, MANAGE, ADMIN, ALL] do
-        helper.perform_action(args[0], options, 'VN Template locked') do |t|
+        helper.perform_actions(args[0], options, 'VN Template locked') do |t|
             if !options[:use].nil?
                 level = 1
             elsif !options[:manage].nil?
@@ -362,8 +362,8 @@ CommandParser::CmdParser.new(ARGV) do
         Valid states are: All.
     EOT
 
-    command :unlock, unlock_desc, :templateid do
-        helper.perform_action(args[0], options, 'VN Template unlocked') do |t|
+    command :unlock, unlock_desc, [:range, :templateid_list] do
+        helper.perform_actions(args[0], options, 'VN Template unlocked') do |t|
             t.unlock
         end
     end
diff --git a/src/cli/onevrouter b/src/cli/onevrouter
index 270697ebd0..64a993c0c0 100755
--- a/src/cli/onevrouter
+++ b/src/cli/onevrouter
@@ -364,9 +364,9 @@ CommandParser::CmdParser.new(ARGV) do
         [Admin]: locks only Admin actions.
     EOT
 
-    command :lock, lock_desc, :vrouterid,
+    command :lock, lock_desc, [:range, :vrouterid_list],
             :options => [USE, MANAGE, ADMIN, ALL] do
-        helper.perform_action(args[0], options, 'VRouter locked') do |vr|
+        helper.perform_actions(args[0], options, 'VRouter locked') do |vr|
             if !options[:use].nil?
                 level = 1
             elsif !options[:manage].nil?
@@ -387,8 +387,8 @@ CommandParser::CmdParser.new(ARGV) do
         valid states are: All.
     EOT
 
-    command :unlock, unlock_desc, :vrouterid do
-        helper.perform_action(args[0], options, 'VRouter unlocked') do |vr|
+    command :unlock, unlock_desc, [:range, :vrouterid_list] do
+        helper.perform_actions(args[0], options, 'VRouter unlocked') do |vr|
             vr.unlock
         end
     end