diff --git a/apps/vmware/connector/mode/cpuvm.pm b/apps/vmware/connector/mode/cpuvm.pm
new file mode 100644
index 000000000..6bd93d7fb
--- /dev/null
+++ b/apps/vmware/connector/mode/cpuvm.pm
@@ -0,0 +1,232 @@
+################################################################################
+# Copyright 2005-2014 MERETHIS
+# Centreon is developped by : Julien Mathis and Romain Le Merlus under
+# GPL Licence 2.0.
+# 
+# This program is free software; you can redistribute it and/or modify it under 
+# the terms of the GNU General Public License as published by the Free Software 
+# Foundation ; either version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+# PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along with 
+# this program; if not, see <http://www.gnu.org/licenses>.
+# 
+# Linking this program statically or dynamically with other modules is making a 
+# combined work based on this program. Thus, the terms and conditions of the GNU 
+# General Public License cover the whole combination.
+# 
+# As a special exception, the copyright holders of this program give MERETHIS 
+# permission to link this program with independent modules to produce an executable, 
+# regardless of the license terms of these independent modules, and to copy and 
+# distribute the resulting executable under terms of MERETHIS choice, provided that 
+# MERETHIS also meet, for each linked independent module, the terms  and conditions 
+# of the license of that module. An independent module is a module which is not 
+# derived from this program. If you modify this program, you may extend this 
+# exception to your version of the program, but you are not obliged to do so. If you
+# do not wish to do so, delete this exception statement from your version.
+# 
+# For more information : contact@centreon.com
+# Authors : Quentin Garnier <qgarnier@merethis.com>
+#
+####################################################################################
+
+package apps::vmware::connector::mode::cpuvm;
+
+use base qw(centreon::plugins::mode);
+
+use strict;
+use warnings;
+use apps::vmware::connector::lib::common;
+use ZMQ::LibZMQ3;
+use ZMQ::Constants qw(:all);
+use UUID;
+
+sub new {
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    bless $self, $class;
+    
+    $self->{version} = '1.0';
+    $options{options}->add_options(arguments =>
+                                { 
+                                  "connector-hostname:s"    => { name => 'connector_hostname' },
+                                  "connector-port:s"        => { name => 'connector_port', default => 5700 },
+                                  "container:s"             => { name => 'container', default => 'default' },
+                                  "vm-hostname:s"           => { name => 'vm_hostname' },
+                                  "filter"                  => { name => 'filter' },
+                                  "disconnect-status:s"     => { name => 'disconnect_status', default => 'unknown' },
+                                  "nopoweredon-status:s"    => { name => 'nopoweredon_status', default => 'unknown' },
+                                  "warning-usagemhz:s"      => { name => 'warning_usagemhz' },
+                                  "critical-usagemhz:s"     => { name => 'critical_usagemhz' },
+                                  "warning-usage:s"         => { name => 'warning_usage' },
+                                  "critical-usage:s"        => { name => 'critical_usage' },
+                                  "warning-ready:s"         => { name => 'warning_ready' },
+                                  "critical-ready:s"        => { name => 'critical_ready' },
+                                  "timeout:s"               => { name => 'timeout', default => 50 },
+                                });
+    $self->{json_send} = {};
+    return $self;
+}
+
+sub check_options {
+    my ($self, %options) = @_;
+    $self->SUPER::init(%options);
+
+    if (!defined($self->{option_results}->{connector_hostname}) ||
+        $self->{option_results}->{connector_hostname} eq '') {
+        $self->{output}->add_option_msg(short_msg => "Please set option --connector-hostname.");
+        $self->{output}->option_exit();
+    }
+    if (defined($self->{option_results}->{timeout}) && $self->{option_results}->{timeout} =~ /^\d+$/ &&
+        $self->{option_results}->{timeout} > 0) {
+        $self->{timeout} = $self->{option_results}->{timeout};
+    } else {
+        $self->{timeout} = 50;
+    }
+    
+    foreach my $label (('warning_usagemhz', 'critical_usagemhz', 'warning_usage', 'critical_usage', 'warning_ready', 'critical_ready')) {
+        if (($self->{perfdata}->threshold_validate(label => $label, value => $self->{option_results}->{$label})) == 0) {
+            my ($label_opt) = $label;
+            $label_opt =~ tr/_/-/;
+            $self->{output}->add_option_msg(short_msg => "Wrong " . $label_opt . " threshold '" . $self->{option_results}->{$label} . "'.");
+            $self->{output}->option_exit();
+        }
+    }
+
+    if ($self->{output}->is_litteral_status(status => $self->{option_results}->{disconnect_status}) == 0) {
+        $self->{output}->add_option_msg(short_msg => "Wrong disconnect-status option '" . $self->{option_results}->{disconnect_status} . "'.");
+        $self->{output}->option_exit();
+    }
+    if ($self->{output}->is_litteral_status(status => $self->{option_results}->{nopoweredon_status}) == 0) {
+        $self->{output}->add_option_msg(short_msg => "Wrong nopoweredon-status option '" . $self->{option_results}->{nopoweredon_status} . "'.");
+        $self->{output}->option_exit();
+    }
+}
+
+sub build_request {
+    my ($self, %options) = @_;
+    
+    $self->{json_send}->{identity} = 'client-' . unpack('H*', $options{uuid});
+    $self->{json_send}->{command} = 'cpuvm';
+    foreach (keys %{$self->{option_results}}) {
+        $self->{json_send}->{$_} = $self->{option_results}->{$_};
+    }
+}
+
+sub run {
+    my ($self, %options) = @_;
+
+    my $uuid;
+    my $context = zmq_init();
+    $self->{requester} = zmq_socket($context, ZMQ_DEALER);
+    if (!defined($self->{requester})) {
+        $self->{output}->add_option_msg(short_msg => "Cannot create socket: $!");
+        $self->{output}->option_exit();
+    }
+    
+    my $flag = ZMQ_NOBLOCK | ZMQ_SNDMORE;
+    UUID::generate($uuid);
+    zmq_setsockopt($self->{requester}, ZMQ_IDENTITY, "client-" . $uuid);
+    zmq_setsockopt($self->{requester}, ZMQ_LINGER, 0); # we discard
+    zmq_connect($self->{requester}, 'tcp://' . $self->{option_results}->{connector_hostname} . ':' . $self->{option_results}->{connector_port});
+    
+    $self->build_request(uuid => $uuid);
+    
+    zmq_sendmsg($self->{requester}, "REQCLIENT " . JSON->new->utf8->encode($self->{json_send}), ZMQ_NOBLOCK);
+    
+    my @poll = (
+        {
+            socket  => $self->{requester},
+            events  => ZMQ_POLLIN,
+            callback => sub {
+               my $response = zmq_recvmsg($self->{requester});
+               zmq_close($self->{requester});
+               apps::vmware::connector::lib::common::connector_response($self, response => $response);
+               $self->{output}->display();
+               $self->{output}->exit();
+            },
+        },
+    );
+    
+    zmq_poll(\@poll, $self->{timeout} * 1000);    
+    zmq_close($self->{requester});
+    
+    $self->{output}->output_add(severity => 'UNKNOWN',
+                                short_msg => sprintf("Cannot get response (timeout received)"));
+    $self->{output}->display();
+    $self->{output}->exit();
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+Check virtual machine cpu usage.
+
+=over 8
+
+=item B<--connector-hostname>
+
+Connector hostname (required).
+
+=item B<--connector-port>
+
+Connector port (default: 5700).
+
+=item B<--container>
+
+Container to use (it depends of the connector configuration).
+
+=item B<--vm-hostname>
+
+VM hostname to check.
+If not set, we check all VMs.
+
+=item B<--filter>
+
+VM hostname is a regexp.
+
+=item B<--disconnect-status>
+
+Status if VM disconnected (default: 'unknown').
+
+=item B<--nopoweredon-status>
+
+Status if VM is not poweredOn (default: 'unknown').
+
+=item B<--timeout>
+
+Set global execution timeout (Default: 50)
+
+=item B<--warning-usagemhz>
+
+Threshold warning in mhz.
+
+=item B<--critical-usagemhz>
+
+Threshold critical in mhz.
+
+=item B<--warning-usage>
+
+Threshold warning in percent.
+
+=item B<--critical-usage>
+
+Threshold critical in percent.
+
+=item B<--warning-ready>
+
+Threshold warning in percent.
+
+=item B<--critical-ready>
+
+Threshold critical in percent.
+
+=back
+
+=cut
diff --git a/apps/vmware/connector/mode/limitvm.pm b/apps/vmware/connector/mode/limitvm.pm
new file mode 100644
index 000000000..fb0e9466d
--- /dev/null
+++ b/apps/vmware/connector/mode/limitvm.pm
@@ -0,0 +1,221 @@
+################################################################################
+# Copyright 2005-2014 MERETHIS
+# Centreon is developped by : Julien Mathis and Romain Le Merlus under
+# GPL Licence 2.0.
+# 
+# This program is free software; you can redistribute it and/or modify it under 
+# the terms of the GNU General Public License as published by the Free Software 
+# Foundation ; either version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+# PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along with 
+# this program; if not, see <http://www.gnu.org/licenses>.
+# 
+# Linking this program statically or dynamically with other modules is making a 
+# combined work based on this program. Thus, the terms and conditions of the GNU 
+# General Public License cover the whole combination.
+# 
+# As a special exception, the copyright holders of this program give MERETHIS 
+# permission to link this program with independent modules to produce an executable, 
+# regardless of the license terms of these independent modules, and to copy and 
+# distribute the resulting executable under terms of MERETHIS choice, provided that 
+# MERETHIS also meet, for each linked independent module, the terms  and conditions 
+# of the license of that module. An independent module is a module which is not 
+# derived from this program. If you modify this program, you may extend this 
+# exception to your version of the program, but you are not obliged to do so. If you
+# do not wish to do so, delete this exception statement from your version.
+# 
+# For more information : contact@centreon.com
+# Authors : Quentin Garnier <qgarnier@merethis.com>
+#
+####################################################################################
+
+package apps::vmware::connector::mode::limitvm;
+
+use base qw(centreon::plugins::mode);
+
+use strict;
+use warnings;
+use apps::vmware::connector::lib::common;
+use ZMQ::LibZMQ3;
+use ZMQ::Constants qw(:all);
+use UUID;
+
+sub new {
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    bless $self, $class;
+    
+    $self->{version} = '1.0';
+    $options{options}->add_options(arguments =>
+                                { 
+                                  "connector-hostname:s"    => { name => 'connector_hostname' },
+                                  "connector-port:s"        => { name => 'connector_port', default => 5700 },
+                                  "container:s"             => { name => 'container', default => 'default' },
+                                  "vm-hostname:s"           => { name => 'vm_hostname' },
+                                  "filter"                  => { name => 'filter' },
+                                  "disconnect-status:s"     => { name => 'disconnect_status', default => 'unknown' },
+                                  "cpu-limitset-status:s"       => { name => 'cpu_limitset_status', default => 'critical' },
+                                  "memory-limitset-status:s"    => { name => 'memory_limitset_status', default => 'critical' },
+                                  "disk-limitset-status:s"      => { name => 'disk_limitset_status', default => 'critical' },
+                                  "nopoweredon-skip"        => { name => 'nopoweredon_skip' },
+                                  "check-disk-limit"        => { name => 'check_disk_limit' },
+                                  "timeout:s"               => { name => 'timeout', default => 50 },
+                                });
+    $self->{json_send} = {};
+    return $self;
+}
+
+sub check_options {
+    my ($self, %options) = @_;
+    $self->SUPER::init(%options);
+
+    if (!defined($self->{option_results}->{connector_hostname}) ||
+        $self->{option_results}->{connector_hostname} eq '') {
+        $self->{output}->add_option_msg(short_msg => "Please set option --connector-hostname.");
+        $self->{output}->option_exit();
+    }
+    if (defined($self->{option_results}->{timeout}) && $self->{option_results}->{timeout} =~ /^\d+$/ &&
+        $self->{option_results}->{timeout} > 0) {
+        $self->{timeout} = $self->{option_results}->{timeout};
+    } else {
+        $self->{timeout} = 50;
+    }
+
+    if ($self->{output}->is_litteral_status(status => $self->{option_results}->{disconnect_status}) == 0) {
+        $self->{output}->add_option_msg(short_msg => "Wrong disconnect-status option '" . $self->{option_results}->{disconnect_status} . "'.");
+        $self->{output}->option_exit();
+    }
+    if ($self->{output}->is_litteral_status(status => $self->{option_results}->{cpu_limitset_status}) == 0) {
+        $self->{output}->add_option_msg(short_msg => "Wrong cpu-limitset-status option '" . $self->{option_results}->{cpu_limitset_status} . "'.");
+        $self->{output}->option_exit();
+    }
+    if ($self->{output}->is_litteral_status(status => $self->{option_results}->{memory_limitset_status}) == 0) {
+        $self->{output}->add_option_msg(short_msg => "Wrong memory-limitset-status option '" . $self->{option_results}->{memory_limitset_status} . "'.");
+        $self->{output}->option_exit();
+    }
+    if ($self->{output}->is_litteral_status(status => $self->{option_results}->{disk_limitset_status}) == 0) {
+        $self->{output}->add_option_msg(short_msg => "Wrong disk-limitset-status option '" . $self->{option_results}->{disk_limitset_status} . "'.");
+        $self->{output}->option_exit();
+    }
+}
+
+sub build_request {
+    my ($self, %options) = @_;
+    
+    $self->{json_send}->{identity} = 'client-' . unpack('H*', $options{uuid});
+    $self->{json_send}->{command} = 'limitvm';
+    foreach (keys %{$self->{option_results}}) {
+        $self->{json_send}->{$_} = $self->{option_results}->{$_};
+    }
+}
+
+sub run {
+    my ($self, %options) = @_;
+
+    my $uuid;
+    my $context = zmq_init();
+    $self->{requester} = zmq_socket($context, ZMQ_DEALER);
+    if (!defined($self->{requester})) {
+        $self->{output}->add_option_msg(short_msg => "Cannot create socket: $!");
+        $self->{output}->option_exit();
+    }
+    
+    my $flag = ZMQ_NOBLOCK | ZMQ_SNDMORE;
+    UUID::generate($uuid);
+    zmq_setsockopt($self->{requester}, ZMQ_IDENTITY, "client-" . $uuid);
+    zmq_setsockopt($self->{requester}, ZMQ_LINGER, 0); # we discard
+    zmq_connect($self->{requester}, 'tcp://' . $self->{option_results}->{connector_hostname} . ':' . $self->{option_results}->{connector_port});
+    
+    $self->build_request(uuid => $uuid);
+    
+    zmq_sendmsg($self->{requester}, "REQCLIENT " . JSON->new->utf8->encode($self->{json_send}), ZMQ_NOBLOCK);
+    
+    my @poll = (
+        {
+            socket  => $self->{requester},
+            events  => ZMQ_POLLIN,
+            callback => sub {
+               my $response = zmq_recvmsg($self->{requester});
+               zmq_close($self->{requester});
+               apps::vmware::connector::lib::common::connector_response($self, response => $response);
+               $self->{output}->display();
+               $self->{output}->exit();
+            },
+        },
+    );
+    
+    zmq_poll(\@poll, $self->{timeout} * 1000);    
+    zmq_close($self->{requester});
+    
+    $self->{output}->output_add(severity => 'UNKNOWN',
+                                short_msg => sprintf("Cannot get response (timeout received)"));
+    $self->{output}->display();
+    $self->{output}->exit();
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+Check virtual machine tools.
+
+=over 8
+
+=item B<--connector-hostname>
+
+Connector hostname (required).
+
+=item B<--connector-port>
+
+Connector port (default: 5700).
+
+=item B<--container>
+
+Container to use (it depends of the connector configuration).
+
+=item B<--vm-hostname>
+
+VM hostname to check.
+If not set, we check all VMs.
+
+=item B<--filter>
+
+VM hostname is a regexp.
+
+=item B<--disconnect-status>
+
+Status if VM disconnected (default: 'unknown').
+
+=item B<--nopoweredon-skip>
+
+Skip check if VM is not poweredOn.
+
+=item B<--timeout>
+
+Set global execution timeout (Default: 50)
+
+=item B<--cpu-limitset-status>
+
+Status if cpu limit is set (default: critical).
+
+=item B<--memory-limitset-status>
+
+Status if memory limit is set (default: critical).
+
+=item B<--disk-limitset-status>
+
+Status if disk limit is set (default: critical).
+
+=item B<--check-disk-limit>
+
+Check disk limits (since vsphere 5.0)?
+
+=back
+
+=cut
diff --git a/apps/vmware/connector/mode/snapshotvm.pm b/apps/vmware/connector/mode/snapshotvm.pm
new file mode 100644
index 000000000..f0338df59
--- /dev/null
+++ b/apps/vmware/connector/mode/snapshotvm.pm
@@ -0,0 +1,213 @@
+################################################################################
+# Copyright 2005-2014 MERETHIS
+# Centreon is developped by : Julien Mathis and Romain Le Merlus under
+# GPL Licence 2.0.
+# 
+# This program is free software; you can redistribute it and/or modify it under 
+# the terms of the GNU General Public License as published by the Free Software 
+# Foundation ; either version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+# PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along with 
+# this program; if not, see <http://www.gnu.org/licenses>.
+# 
+# Linking this program statically or dynamically with other modules is making a 
+# combined work based on this program. Thus, the terms and conditions of the GNU 
+# General Public License cover the whole combination.
+# 
+# As a special exception, the copyright holders of this program give MERETHIS 
+# permission to link this program with independent modules to produce an executable, 
+# regardless of the license terms of these independent modules, and to copy and 
+# distribute the resulting executable under terms of MERETHIS choice, provided that 
+# MERETHIS also meet, for each linked independent module, the terms  and conditions 
+# of the license of that module. An independent module is a module which is not 
+# derived from this program. If you modify this program, you may extend this 
+# exception to your version of the program, but you are not obliged to do so. If you
+# do not wish to do so, delete this exception statement from your version.
+# 
+# For more information : contact@centreon.com
+# Authors : Quentin Garnier <qgarnier@merethis.com>
+#
+####################################################################################
+
+package apps::vmware::connector::mode::snapshotvm;
+
+use base qw(centreon::plugins::mode);
+
+use strict;
+use warnings;
+use apps::vmware::connector::lib::common;
+use ZMQ::LibZMQ3;
+use ZMQ::Constants qw(:all);
+use UUID;
+
+sub new {
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    bless $self, $class;
+    
+    $self->{version} = '1.0';
+    $options{options}->add_options(arguments =>
+                                { 
+                                  "connector-hostname:s"    => { name => 'connector_hostname' },
+                                  "connector-port:s"        => { name => 'connector_port', default => 5700 },
+                                  "container:s"             => { name => 'container', default => 'default' },
+                                  "vm-hostname:s"           => { name => 'vm_hostname' },
+                                  "filter"                  => { name => 'filter' },
+                                  "disconnect-status:s"     => { name => 'disconnect_status', default => 'unknown' },
+                                  "nopoweredon-skip"        => { name => 'nopoweredon_skip' },
+                                  "check-consolidation"     => { name => 'check_consolidation' },
+                                  "warning:s"               => { name => 'warning' },
+                                  "critical:s"              => { name => 'critical' },
+                                  "timeout:s"               => { name => 'timeout', default => 50 },
+                                });
+    $self->{json_send} = {};
+    return $self;
+}
+
+sub check_options {
+    my ($self, %options) = @_;
+    $self->SUPER::init(%options);
+
+    if (!defined($self->{option_results}->{connector_hostname}) ||
+        $self->{option_results}->{connector_hostname} eq '') {
+        $self->{output}->add_option_msg(short_msg => "Please set option --connector-hostname.");
+        $self->{output}->option_exit();
+    }
+    if (defined($self->{option_results}->{timeout}) && $self->{option_results}->{timeout} =~ /^\d+$/ &&
+        $self->{option_results}->{timeout} > 0) {
+        $self->{timeout} = $self->{option_results}->{timeout};
+    } else {
+        $self->{timeout} = 50;
+    }
+    
+    foreach my $label (('warning', 'critical')) {
+        if (($self->{perfdata}->threshold_validate(label => $label, value => $self->{option_results}->{$label})) == 0) {
+            my ($label_opt) = $label;
+            $label_opt =~ tr/_/-/;
+            $self->{output}->add_option_msg(short_msg => "Wrong " . $label_opt . " threshold '" . $self->{option_results}->{$label} . "'.");
+            $self->{output}->option_exit();
+        }
+    }
+
+    if ($self->{output}->is_litteral_status(status => $self->{option_results}->{disconnect_status}) == 0) {
+        $self->{output}->add_option_msg(short_msg => "Wrong disconnect-status option '" . $self->{option_results}->{disconnect_status} . "'.");
+        $self->{output}->option_exit();
+    }
+}
+
+sub build_request {
+    my ($self, %options) = @_;
+    
+    $self->{json_send}->{identity} = 'client-' . unpack('H*', $options{uuid});
+    $self->{json_send}->{command} = 'snapshotvm';
+    foreach (keys %{$self->{option_results}}) {
+        $self->{json_send}->{$_} = $self->{option_results}->{$_};
+    }
+}
+
+sub run {
+    my ($self, %options) = @_;
+
+    my $uuid;
+    my $context = zmq_init();
+    $self->{requester} = zmq_socket($context, ZMQ_DEALER);
+    if (!defined($self->{requester})) {
+        $self->{output}->add_option_msg(short_msg => "Cannot create socket: $!");
+        $self->{output}->option_exit();
+    }
+    
+    my $flag = ZMQ_NOBLOCK | ZMQ_SNDMORE;
+    UUID::generate($uuid);
+    zmq_setsockopt($self->{requester}, ZMQ_IDENTITY, "client-" . $uuid);
+    zmq_setsockopt($self->{requester}, ZMQ_LINGER, 0); # we discard
+    zmq_connect($self->{requester}, 'tcp://' . $self->{option_results}->{connector_hostname} . ':' . $self->{option_results}->{connector_port});
+    
+    $self->build_request(uuid => $uuid);
+    
+    zmq_sendmsg($self->{requester}, "REQCLIENT " . JSON->new->utf8->encode($self->{json_send}), ZMQ_NOBLOCK);
+    
+    my @poll = (
+        {
+            socket  => $self->{requester},
+            events  => ZMQ_POLLIN,
+            callback => sub {
+               my $response = zmq_recvmsg($self->{requester});
+               zmq_close($self->{requester});
+               apps::vmware::connector::lib::common::connector_response($self, response => $response);
+               $self->{output}->display();
+               $self->{output}->exit();
+            },
+        },
+    );
+    
+    zmq_poll(\@poll, $self->{timeout} * 1000);    
+    zmq_close($self->{requester});
+    
+    $self->{output}->output_add(severity => 'UNKNOWN',
+                                short_msg => sprintf("Cannot get response (timeout received)"));
+    $self->{output}->display();
+    $self->{output}->exit();
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+Check virtual machine snapshots.
+
+=over 8
+
+=item B<--connector-hostname>
+
+Connector hostname (required).
+
+=item B<--connector-port>
+
+Connector port (default: 5700).
+
+=item B<--container>
+
+Container to use (it depends of the connector configuration).
+
+=item B<--vm-hostname>
+
+VM hostname to check.
+If not set, we check all VMs.
+
+=item B<--filter>
+
+VM hostname is a regexp.
+
+=item B<--disconnect-status>
+
+Status if VM disconnected (default: 'unknown').
+
+=item B<--nopoweredon-skip>
+
+Skip check if VM is not poweredOn.
+
+=item B<--timeout>
+
+Set global execution timeout (Default: 50)
+
+=item B<--warning>
+
+Threshold warning in seconds.
+
+=item B<--critical>
+
+Threshold critical in seconds.
+
+=item B<--check-consolidation>
+
+Check if VM needs consolidation (since vsphere 5.0).
+
+=back
+
+=cut
diff --git a/apps/vmware/connector/mode/swapvm.pm b/apps/vmware/connector/mode/swapvm.pm
new file mode 100644
index 000000000..85461010c
--- /dev/null
+++ b/apps/vmware/connector/mode/swapvm.pm
@@ -0,0 +1,212 @@
+################################################################################
+# Copyright 2005-2014 MERETHIS
+# Centreon is developped by : Julien Mathis and Romain Le Merlus under
+# GPL Licence 2.0.
+# 
+# This program is free software; you can redistribute it and/or modify it under 
+# the terms of the GNU General Public License as published by the Free Software 
+# Foundation ; either version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+# PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along with 
+# this program; if not, see <http://www.gnu.org/licenses>.
+# 
+# Linking this program statically or dynamically with other modules is making a 
+# combined work based on this program. Thus, the terms and conditions of the GNU 
+# General Public License cover the whole combination.
+# 
+# As a special exception, the copyright holders of this program give MERETHIS 
+# permission to link this program with independent modules to produce an executable, 
+# regardless of the license terms of these independent modules, and to copy and 
+# distribute the resulting executable under terms of MERETHIS choice, provided that 
+# MERETHIS also meet, for each linked independent module, the terms  and conditions 
+# of the license of that module. An independent module is a module which is not 
+# derived from this program. If you modify this program, you may extend this 
+# exception to your version of the program, but you are not obliged to do so. If you
+# do not wish to do so, delete this exception statement from your version.
+# 
+# For more information : contact@centreon.com
+# Authors : Quentin Garnier <qgarnier@merethis.com>
+#
+####################################################################################
+
+package apps::vmware::connector::mode::swapvm;
+
+use base qw(centreon::plugins::mode);
+
+use strict;
+use warnings;
+use apps::vmware::connector::lib::common;
+use ZMQ::LibZMQ3;
+use ZMQ::Constants qw(:all);
+use UUID;
+
+sub new {
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    bless $self, $class;
+    
+    $self->{version} = '1.0';
+    $options{options}->add_options(arguments =>
+                                { 
+                                  "connector-hostname:s"    => { name => 'connector_hostname' },
+                                  "connector-port:s"        => { name => 'connector_port', default => 5700 },
+                                  "container:s"             => { name => 'container', default => 'default' },
+                                  "vm-hostname:s"           => { name => 'vm_hostname' },
+                                  "filter"                  => { name => 'filter' },
+                                  "disconnect-status:s"     => { name => 'disconnect_status', default => 'unknown' },
+                                  "nopoweredon-status:s"    => { name => 'nopoweredon_status', default => 'unknown' },
+                                  "warning:s"               => { name => 'warning' },
+                                  "critical:s"              => { name => 'critical' },
+                                  "timeout:s"               => { name => 'timeout', default => 50 },
+                                });
+    $self->{json_send} = {};
+    return $self;
+}
+
+sub check_options {
+    my ($self, %options) = @_;
+    $self->SUPER::init(%options);
+
+    if (!defined($self->{option_results}->{connector_hostname}) ||
+        $self->{option_results}->{connector_hostname} eq '') {
+        $self->{output}->add_option_msg(short_msg => "Please set option --connector-hostname.");
+        $self->{output}->option_exit();
+    }
+    if (defined($self->{option_results}->{timeout}) && $self->{option_results}->{timeout} =~ /^\d+$/ &&
+        $self->{option_results}->{timeout} > 0) {
+        $self->{timeout} = $self->{option_results}->{timeout};
+    } else {
+        $self->{timeout} = 50;
+    }
+    
+    foreach my $label (('warning', 'critical')) {
+        if (($self->{perfdata}->threshold_validate(label => $label, value => $self->{option_results}->{$label})) == 0) {
+            my ($label_opt) = $label;
+            $label_opt =~ tr/_/-/;
+            $self->{output}->add_option_msg(short_msg => "Wrong " . $label_opt . " threshold '" . $self->{option_results}->{$label} . "'.");
+            $self->{output}->option_exit();
+        }
+    }
+
+    if ($self->{output}->is_litteral_status(status => $self->{option_results}->{disconnect_status}) == 0) {
+        $self->{output}->add_option_msg(short_msg => "Wrong disconnect-status option '" . $self->{option_results}->{disconnect_status} . "'.");
+        $self->{output}->option_exit();
+    }
+    if ($self->{output}->is_litteral_status(status => $self->{option_results}->{nopoweredon_status}) == 0) {
+        $self->{output}->add_option_msg(short_msg => "Wrong nopoweredon-status option '" . $self->{option_results}->{nopoweredon_status} . "'.");
+        $self->{output}->option_exit();
+    }
+}
+
+sub build_request {
+    my ($self, %options) = @_;
+    
+    $self->{json_send}->{identity} = 'client-' . unpack('H*', $options{uuid});
+    $self->{json_send}->{command} = 'swapvm';
+    foreach (keys %{$self->{option_results}}) {
+        $self->{json_send}->{$_} = $self->{option_results}->{$_};
+    }
+}
+
+sub run {
+    my ($self, %options) = @_;
+
+    my $uuid;
+    my $context = zmq_init();
+    $self->{requester} = zmq_socket($context, ZMQ_DEALER);
+    if (!defined($self->{requester})) {
+        $self->{output}->add_option_msg(short_msg => "Cannot create socket: $!");
+        $self->{output}->option_exit();
+    }
+    
+    my $flag = ZMQ_NOBLOCK | ZMQ_SNDMORE;
+    UUID::generate($uuid);
+    zmq_setsockopt($self->{requester}, ZMQ_IDENTITY, "client-" . $uuid);
+    zmq_setsockopt($self->{requester}, ZMQ_LINGER, 0); # we discard
+    zmq_connect($self->{requester}, 'tcp://' . $self->{option_results}->{connector_hostname} . ':' . $self->{option_results}->{connector_port});
+    
+    $self->build_request(uuid => $uuid);
+    
+    zmq_sendmsg($self->{requester}, "REQCLIENT " . JSON->new->utf8->encode($self->{json_send}), ZMQ_NOBLOCK);
+    
+    my @poll = (
+        {
+            socket  => $self->{requester},
+            events  => ZMQ_POLLIN,
+            callback => sub {
+               my $response = zmq_recvmsg($self->{requester});
+               zmq_close($self->{requester});
+               apps::vmware::connector::lib::common::connector_response($self, response => $response);
+               $self->{output}->display();
+               $self->{output}->exit();
+            },
+        },
+    );
+    
+    zmq_poll(\@poll, $self->{timeout} * 1000);    
+    zmq_close($self->{requester});
+    
+    $self->{output}->output_add(severity => 'UNKNOWN',
+                                short_msg => sprintf("Cannot get response (timeout received)"));
+    $self->{output}->display();
+    $self->{output}->exit();
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+Check virtual machine swap rate usage.
+
+=over 8
+
+=item B<--connector-hostname>
+
+Connector hostname (required).
+
+=item B<--connector-port>
+
+Connector port (default: 5700).
+
+=item B<--container>
+
+Container to use (it depends of the connector configuration).
+
+=item B<--vm-hostname>
+
+VM hostname to check.
+If not set, we check all VMs.
+
+=item B<--filter>
+
+VM hostname is a regexp.
+
+=item B<--disconnect-status>
+
+Status if VM disconnected (default: 'unknown').
+
+=item B<--nopoweredon-status>
+
+Status if VM is not poweredOn (default: 'unknown').
+
+=item B<--timeout>
+
+Set global execution timeout (Default: 50)
+
+=item B<--warning>
+
+Threshold warning in bytes per seconds.
+
+=item B<--critical>
+
+Threshold critical in bytes per seconds.
+
+=back
+
+=cut
diff --git a/apps/vmware/connector/mode/toolsvm.pm b/apps/vmware/connector/mode/toolsvm.pm
new file mode 100644
index 000000000..45b560d6b
--- /dev/null
+++ b/apps/vmware/connector/mode/toolsvm.pm
@@ -0,0 +1,216 @@
+################################################################################
+# Copyright 2005-2014 MERETHIS
+# Centreon is developped by : Julien Mathis and Romain Le Merlus under
+# GPL Licence 2.0.
+# 
+# This program is free software; you can redistribute it and/or modify it under 
+# the terms of the GNU General Public License as published by the Free Software 
+# Foundation ; either version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+# PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along with 
+# this program; if not, see <http://www.gnu.org/licenses>.
+# 
+# Linking this program statically or dynamically with other modules is making a 
+# combined work based on this program. Thus, the terms and conditions of the GNU 
+# General Public License cover the whole combination.
+# 
+# As a special exception, the copyright holders of this program give MERETHIS 
+# permission to link this program with independent modules to produce an executable, 
+# regardless of the license terms of these independent modules, and to copy and 
+# distribute the resulting executable under terms of MERETHIS choice, provided that 
+# MERETHIS also meet, for each linked independent module, the terms  and conditions 
+# of the license of that module. An independent module is a module which is not 
+# derived from this program. If you modify this program, you may extend this 
+# exception to your version of the program, but you are not obliged to do so. If you
+# do not wish to do so, delete this exception statement from your version.
+# 
+# For more information : contact@centreon.com
+# Authors : Quentin Garnier <qgarnier@merethis.com>
+#
+####################################################################################
+
+package apps::vmware::connector::mode::toolsvm;
+
+use base qw(centreon::plugins::mode);
+
+use strict;
+use warnings;
+use apps::vmware::connector::lib::common;
+use ZMQ::LibZMQ3;
+use ZMQ::Constants qw(:all);
+use UUID;
+
+sub new {
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    bless $self, $class;
+    
+    $self->{version} = '1.0';
+    $options{options}->add_options(arguments =>
+                                { 
+                                  "connector-hostname:s"    => { name => 'connector_hostname' },
+                                  "connector-port:s"        => { name => 'connector_port', default => 5700 },
+                                  "container:s"             => { name => 'container', default => 'default' },
+                                  "vm-hostname:s"           => { name => 'vm_hostname' },
+                                  "filter"                  => { name => 'filter' },
+                                  "disconnect-status:s"     => { name => 'disconnect_status', default => 'unknown' },
+                                  "tools-notinstalled-status:s" => { name => 'tools_notinstalled_status', default => 'critical' },
+                                  "tools-notrunning-status:s"   => { name => 'tools_notrunning_status', default => 'critical' },
+                                  "tools-notup2date-status:s"   => { name => 'tools_notupd2date_status', default => 'warning' },
+                                  "nopoweredon-skip"        => { name => 'nopoweredon_skip' },
+                                  "timeout:s"               => { name => 'timeout', default => 50 },
+                                });
+    $self->{json_send} = {};
+    return $self;
+}
+
+sub check_options {
+    my ($self, %options) = @_;
+    $self->SUPER::init(%options);
+
+    if (!defined($self->{option_results}->{connector_hostname}) ||
+        $self->{option_results}->{connector_hostname} eq '') {
+        $self->{output}->add_option_msg(short_msg => "Please set option --connector-hostname.");
+        $self->{output}->option_exit();
+    }
+    if (defined($self->{option_results}->{timeout}) && $self->{option_results}->{timeout} =~ /^\d+$/ &&
+        $self->{option_results}->{timeout} > 0) {
+        $self->{timeout} = $self->{option_results}->{timeout};
+    } else {
+        $self->{timeout} = 50;
+    }
+
+    if ($self->{output}->is_litteral_status(status => $self->{option_results}->{disconnect_status}) == 0) {
+        $self->{output}->add_option_msg(short_msg => "Wrong disconnect-status option '" . $self->{option_results}->{disconnect_status} . "'.");
+        $self->{output}->option_exit();
+    }
+    if ($self->{output}->is_litteral_status(status => $self->{option_results}->{tools_notinstalled_status}) == 0) {
+        $self->{output}->add_option_msg(short_msg => "Wrong tools-notinstalled-status option '" . $self->{option_results}->{tools_notinstalled_status} . "'.");
+        $self->{output}->option_exit();
+    }
+    if ($self->{output}->is_litteral_status(status => $self->{option_results}->{tools_notrunning_status}) == 0) {
+        $self->{output}->add_option_msg(short_msg => "Wrong tools-notrunning-status option '" . $self->{option_results}->{tools_notrunning_status} . "'.");
+        $self->{output}->option_exit();
+    }
+    if ($self->{output}->is_litteral_status(status => $self->{option_results}->{tools_notupd2date_status}) == 0) {
+        $self->{output}->add_option_msg(short_msg => "Wrong tools-notupd2date-status option '" . $self->{option_results}->{tools_notupd2date_status} . "'.");
+        $self->{output}->option_exit();
+    }
+}
+
+sub build_request {
+    my ($self, %options) = @_;
+    
+    $self->{json_send}->{identity} = 'client-' . unpack('H*', $options{uuid});
+    $self->{json_send}->{command} = 'toolsvm';
+    foreach (keys %{$self->{option_results}}) {
+        $self->{json_send}->{$_} = $self->{option_results}->{$_};
+    }
+}
+
+sub run {
+    my ($self, %options) = @_;
+
+    my $uuid;
+    my $context = zmq_init();
+    $self->{requester} = zmq_socket($context, ZMQ_DEALER);
+    if (!defined($self->{requester})) {
+        $self->{output}->add_option_msg(short_msg => "Cannot create socket: $!");
+        $self->{output}->option_exit();
+    }
+    
+    my $flag = ZMQ_NOBLOCK | ZMQ_SNDMORE;
+    UUID::generate($uuid);
+    zmq_setsockopt($self->{requester}, ZMQ_IDENTITY, "client-" . $uuid);
+    zmq_setsockopt($self->{requester}, ZMQ_LINGER, 0); # we discard
+    zmq_connect($self->{requester}, 'tcp://' . $self->{option_results}->{connector_hostname} . ':' . $self->{option_results}->{connector_port});
+    
+    $self->build_request(uuid => $uuid);
+    
+    zmq_sendmsg($self->{requester}, "REQCLIENT " . JSON->new->utf8->encode($self->{json_send}), ZMQ_NOBLOCK);
+    
+    my @poll = (
+        {
+            socket  => $self->{requester},
+            events  => ZMQ_POLLIN,
+            callback => sub {
+               my $response = zmq_recvmsg($self->{requester});
+               zmq_close($self->{requester});
+               apps::vmware::connector::lib::common::connector_response($self, response => $response);
+               $self->{output}->display();
+               $self->{output}->exit();
+            },
+        },
+    );
+    
+    zmq_poll(\@poll, $self->{timeout} * 1000);    
+    zmq_close($self->{requester});
+    
+    $self->{output}->output_add(severity => 'UNKNOWN',
+                                short_msg => sprintf("Cannot get response (timeout received)"));
+    $self->{output}->display();
+    $self->{output}->exit();
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+Check virtual machine tools.
+
+=over 8
+
+=item B<--connector-hostname>
+
+Connector hostname (required).
+
+=item B<--connector-port>
+
+Connector port (default: 5700).
+
+=item B<--container>
+
+Container to use (it depends of the connector configuration).
+
+=item B<--vm-hostname>
+
+VM hostname to check.
+If not set, we check all VMs.
+
+=item B<--filter>
+
+VM hostname is a regexp.
+
+=item B<--disconnect-status>
+
+Status if VM disconnected (default: 'unknown').
+
+=item B<--nopoweredon-skip>
+
+Skip check if VM is not poweredOn.
+
+=item B<--timeout>
+
+Set global execution timeout (Default: 50)
+
+=item B<--tools-notinstalled-status>
+
+Status if vmtools is not installed (default: critical).
+
+=item B<--tools-notrunning-status>
+
+Status if vmtools is not running (default: critical).
+
+=item B<--tools-notup2date-status>
+
+Status if vmtools is not upd2date (default: warning).
+
+=back
+
+=cut
diff --git a/apps/vmware/connector/plugin.pm b/apps/vmware/connector/plugin.pm
index 29c01d036..38646e817 100644
--- a/apps/vmware/connector/plugin.pm
+++ b/apps/vmware/connector/plugin.pm
@@ -49,17 +49,22 @@ sub new {
     %{$self->{modes}} = (
                          'countvm-host'     => 'apps::vmware::connector::mode::countvmhost', 
                          'cpu-host'         => 'apps::vmware::connector::mode::cpuhost', 
+                         'cpu-vm'           => 'apps::vmware::connector::mode::cpuvm', 
                          'getmap'           => 'apps::vmware::connector::mode::getmap',
                          'health-host'      => 'apps::vmware::connector::mode::healthhost',
+                         'limit-vm'         => 'apps::vmware::connector::mode::limitvm',
                          'list-datastores'  => 'apps::vmware::connector::mode::listdatastores',
                          'list-nichost'     => 'apps::vmware::connector::mode::listnichost',
                          'maintenance-host' => 'apps::vmware::connector::mode::maintenancehost',
                          'memory-host'      => 'apps::vmware::connector::mode::memoryhost',
                          'memory-vm'        => 'apps::vmware::connector::mode::memoryvm',
                          'net-host'         => 'apps::vmware::connector::mode::nethost',
+                         'snapshot-vm'      => 'apps::vmware::connector::mode::snapshotvm',
                          'stat-connectors'  => 'apps::vmware::connector::mode::statconnectors',
                          'status-host'      => 'apps::vmware::connector::mode::statushost',
                          'swap-host'        => 'apps::vmware::connector::mode::swaphost',
+                         'swap-vm'          => 'apps::vmware::connector::mode::swapvm',
+                         'tools-vm'         => 'apps::vmware::connector::mode::toolsvm',
                          'uptime-host'      => 'apps::vmware::connector::mode::uptimehost',
                          );