diff --git a/pandora_agents/unix/Linux/pandora_agent.conf b/pandora_agents/unix/Linux/pandora_agent.conf
index a28311cc47..c252217e86 100755
--- a/pandora_agents/unix/Linux/pandora_agent.conf
+++ b/pandora_agents/unix/Linux/pandora_agent.conf
@@ -44,7 +44,7 @@ udp_server_auth_address 0.0.0.0
 #description This is a demo agent for Linux
 
 # Group assigned for this agent (descriptive, p.e: Servers)
-#group Servers
+group Servers
 
 # address: Enforce to server a ip address to this agent 
 # You can also try to detect the first IP using "auto", for example
@@ -175,6 +175,17 @@ module_max_critical 100
 module_unit %
 module_end
 
+# vmstat syntax depends on linux distro and vmstat command version, please check before use it
+module_begin
+module_name CPU IOWait
+module_type generic_data
+module_interval 1
+module_exec vmstat 1 2 | tail -1 | awk '{ print $16 }'
+module_min_warning 10
+module_min_critical 16
+module_unit %
+module_end
+
 #Get load average
 module_begin 
 module_name Load Average
@@ -203,7 +214,7 @@ module_end
 module_begin
 module_name Number processes
 module_type generic_data
-module_exec ps -A | tail --lines=+5 | wc -l
+module_exec ps aux | wc -l
 module_description Total processes
 module_min_warning 150
 module_max_warning 249
@@ -240,11 +251,9 @@ module_plugin pandora_netusage
 module_plugin grep_log /var/log/syslog Syslog_error ERROR
 
 # Plugin for inventory on the agent (Only Enterprise)
-
-module_plugin inventory 1 cpu ram video nic hd cdrom software init_services filesystem users route
+# module_plugin inventory 1 cpu ram video nic hd cdrom software init_services filesystem users route
 
 # Log collection modules. Only for enterprise version, this will collect log files for forensic analysis.
-
 # This is for LOG monitoring, only on enterprise version
 #module_plugin grep_log_module /var/log/messages Syslog \.\*