diff --git a/network/versa/director/restapi/custom/api.pm b/network/versa/director/restapi/custom/api.pm
index 76a9764f4..de0c262c8 100644
--- a/network/versa/director/restapi/custom/api.pm
+++ b/network/versa/director/restapi/custom/api.pm
@@ -254,11 +254,11 @@ sub cache_versa_entities {
 sub get_organizations {
     my ($self, %options) = @_;
 
-    #my $datas = $self->bouchon(file => '/home/qgarnier/clients/plugins/todo/versa/Versa-Centreon/organizations.json');
+    my $datas = $self->bouchon(file => '/home/qgarnier/clients/plugins/todo/versa/Versa-Centreon/organizations.json');
 
     $self->cache_versa_entities();
     return $self->{cache_organizations} if (!defined($options{disable_cache}) || $options{disable_cache} == 0);
-    my $datas = $self->request_api(endpoint => '/api/config/nms/provider/organizations/organization');
+    #my $datas = $self->request_api(endpoint => '/api/config/nms/provider/organizations/organization');
 
     my $results = { entries => {}, names => { } };
 
@@ -275,11 +275,11 @@ sub get_organizations {
 sub get_appliances {
     my ($self, %options) = @_;
 
-    #my $datas = $self->bouchon(file => '/home/qgarnier/clients/plugins/todo/versa/Versa-Centreon/appliances.json');
+    my $datas = $self->bouchon(file => '/home/qgarnier/clients/plugins/todo/versa/Versa-Centreon/appliances.json');
 
     $self->cache_versa_entities();
     return $self->{cache_appliances} if (!defined($options{disable_cache}) || $options{disable_cache} == 0);
-    my $datas = $self->request_api(endpoint => '/api/config/nms/provider/appliances/appliance');
+    #my $datas = $self->request_api(endpoint => '/api/config/nms/provider/appliances/appliance');
 
     my $results = { entries => {}, names => { }, types => { } };
 
diff --git a/network/versa/director/restapi/mode/discovery.pm b/network/versa/director/restapi/mode/discovery.pm
new file mode 100644
index 000000000..6f1a83bb3
--- /dev/null
+++ b/network/versa/director/restapi/mode/discovery.pm
@@ -0,0 +1,155 @@
+#
+# Copyright 2020 Centreon (http://www.centreon.com/)
+#
+# Centreon is a full-fledged industry-strength solution that meets
+# the needs in IT infrastructure and application monitoring for
+# service performance.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+package network::versa::director::restapi::mode::discovery;
+
+use base qw(centreon::plugins::mode);
+
+use strict;
+use warnings;
+use JSON::XS;
+
+sub new {
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    bless $self, $class;
+    
+    $options{options}->add_options(arguments => {
+        'resource-type:s' => { name => 'resource_type' },
+        'prettify'        => { name => 'prettify' }
+    });
+
+    return $self;
+}
+
+sub check_options {
+    my ($self, %options) = @_;
+    $self->SUPER::init(%options);
+
+    if (!defined($self->{option_results}->{resource_type}) || $self->{option_results}->{resource_type} eq '') {
+        $self->{option_results}->{resource_type} = 'device';
+    }
+    if ($self->{option_results}->{resource_type} !~ /^device|organization$/) {
+        $self->{output}->add_option_msg(short_msg => 'unknown resource type');
+        $self->{output}->option_exit();
+    }
+}
+
+sub discovery_devices {
+    my ($self, %options) = @_;
+
+    my $disco_data = [];
+    foreach my $device (values %{$options{devices}->{entries}}) {
+        my $node = {};
+        $node->{uuid} = $device->{uuid};
+        $node->{name} = $device->{name};
+        $node->{type} = $device->{type};
+        $node->{'ip-address'} = $device->{'ip-address'};
+        $node->{organizations} = [];
+        foreach (@{$device->{orgs}}) {
+            push @{$node->{organizations}}, $options{organizations}->{entries}->{ $_->{uuid} }->{name};
+        }
+
+        push @$disco_data, $node;
+    }
+
+    return $disco_data;
+}
+
+sub discovery_organizations {
+    my ($self, %options) = @_;
+
+    my $disco_data = [];
+    foreach my $org (values %{$options{organizations}->{entries}}) {
+        my $node = {};
+        $node->{uuid} = $org->{uuid};
+        $node->{name} = $org->{name};
+        $node->{devices} = [];
+        foreach (@{$org->{appliances}}) {
+            push @{$node->{devices}}, $options{devices}->{entries}->{ $_ }->{name};
+        }
+
+        push @$disco_data, $node;
+    }
+
+    return $disco_data;
+}
+
+sub run {
+    my ($self, %options) = @_;
+
+    my $disco_stats;
+    $disco_stats->{start_time} = time();
+
+    my $organizations = $options{custom}->get_organizations(disable_cache => 1);
+    my $devices = $options{custom}->get_appliances(disable_cache => 1);
+
+    my $results = [];
+    if ($self->{option_results}->{resource_type} eq 'device') {
+        $results = $self->discovery_devices(
+            devices => $devices,
+            organizations => $organizations
+        );
+    } else {
+        $results = $self->discovery_organizations(
+            devices => $devices,
+            organizations => $organizations
+        );
+    }
+
+    $disco_stats->{end_time} = time();
+    $disco_stats->{duration} = $disco_stats->{end_time} - $disco_stats->{start_time};
+    $disco_stats->{discovered_items} = scalar(@$results);
+    $disco_stats->{results} = $results;
+
+    my $encoded_data;
+    eval {
+        if (defined($self->{option_results}->{prettify})) {
+            $encoded_data = JSON::XS->new->utf8->pretty->encode($disco_stats);
+        } else {
+            $encoded_data = JSON::XS->new->utf8->encode($disco_stats);
+        }
+    };
+    if ($@) {
+        $encoded_data = '{"code":"encode_error","message":"Cannot encode discovered data into JSON format"}';
+    }
+    
+    $self->{output}->output_add(short_msg => $encoded_data);
+    $self->{output}->display(nolabel => 1, force_ignore_perfdata => 1);
+    $self->{output}->exit();
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+Resources discovery.
+
+=over 8
+
+=item B<--resource-type>
+
+Choose the type of resources to discover (Can be: 'device', 'organization').
+
+=back
+
+=cut
diff --git a/network/versa/director/restapi/mode/listdevices.pm b/network/versa/director/restapi/mode/listdevices.pm
index 41dd6e06c..ddbac62b0 100644
--- a/network/versa/director/restapi/mode/listdevices.pm
+++ b/network/versa/director/restapi/mode/listdevices.pm
@@ -44,7 +44,7 @@ sub check_options {
 sub manage_selection {
     my ($self, %options) = @_;
 
-    return $options{custom}->get_appliances();
+    return $options{custom}->get_appliances(disable_cache => 1);
 }
 
 sub run {
diff --git a/network/versa/director/restapi/plugin.pm b/network/versa/director/restapi/plugin.pm
index d82a1e34e..729f29a1a 100644
--- a/network/versa/director/restapi/plugin.pm
+++ b/network/versa/director/restapi/plugin.pm
@@ -32,6 +32,7 @@ sub new {
     $self->{version} = '1.0';
     $self->{modes} = {
         'devices'      => 'network::versa::director::restapi::mode::devices',
+        'discovery'    => 'network::versa::director::restapi::mode::discovery',
         'list-devices' => 'network::versa::director::restapi::mode::listdevices'
     };