diff --git a/src/cli/etc/onecluster.yaml b/src/cli/etc/onecluster.yaml
index b69de015c6..f3d4949e85 100644
--- a/src/cli/etc/onecluster.yaml
+++ b/src/cli/etc/onecluster.yaml
@@ -8,7 +8,24 @@
   :size: 15
   :left: true
 
+:HOSTS:
+  :desc: Number of Hosts
+  :size: 5
+  :left: true
+
+:NETS:
+  :desc: Number of Networks
+  :size: 5
+  :left: true
+
+:DATASTORES:
+  :desc: Number of Datastores 
+  :size: 10
+  :left: true
+
 :default:
 - :ID
 - :NAME
-
+- :HOSTS
+- :NETS
+- :DATASTORES
diff --git a/src/cli/one_helper/onecluster_helper.rb b/src/cli/one_helper/onecluster_helper.rb
index fbf82b0a8a..4e837f9a29 100644
--- a/src/cli/one_helper/onecluster_helper.rb
+++ b/src/cli/one_helper/onecluster_helper.rb
@@ -51,7 +51,19 @@ class OneClusterHelper < OpenNebulaHelper::OneHelper
                 d["NAME"]
             end
 
-            default :ID, :NAME
+            column :HOSTS, "Number of Hosts", :left, :size=>5 do |d|
+                d["HOSTS"].size
+            end
+
+            column :NETS, "Number of Networks", :left, :size=>5 do |d|
+                d["HOSTS"].size
+            end
+
+            column :DATASTORES, "Number of Datastores", :left, :size=>10 do |d|
+                d["DATASTORES"].size
+            end
+
+            default :ID, :NAME, :HOSTS, :NETS, :DATASTORES
         end
 
         table
@@ -86,16 +98,16 @@ class OneClusterHelper < OpenNebulaHelper::OneHelper
             puts "%-15s" % [id]
         end
 
-        puts
-        CLIHelper.print_header("%-15s" % ["DATASTORES"])
-        cluster.datastore_ids.each do |id|
-            puts "%-15s" % [id]
-        end
-
         puts
         CLIHelper.print_header("%-15s" % ["VNETS"])
         cluster.vnet_ids.each do |id|
             puts "%-15s" % [id]
         end
+
+        puts
+        CLIHelper.print_header("%-15s" % ["DATASTORES"])
+        cluster.datastore_ids.each do |id|
+            puts "%-15s" % [id]
+        end
     end
 end
diff --git a/src/cli/one_helper/onedatastore_helper.rb b/src/cli/one_helper/onedatastore_helper.rb
index a143379d24..16f68d6e6b 100644
--- a/src/cli/one_helper/onedatastore_helper.rb
+++ b/src/cli/one_helper/onedatastore_helper.rb
@@ -121,12 +121,12 @@ class OneDatastoreHelper < OpenNebulaHelper::OneHelper
         }
         puts
 
-        CLIHelper.print_header(str_h1 % "DATASTORE TEMPLATE",false)
+        CLIHelper.print_header(str_h1 % "DATASTORE TEMPLATE", false)
         puts datastore.template_str
 
         puts
 
-        CLIHelper.print_header(str_h1 % "REGISTERED IMAGES", false)
+        CLIHelper.print_header("%-15s" % "IMAGES")
         datastore.img_ids.each do |id|
             puts "%-15s" % [id]
         end