diff --git a/centreon-plugins/cloud/azure/compute/virtualmachine/mode/cpu.pm b/centreon-plugins/cloud/azure/compute/virtualmachine/mode/cpu.pm
index e28b886f0..a9d7f7157 100644
--- a/centreon-plugins/cloud/azure/compute/virtualmachine/mode/cpu.pm
+++ b/centreon-plugins/cloud/azure/compute/virtualmachine/mode/cpu.pm
@@ -20,73 +20,54 @@
 
 package cloud::azure::compute::virtualmachine::mode::cpu;
 
-use base qw(centreon::plugins::templates::counter);
+use base qw(cloud::azure::custom::mode);
 
 use strict;
 use warnings;
 
-sub prefix_metric_output {
+sub get_metrics_mapping {
     my ($self, %options) = @_;
-    
-    return "Resource '" . $options{instance_value}->{display} . "' " . $options{instance_value}->{stat} . " ";
-}
 
-sub set_counters {
-    my ($self, %options) = @_;
-    
-    $self->{maps_counters_type} = [
-        { name => 'metric', type => 1, cb_prefix_output => 'prefix_metric_output', message_multiple => "All CPU metrics are ok", skipped_code => { -10 => 1 } },
-    ];
+    my $metrics_mapping = {
+        'CPU Credits Consumed' => {
+            'output' => 'Credits consumed',
+            'label'  => 'cpu-credits-consumed',
+            'nlabel' => 'azvm.cpu.credits.consumed.count',
+            'unit'   => '',
+            'min'    => '0',
+            'max'    => ''
+        },
+        'CPU Credits Remaining' => {
+            'output' => 'Credits remaining',
+            'label'  => 'cpu-credits-remaining',
+            'nlabel' => 'azvm.cpu.credits.remaining.count',
+            'unit'   => '',
+            'min'    => '0',
+            'max'    => ''
+        },
+        'Percentage CPU' => {
+            'output' => 'Percentage',
+            'label'  => 'cpu-utilization',
+            'nlabel' => 'azvm.cpu.utilization.percentage',
+            'unit'   => '%',
+            'min'    => '0',
+            'max'    => '100'
+        }
+    };
 
-    foreach my $aggregation ('minimum', 'maximum', 'average', 'total') {
-        foreach my $metric ('CPU Credits Remaining', 'CPU Credits Consumed') {
-            my $metric_perf = lc($metric);
-            my $metric_label = lc($metric);
-            $metric_perf =~ s/ /_/g;
-            $metric_label =~ s/ /-/g;
-            my $entry = { label => $metric_label . '-' . $aggregation, set => {
-                                key_values => [ { name => $metric_perf . '_' . $aggregation }, { name => 'display' }, { name => 'stat' } ],
-                                output_template => $metric . ': %.2f',
-                                perfdatas => [
-                                    { label => $metric_perf . '_' . $aggregation, value => $metric_perf . '_' . $aggregation , 
-                                      template => '%.2f', unit => 'credits', label_extra_instance => 1, instance_use => 'display',
-                                      min => 0 },
-                                ],
-                            }
-                        };
-            push @{$self->{maps_counters}->{metric}}, $entry;
-        }
-        foreach my $metric ('Percentage CPU') {
-            my $metric_perf = lc($metric);
-            my $metric_label = lc($metric);
-            $metric_perf =~ s/ /_/g;
-            $metric_label =~ s/ /-/g;
-            my $entry = { label => $metric_label . '-' . $aggregation, set => {
-                                key_values => [ { name => $metric_perf . '_' . $aggregation }, { name => 'display' }, { name => 'stat' } ],
-                                output_template => $metric . ': %.2f %%',
-                                perfdatas => [
-                                    { label => $metric_perf . '_' . $aggregation, value => $metric_perf . '_' . $aggregation , 
-                                      template => '%.2f', unit => '%', label_extra_instance => 1, instance_use => 'display',
-                                      min => 0, max => 100 },
-                                ],
-                            }
-                        };
-            push @{$self->{maps_counters}->{metric}}, $entry;
-        }
-    }
+    return $metrics_mapping;
 }
 
 sub new {
     my ($class, %options) = @_;
-    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options, force_new_perfdata => 1);
     bless $self, $class;
     
     $options{options}->add_options(arguments => {
-        'resource:s@'      => { name => 'resource' },
-        'resource-group:s' => { name => 'resource_group' },
-        'filter-metric:s'  => { name => 'filter_metric' }
+        'filter-metric:s'  => { name => 'filter_metric' },
+        'resource:s'       => { name => 'resource' },
+        'resource-group:s' => { name => 'resource_group' }
     });
-
     return $self;
 }
 
@@ -94,18 +75,27 @@ sub check_options {
     my ($self, %options) = @_;
     $self->SUPER::check_options(%options);
 
-    if (!defined($self->{option_results}->{resource})) {
-        $self->{output}->add_option_msg(short_msg => "Need to specify either --resource <name> with --resource-group option or --resource <id>.");
+    if (!defined($self->{option_results}->{resource}) || $self->{option_results}->{resource} eq '') {
+        $self->{output}->add_option_msg(short_msg => 'Need to specify either --resource <name> with --resource-group option or --resource <id>.');
         $self->{output}->option_exit();
     }
 
-    $self->{az_resource} = $self->{option_results}->{resource};
-    $self->{az_resource_group} = $self->{option_results}->{resource_group} if (defined($self->{option_results}->{resource_group}));
+    my $resource = $self->{option_results}->{resource};
+    my $resource_group = defined($self->{option_results}->{resource_group}) ? $self->{option_results}->{resource_group} : '';
+
+    if ($resource =~ /^\/subscriptions\/.*\/resourceGroups\/(.*)\/providers\/Microsoft\.Compute\/virtualMachines\/(.*)$/) {
+        $resource_group = $1;
+        $resource = $2;
+    }
+
+    $self->{az_resource} = $resource;
+    $self->{az_resource_group} = $resource_group;
     $self->{az_resource_type} = 'virtualMachines';
     $self->{az_resource_namespace} = 'Microsoft.Compute';
     $self->{az_timeframe} = defined($self->{option_results}->{timeframe}) ? $self->{option_results}->{timeframe} : 900;
     $self->{az_interval} = defined($self->{option_results}->{interval}) ? $self->{option_results}->{interval} : "PT5M";
     $self->{az_aggregations} = ['Average'];
+
     if (defined($self->{option_results}->{aggregation})) {
         $self->{az_aggregations} = [];
         foreach my $stat (@{$self->{option_results}->{aggregation}}) {
@@ -113,58 +103,15 @@ sub check_options {
                 push @{$self->{az_aggregations}}, ucfirst(lc($stat));
             }
         }
-    }
+    } 
 
-    foreach my $metric ('CPU Credits Remaining', 'CPU Credits Consumed', 'Percentage CPU') {
+    foreach my $metric (keys %{$self->{metrics_mapping}}) {
         next if (defined($self->{option_results}->{filter_metric}) && $self->{option_results}->{filter_metric} ne ''
             && $metric !~ /$self->{option_results}->{filter_metric}/);
-
         push @{$self->{az_metrics}}, $metric;
     }
 }
 
-sub manage_selection {
-    my ($self, %options) = @_;
-
-    my %metric_results;
-    foreach my $resource (@{$self->{az_resource}}) {
-        my $resource_group = $self->{az_resource_group};
-        my $resource_name = $resource;
-        if ($resource =~ /^\/subscriptions\/.*\/resourceGroups\/(.*)\/providers\/Microsoft\.Compute\/virtualMachines\/(.*)$/) {
-            $resource_group = $1;
-            $resource_name = $2;
-        }
-
-        ($metric_results{$resource_name}, undef, undef) = $options{custom}->azure_get_metrics(
-            resource => $resource_name,
-            resource_group => $resource_group,
-            resource_type => $self->{az_resource_type},
-            resource_namespace => $self->{az_resource_namespace},
-            metrics => $self->{az_metrics},
-            aggregations => $self->{az_aggregations},
-            timeframe => $self->{az_timeframe},
-            interval => $self->{az_interval},
-        );
-
-        foreach my $metric (@{$self->{az_metrics}}) {
-            my $metric_name = lc($metric);
-            $metric_name =~ s/ /_/g;
-            foreach my $aggregation (@{$self->{az_aggregations}}) {
-                next if (!defined($metric_results{$resource_name}->{$metric_name}->{lc($aggregation)}) && !defined($self->{option_results}->{zeroed}));
-
-                $self->{metric}->{$resource_name . "_" . lc($aggregation)}->{display} = $resource_name;
-                $self->{metric}->{$resource_name . "_" . lc($aggregation)}->{stat} = lc($aggregation);
-                $self->{metric}->{$resource_name . "_" . lc($aggregation)}->{$metric_name . "_" . lc($aggregation)} = defined($metric_results{$resource_name}->{$metric_name}->{lc($aggregation)}) ? $metric_results{$resource_name}->{$metric_name}->{lc($aggregation)} : 0;
-            }
-        }
-    }
-
-    if (scalar(keys %{$self->{metric}}) <= 0) {
-        $self->{output}->add_option_msg(short_msg => 'No metrics. Check your options or use --zeroed option to set 0 on undefined values');
-        $self->{output}->option_exit();
-    }
-}
-
 1;
 
 __END__
@@ -177,17 +124,17 @@ Example:
 
 Using resource name :
 
-perl centreon_plugins.pl --plugin=cloud::azure::compute::virtualmachine::plugin --custommode=azcli --mode=cpu
---resource=MYSQLINSTANCE --resource-group=MYHOSTGROUP --filter-metric='Credits' --aggregation='average'
---critical-cpu-credits-remaining-average='10' --verbose
+perl centreon_plugins.pl --plugin=cloud::azure::compute::virtualmachine::plugin 
+--custommode=azcli --mode=cpu --resource=MYVMINSTANCE --resource-group=MYRSCGROUP 
+--filter-metric='Credits' --critical-cpu-credits-remaining='10:' --verbose
 
 Using resource id :
 
-perl centreon_plugins.pl --plugin=cloud::azure::compute::virtualmachine::plugin --custommode=azcli --mode=cpu
---resource='/subscriptions/xxx/resourceGroups/xxx/providers/Microsoft.Compute/virtualMachines/xxx'
---filter-metric='Credits' --aggregation='average' --critical-cpu-credits-remaining-average='10' --verbose
+perl centreon_plugins.pl --plugin=cloud::azure::compute::virtualmachine::plugin 
+--custommode=azcli --mode=cpu --resource='/subscriptions/xxx/resourceGroups/xxx/providers/Microsoft.Compute/virtualMachines/xxx'
+--filter-metric='Credits' --critical-cpu-credits-remaining='10:' --verbose
 
-Default aggregation: 'average' / All aggregations are valid.
+Default aggregation: 'average'
 
 =over 8
 
@@ -204,16 +151,16 @@ Set resource group (Required if resource's name is used).
 Filter metrics (Can be: 'CPU Credits Remaining', 'CPU Credits Consumed',
 'Percentage CPU') (Can be a regexp).
 
-=item B<--warning-$metric$-$aggregation$>
+=item B<--warning-$label$>
 
-Thresholds warning ($metric$ can be: 'cpu-credits-remaining', 'cpu-credits-consumed', 
-'percentage-cpu', $aggregation$ can be: 'minimum', 'maximum', 'average', 'total').
+Warning threshold
+($label$ can be: 'cpu-credits-remaining', 'cpu-credits-consumed', 'cpu-utilization')
 
-=item B<--critical-$metric$-$aggregation$>
+=item B<--critical-$label$>
 
-Thresholds critical ($metric$ can be: 'cpu-credits-remaining', 'cpu-credits-consumed', 
-'percentage-cpu', $aggregation$ can be: 'minimum', 'maximum', 'average', 'total').
+Critical threshold
+($label$ can be: 'cpu-credits-remaining', 'cpu-credits-consumed', 'cpu-utilization')
 
 =back
 
-=cut
+=cut
\ No newline at end of file
diff --git a/centreon-plugins/cloud/azure/compute/virtualmachine/mode/diskio.pm b/centreon-plugins/cloud/azure/compute/virtualmachine/mode/diskio.pm
index af73d4295..81b562b8d 100644
--- a/centreon-plugins/cloud/azure/compute/virtualmachine/mode/diskio.pm
+++ b/centreon-plugins/cloud/azure/compute/virtualmachine/mode/diskio.pm
@@ -20,151 +20,62 @@
 
 package cloud::azure::compute::virtualmachine::mode::diskio;
 
-use base qw(centreon::plugins::templates::counter);
+use base qw(cloud::azure::custom::mode);
 
 use strict;
 use warnings;
 
-sub prefix_metric_output {
-    my ($self, %options) = @_;
-    
-    return "Resource '" . $options{instance_value}->{display} . "' " . $options{instance_value}->{stat} . " ";
-}
-
-sub custom_metric_calc {
-    my ($self, %options) = @_;
-    
-    $self->{result_values}->{stat} = $options{new_datas}->{$self->{instance} . '_stat'};
-    $self->{result_values}->{metric_perf} = lc($options{extra_options}->{metric_perf});
-    $self->{result_values}->{metric_label} = lc($options{extra_options}->{metric_label});
-    $self->{result_values}->{metric_name} = $options{extra_options}->{metric_name};
-    $self->{result_values}->{timeframe} = $options{new_datas}->{$self->{instance} . '_timeframe'};
-    $self->{result_values}->{value} = $options{new_datas}->{$self->{instance} . '_' . $self->{result_values}->{metric_perf} . '_' . $self->{result_values}->{stat}};
-    $self->{result_values}->{value_per_sec} = $self->{result_values}->{value} / $self->{result_values}->{timeframe};
-    $self->{result_values}->{display} = $options{new_datas}->{$self->{instance} . '_display'};
-    return 0;
-}
-
-sub custom_metric_threshold {
+sub get_metrics_mapping {
     my ($self, %options) = @_;
 
-    my $exit = $self->{perfdata}->threshold_check(value => defined($self->{instance_mode}->{option_results}->{per_sec}) ?  $self->{result_values}->{value_per_sec} : $self->{result_values}->{value},
-                                                  threshold => [ { label => 'critical-' . $self->{result_values}->{metric_label} . "-" . $self->{result_values}->{stat}, exit_litteral => 'critical' },
-                                                                 { label => 'warning-' . $self->{result_values}->{metric_label} . "-" . $self->{result_values}->{stat}, exit_litteral => 'warning' } ]);
-    return $exit;
-}
-
-sub custom_usage_perfdata {
-    my ($self, %options) = @_;
-
-    my $extra_label = '';
-    $extra_label = '_' . lc($self->{result_values}->{display}) if (!defined($options{extra_instance}) || $options{extra_instance} != 0);
-
-    $self->{output}->perfdata_add(label => $self->{result_values}->{metric_perf} . "_" . $self->{result_values}->{stat} . $extra_label,
-				                  unit => defined($self->{instance_mode}->{option_results}->{per_sec}) ? 'B/s' : 'B',
-                                  value => sprintf("%.2f", defined($self->{instance_mode}->{option_results}->{per_sec}) ? $self->{result_values}->{value_per_sec} : $self->{result_values}->{value}),
-                                  warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{result_values}->{metric_label} . "-" . $self->{result_values}->{stat}),
-                                  critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{result_values}->{metric_label} . "-" . $self->{result_values}->{stat}),
-                                  min => 0
-                                 );
-}
-
-sub custom_usage_output {
-    my ($self, %options) = @_;
-    my $msg = "";
-
-    if (defined($self->{instance_mode}->{option_results}->{per_sec})) {
-        my ($value, $unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{value_per_sec});
-        $msg = $self->{result_values}->{metric_name}  . ": " . $value . $unit . "/s"; 
-    } else {
-        my ($value, $unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{value});
-        $msg = $self->{result_values}->{metric_name}  . ": " . $value . $unit;
-    }
-    return $msg;
-}
-
-sub custom_ops_perfdata {
-    my ($self, %options) = @_;
-
-    my $extra_label = '';
-    $extra_label = '_' . lc($self->{result_values}->{display}) if (!defined($options{extra_instance}) || $options{extra_instance} != 0);
-
-    $self->{output}->perfdata_add(label => $self->{result_values}->{metric_perf} . "_" . $self->{result_values}->{stat} . $extra_label,
-                                  unit => 'ops/s',
-                                  value => sprintf("%.2f", $self->{result_values}->{value}),
-                                  warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{result_values}->{metric_label} . "-" . $self->{result_values}->{stat}),
-                                  critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{result_values}->{metric_label} . "-" . $self->{result_values}->{stat}),
-                                  min => 0
-                                 );
-}
-
-sub custom_ops_output {
-    my ($self, %options) = @_;
-
-    my $msg = sprintf("%s: %.2f ops/s", $self->{result_values}->{metric_name}, $self->{result_values}->{value});
- 
-    return $msg;
-}
-
-sub set_counters {
-    my ($self, %options) = @_;
-    
-    $self->{maps_counters_type} = [
-        { name => 'metric', type => 1, cb_prefix_output => 'prefix_metric_output', message_multiple => "All disk metrics are ok", skipped_code => { -10 => 1 } },
-    ];
-
-    foreach my $aggregation ('minimum', 'maximum', 'average', 'total') {
-        foreach my $metric ('Disk Read Bytes', 'Disk Write Bytes') {
-            my $metric_perf = lc($metric);
-            my $metric_label = lc($metric);
-            $metric_perf =~ s/ /_/g;
-            $metric_label =~ s/ /-/g;
-            my $entry = { label => $metric_label . '-' . $aggregation, set => {
-                                key_values => [ { name => $metric_perf . '_' . $aggregation }, { name => 'display' },
-                                    { name => 'stat' }, { name => 'timeframe' } ],
-                                closure_custom_calc => $self->can('custom_metric_calc'),
-                                closure_custom_calc_extra_options => { metric_perf => $metric_perf,
-                                    metric_label => $metric_label, metric_name => $metric },
-                                closure_custom_output => $self->can('custom_usage_output'),
-                                closure_custom_perfdata => $self->can('custom_usage_perfdata'),
-                                closure_custom_threshold_check => $self->can('custom_metric_threshold'),
-                            }
-                        };
-            push @{$self->{maps_counters}->{metric}}, $entry;
+    my $metrics_mapping = {
+        'Disk Read Bytes' => {
+            'output' => 'Disk Read Bytes',
+            'label'  => 'read-bytes',
+            'nlabel' => 'azvm.disk.read.bytes',
+            'unit'   => 'B',
+            'min'    => '0',
+            'max'    => ''
+        },
+        'Disk Write Bytes' => {
+            'output' => 'Disk Write Bytes',
+            'label'  => 'write-bytes',
+            'nlabel' => 'azvm.disk.write.bytes',
+            'unit'   => 'B',
+            'min'    => '0',
+            'max'    => ''
+        },
+        'Disk Read Operations/Sec' => {
+            'output' => 'Disk read ops/s',
+            'label'  => 'read-ops-persecond',
+            'nlabel' => 'azvm.disk.read.persecond',
+            'unit'   => '',
+            'min'    => '0',
+            'max'    => ''
+        },
+        'Disk Write Operations/Sec' => {
+            'output' => 'Disk write ops/s',
+            'label'  => 'write-ops-persecond',
+            'nlabel' => 'azvm.disk.write.persecond',
+            'unit'   => '',
+            'min'    => '0',
+            'max'    => ''
         }
-        foreach my $metric ('Disk Read Operations/Sec', 'Disk Write Operations/Sec') {
-            my $metric_perf = lc($metric);
-            my $metric_label = lc($metric);
-            $metric_perf =~ s/ /_/g;
-            $metric_label =~ s/( |\/)/-/g;
-            my $entry = { label => $metric_label . '-' . $aggregation, set => {
-                                key_values => [ { name => $metric_perf . '_' . $aggregation }, { name => 'display' },
-                                    { name => 'stat' }, { name => 'timeframe' } ],
-                                closure_custom_calc => $self->can('custom_metric_calc'),
-                                closure_custom_calc_extra_options => { metric_perf => $metric_perf,
-                                    metric_label => $metric_label, metric_name => $metric },
-                                closure_custom_output => $self->can('custom_ops_output'),
-                                closure_custom_perfdata => $self->can('custom_ops_perfdata'),
-                                closure_custom_threshold_check => $self->can('custom_metric_threshold'),
-                            }
-                        };
-            push @{$self->{maps_counters}->{metric}}, $entry;
-        }
-    }
+    };
+
+    return $metrics_mapping;
 }
 
 sub new {
     my ($class, %options) = @_;
-    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options, force_new_perfdata => 1);
     bless $self, $class;
     
     $options{options}->add_options(arguments => {
-        "resource:s@"           => { name => 'resource' },
-        "resource-group:s"      => { name => 'resource_group' },
         "filter-metric:s"       => { name => 'filter_metric' },
-        "per-sec"               => { name => 'per_sec' },
+        "resource:s"            => { name => 'resource' },
+        "resource-group:s"      => { name => 'resource_group' }
     });
-
     return $self;
 }
 
@@ -172,18 +83,26 @@ sub check_options {
     my ($self, %options) = @_;
     $self->SUPER::check_options(%options);
 
-    if (!defined($self->{option_results}->{resource})) {
-        $self->{output}->add_option_msg(short_msg => "Need to specify either --resource <name> with --resource-group option or --resource <id>.");
+    if (!defined($self->{option_results}->{resource}) || $self->{option_results}->{resource} eq '') {
+        $self->{output}->add_option_msg(short_msg => 'Need to specify either --resource <name> with --resource-group option or --resource <id>.');
         $self->{output}->option_exit();
     }
 
-    $self->{az_resource} = $self->{option_results}->{resource};
-    $self->{az_resource_group} = $self->{option_results}->{resource_group} if (defined($self->{option_results}->{resource_group}));
+    my $resource = $self->{option_results}->{resource};
+    my $resource_group = defined($self->{option_results}->{resource_group}) ? $self->{option_results}->{resource_group} : '';
+
+    if ($resource =~ /^\/subscriptions\/.*\/resourceGroups\/(.*)\/providers\/Microsoft\.Compute\/virtualMachines\/(.*)$/) {
+        $resource_group = $1;
+        $resource = $2;
+    }
+
+    $self->{az_resource} = $resource;
+    $self->{az_resource_group} = $resource_group;
     $self->{az_resource_type} = 'virtualMachines';
     $self->{az_resource_namespace} = 'Microsoft.Compute';
     $self->{az_timeframe} = defined($self->{option_results}->{timeframe}) ? $self->{option_results}->{timeframe} : 900;
     $self->{az_interval} = defined($self->{option_results}->{interval}) ? $self->{option_results}->{interval} : "PT5M";
-    $self->{az_aggregations} = ['Average'];
+    $self->{az_aggregations} = ['Total'];
     if (defined($self->{option_results}->{aggregation})) {
         $self->{az_aggregations} = [];
         foreach my $stat (@{$self->{option_results}->{aggregation}}) {
@@ -193,58 +112,13 @@ sub check_options {
         }
     }
 
-    foreach my $metric ('Disk Read Bytes', 'Disk Write Bytes', 'Disk Read Operations/Sec',
-        'Disk Write Operations/Sec') {
+    foreach my $metric (keys %{$self->{metrics_mapping}}) {
         next if (defined($self->{option_results}->{filter_metric}) && $self->{option_results}->{filter_metric} ne ''
             && $metric !~ /$self->{option_results}->{filter_metric}/);
-
         push @{$self->{az_metrics}}, $metric;
     }
 }
 
-sub manage_selection {
-    my ($self, %options) = @_;
-
-    my %metric_results;
-    foreach my $resource (@{$self->{az_resource}}) {
-        my $resource_group = $self->{az_resource_group};
-        my $resource_name = $resource;
-        if ($resource =~ /^\/subscriptions\/.*\/resourceGroups\/(.*)\/providers\/Microsoft\.Compute\/virtualMachines\/(.*)$/) {
-            $resource_group = $1;
-            $resource_name = $2;
-        }
-
-        ($metric_results{$resource_name}, undef, undef) = $options{custom}->azure_get_metrics(
-            resource => $resource_name,
-            resource_group => $resource_group,
-            resource_type => $self->{az_resource_type},
-            resource_namespace => $self->{az_resource_namespace},
-            metrics => $self->{az_metrics},
-            aggregations => $self->{az_aggregations},
-            timeframe => $self->{az_timeframe},
-            interval => $self->{az_interval},
-        );
-
-        foreach my $metric (@{$self->{az_metrics}}) {
-            my $metric_name = lc($metric);
-            $metric_name =~ s/ /_/g;
-            foreach my $aggregation (@{$self->{az_aggregations}}) {
-                next if (!defined($metric_results{$resource_name}->{$metric_name}->{lc($aggregation)}) && !defined($self->{option_results}->{zeroed}));
-
-                $self->{metric}->{$resource_name . "_" . lc($aggregation)}->{display} = $resource_name;
-                $self->{metric}->{$resource_name . "_" . lc($aggregation)}->{timeframe} = $self->{az_timeframe};
-                $self->{metric}->{$resource_name . "_" . lc($aggregation)}->{stat} = lc($aggregation);
-                $self->{metric}->{$resource_name . "_" . lc($aggregation)}->{$metric_name . "_" . lc($aggregation)} = defined($metric_results{$resource_name}->{$metric_name}->{lc($aggregation)}) ? $metric_results{$resource_name}->{$metric_name}->{lc($aggregation)} : 0;
-            }
-        }
-    }
-
-    if (scalar(keys %{$self->{metric}}) <= 0) {
-        $self->{output}->add_option_msg(short_msg => 'No metrics. Check your options or use --zeroed option to set 0 on undefined values');
-        $self->{output}->option_exit();
-    }
-}
-
 1;
 
 __END__
@@ -258,14 +132,12 @@ Example:
 Using resource name :
 
 perl centreon_plugins.pl --plugin=cloud::azure::compute::virtualmachine::plugin --custommode=azcli --mode=diskio
---resource=MYSQLINSTANCE --resource-group=MYHOSTGROUP --aggregation='total' --aggregation='average'
---critical-disk-write-bytes-total='10' --verbose
+--resource=MYSQLINSTANCE --resource-group=MYHOSTGROUP --critical-write-ops-persecond='450' --verbose
 
 Using resource id :
 
 perl centreon_plugins.pl --plugin=cloud::azure::compute::virtualmachine::plugin --custommode=azcli --mode=diskio
---resource='/subscriptions/xxx/resourceGroups/xxx/providers/Microsoft.Compute/virtualMachines/xxx'
---aggregation='total' --aggregation='average' --critical-disk-write-bytes-total='10' --verbose
+--resource='/subscriptions/xxx/resourceGroups/xxx/providers/Microsoft.Compute/virtualMachines/xxx' --critical-write-ops-persecond='450' --verbose
 
 Default aggregation: 'total', 'average' / All aggregations are valid.
 
@@ -284,20 +156,21 @@ Set resource group (Required if resource's name is used).
 Filter metrics (Can be: 'Disk Read Bytes', 'Disk Write Bytes',
 'Disk Read Operations/Sec', 'Disk Write Operations/Sec') (Can be a regexp).
 
-=item B<--warning-$metric$-$aggregation$>
+=item B<--warning-$label$>
 
-Thresholds warning ($metric$ can be: 'disk-read-bytes', 'disk-write-bytes', 'disk-read-operations-sec',
-'disk-write-operations-sec', $aggregation$ can be: 'minimum', 'maximum', 'average', 'total').
+Warning thresholds.
+($label$ can be: 'read-bytes', 'write-bytes', 'read-ops-persecond', 'write-ops-persecond')
 
-=item B<--critical-$metric$-$aggregation$>
+=item B<--critical-$label$>
 
-Thresholds critical ($metric$ can be: 'disk-read-bytes', 'disk-write-bytes', 'disk-read-operations-sec',
-'disk-write-operations-sec', $aggregation$ can be: 'minimum', 'maximum', 'average', 'total').
+Critical thresholds.
+($label$ can be: 'read-bytes', 'write-bytes', 'read-ops-persecond', 'write-ops-persecond')
 
 =item B<--per-sec>
 
-Change the data to be unit/sec.
+Transform Disk Read Bytes & Disk Write Bytes in a persecond value.
+(Inherited from base class)
 
 =back
 
-=cut
+=cut
\ No newline at end of file
diff --git a/centreon-plugins/cloud/azure/compute/virtualmachine/mode/memory.pm b/centreon-plugins/cloud/azure/compute/virtualmachine/mode/memory.pm
index ed91b53f2..12c79b697 100644
--- a/centreon-plugins/cloud/azure/compute/virtualmachine/mode/memory.pm
+++ b/centreon-plugins/cloud/azure/compute/virtualmachine/mode/memory.pm
@@ -32,7 +32,7 @@ sub get_metrics_mapping {
         'Available Memory Bytes' => {
             'output'  => 'Available Memory Bytes',
             'label'   => 'memory-available',
-            'nlabel'  => 'memory.available.bytes',
+            'nlabel'  => 'azvm.memory.available.bytes',
             'unit'    => 'B'
         }
     };
diff --git a/centreon-plugins/cloud/azure/compute/virtualmachine/mode/network.pm b/centreon-plugins/cloud/azure/compute/virtualmachine/mode/network.pm
index 880215e2c..8c7c6a0cc 100644
--- a/centreon-plugins/cloud/azure/compute/virtualmachine/mode/network.pm
+++ b/centreon-plugins/cloud/azure/compute/virtualmachine/mode/network.pm
@@ -20,108 +20,45 @@
 
 package cloud::azure::compute::virtualmachine::mode::network;
 
-use base qw(centreon::plugins::templates::counter);
+use base qw(cloud::azure::custom::mode);
 
 use strict;
 use warnings;
 
-sub prefix_metric_output {
-    my ($self, %options) = @_;
-    
-    return "Resource '" . $options{instance_value}->{display} . "' " . $options{instance_value}->{stat} . " ";
-}
-
-sub custom_metric_calc {
-    my ($self, %options) = @_;
-    
-    $self->{result_values}->{stat} = $options{new_datas}->{$self->{instance} . '_stat'};
-    $self->{result_values}->{metric_perf} = lc($options{extra_options}->{metric_perf});
-    $self->{result_values}->{metric_label} = lc($options{extra_options}->{metric_label});
-    $self->{result_values}->{metric_name} = $options{extra_options}->{metric_name};
-    $self->{result_values}->{timeframe} = $options{new_datas}->{$self->{instance} . '_timeframe'};
-    $self->{result_values}->{value} = $options{new_datas}->{$self->{instance} . '_' . $self->{result_values}->{metric_perf} . '_' . $self->{result_values}->{stat}};
-    $self->{result_values}->{value_per_sec} = $self->{result_values}->{value} / $self->{result_values}->{timeframe};
-    $self->{result_values}->{display} = $options{new_datas}->{$self->{instance} . '_display'};
-    return 0;
-}
-
-sub custom_metric_threshold {
+sub get_metrics_mapping {
     my ($self, %options) = @_;
 
-    my $exit = $self->{perfdata}->threshold_check(value => defined($self->{instance_mode}->{option_results}->{per_sec}) ?  $self->{result_values}->{value_per_sec} : $self->{result_values}->{value},
-                                                  threshold => [ { label => 'critical-' . $self->{result_values}->{metric_label} . "-" . $self->{result_values}->{stat}, exit_litteral => 'critical' },
-                                                                 { label => 'warning-' . $self->{result_values}->{metric_label} . "-" . $self->{result_values}->{stat}, exit_litteral => 'warning' } ]);
-    return $exit;
-}
-
-sub custom_traffic_perfdata {
-    my ($self, %options) = @_;
-
-    my $extra_label = '';
-    $extra_label = '_' . lc($self->{result_values}->{display}) if (!defined($options{extra_instance}) || $options{extra_instance} != 0);
-
-    $self->{output}->perfdata_add(label => $self->{result_values}->{metric_perf} . "_" . $self->{result_values}->{stat} . $extra_label,
-				                  unit => defined($self->{instance_mode}->{option_results}->{per_sec}) ? 'B/s' : 'B',
-                                  value => sprintf("%.2f", defined($self->{instance_mode}->{option_results}->{per_sec}) ? $self->{result_values}->{value_per_sec} : $self->{result_values}->{value}),
-                                  warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{result_values}->{metric_label} . "-" . $self->{result_values}->{stat}),
-                                  critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{result_values}->{metric_label} . "-" . $self->{result_values}->{stat}),
-                                  min => 0
-                                 );
-}
-
-sub custom_traffic_output {
-    my ($self, %options) = @_;
-    my $msg = "";
-
-    if (defined($self->{instance_mode}->{option_results}->{per_sec})) {
-        my ($value, $unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{value_per_sec});
-        $msg = $self->{result_values}->{metric_name}  . ": " . $value . $unit . "/s"; 
-    } else {
-        my ($value, $unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{value});
-        $msg = $self->{result_values}->{metric_name}  . ": " . $value . $unit;
-    }
-    return $msg;
-}
-
-sub set_counters {
-    my ($self, %options) = @_;
-    
-    $self->{maps_counters_type} = [
-        { name => 'metric', type => 1, cb_prefix_output => 'prefix_metric_output', message_multiple => "All network metrics are ok", skipped_code => { -10 => 1 } },
-    ];
-
-    foreach my $aggregation ('minimum', 'maximum', 'average', 'total') {
-        foreach my $metric ('Network In', 'Network Out') {
-            my $metric_perf = lc($metric);
-            my $metric_label = lc($metric);
-            $metric_perf =~ s/ /_/g;
-            $metric_label =~ s/ /-/g;
-            my $entry = { label => $metric_label . '-' . $aggregation, set => {
-                                key_values => [ { name => $metric_perf . '_' . $aggregation }, { name => 'display' },
-                                    { name => 'stat' }, { name => 'timeframe' } ],
-                                closure_custom_calc => $self->can('custom_metric_calc'),
-                                closure_custom_calc_extra_options => { metric_perf => $metric_perf,
-                                    metric_label => $metric_label, metric_name => $metric },
-                                closure_custom_output => $self->can('custom_traffic_output'),
-                                closure_custom_perfdata => $self->can('custom_traffic_perfdata'),
-                                closure_custom_threshold_check => $self->can('custom_metric_threshold'),
-                            }
-                        };
-            push @{$self->{maps_counters}->{metric}}, $entry;
+    my $metrics_mapping = {
+        'Network Out' => {
+            'output' => 'Network Out',
+            'label'  => 'bytes-out',
+            'nlabel' => 'azvm.network.out.bytes',
+            'unit'   => 'B',
+            'min'    => '0',
+            'max'    => ''
+        },
+        'Network In' => {
+            'output' => 'Network In',
+            'label'  => 'bytes-in',
+            'nlabel' => 'azvm.network.in.bytes',
+            'unit'   => 'B',
+            'min'    => '0',
+            'max'    => ''
         }
-    }
+    };
+
+    return $metrics_mapping;
 }
 
 sub new {
     my ($class, %options) = @_;
-    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options, force_new_perfdata => 1);
     bless $self, $class;
     
     $options{options}->add_options(arguments => {
-        "resource:s@"           => { name => 'resource' },
-        "resource-group:s"      => { name => 'resource_group' },
         "filter-metric:s"       => { name => 'filter_metric' },
-        "per-sec"               => { name => 'per_sec' },
+        "resource:s "           => { name => 'resource' },
+        "resource-group:s"      => { name => 'resource_group' }
     });
 
     return $self;
@@ -130,14 +67,21 @@ sub new {
 sub check_options {
     my ($self, %options) = @_;
     $self->SUPER::check_options(%options);
-
-    if (!defined($self->{option_results}->{resource})) {
-        $self->{output}->add_option_msg(short_msg => "Need to specify either --resource <name> with --resource-group option or --resource <id>.");
+    if (!defined($self->{option_results}->{resource}) || $self->{option_results}->{resource} eq '') {
+        $self->{output}->add_option_msg(short_msg => 'Need to specify either --resource <name> with --resource-group option or --resource <id>.');
         $self->{output}->option_exit();
     }
-    
-    $self->{az_resource} = $self->{option_results}->{resource};
-    $self->{az_resource_group} = $self->{option_results}->{resource_group} if (defined($self->{option_results}->{resource_group}));
+
+    my $resource = $self->{option_results}->{resource};
+    my $resource_group = defined($self->{option_results}->{resource_group}) ? $self->{option_results}->{resource_group} : '';
+
+    if ($resource =~ /^\/subscriptions\/.*\/resourceGroups\/(.*)\/providers\/Microsoft\.Compute\/virtualMachines\/(.*)$/) {
+        $resource_group = $1;
+        $resource = $2;
+    }
+
+    $self->{az_resource} = $resource;
+    $self->{az_resource_group} = $resource_group;
     $self->{az_resource_type} = 'virtualMachines';
     $self->{az_resource_namespace} = 'Microsoft.Compute';
     $self->{az_timeframe} = defined($self->{option_results}->{timeframe}) ? $self->{option_results}->{timeframe} : 900;
@@ -152,57 +96,13 @@ sub check_options {
         }
     }
 
-    foreach my $metric ('Network In', 'Network Out') {
+    foreach my $metric (keys %{$self->{metrics_mapping}}) {
         next if (defined($self->{option_results}->{filter_metric}) && $self->{option_results}->{filter_metric} ne ''
             && $metric !~ /$self->{option_results}->{filter_metric}/);
-
         push @{$self->{az_metrics}}, $metric;
     }
 }
 
-sub manage_selection {
-    my ($self, %options) = @_;
-
-    my %metric_results;
-    foreach my $resource (@{$self->{az_resource}}) {
-        my $resource_group = $self->{az_resource_group};
-        my $resource_name = $resource;
-        if ($resource =~ /^\/subscriptions\/.*\/resourceGroups\/(.*)\/providers\/Microsoft\.Compute\/virtualMachines\/(.*)$/) {
-            $resource_group = $1;
-            $resource_name = $2;
-        }
-
-        ($metric_results{$resource_name}, undef, undef) = $options{custom}->azure_get_metrics(
-            resource => $resource_name,
-            resource_group => $resource_group,
-            resource_type => $self->{az_resource_type},
-            resource_namespace => $self->{az_resource_namespace},
-            metrics => $self->{az_metrics},
-            aggregations => $self->{az_aggregations},
-            timeframe => $self->{az_timeframe},
-            interval => $self->{az_interval},
-        );
-
-        foreach my $metric (@{$self->{az_metrics}}) {
-            my $metric_name = lc($metric);
-            $metric_name =~ s/ /_/g;
-            foreach my $aggregation (@{$self->{az_aggregations}}) {
-                next if (!defined($metric_results{$resource_name}->{$metric_name}->{lc($aggregation)}) && !defined($self->{option_results}->{zeroed}));
-
-                $self->{metric}->{$resource_name . "_" . lc($aggregation)}->{display} = $resource_name;
-                $self->{metric}->{$resource_name . "_" . lc($aggregation)}->{timeframe} = $self->{az_timeframe};
-                $self->{metric}->{$resource_name . "_" . lc($aggregation)}->{stat} = lc($aggregation);
-                $self->{metric}->{$resource_name . "_" . lc($aggregation)}->{$metric_name . "_" . lc($aggregation)} = defined($metric_results{$resource_name}->{$metric_name}->{lc($aggregation)}) ? $metric_results{$resource_name}->{$metric_name}->{lc($aggregation)} : 0;
-            }
-        }
-    }
-
-    if (scalar(keys %{$self->{metric}}) <= 0) {
-        $self->{output}->add_option_msg(short_msg => 'No metrics. Check your options or use --zeroed option to set 0 on undefined values');
-        $self->{output}->option_exit();
-    }
-}
-
 1;
 
 __END__
@@ -216,13 +116,12 @@ Example:
 Using resource name :
 
 perl centreon_plugins.pl --plugin=cloud::azure::compute::virtualmachine::plugin --custommode=azcli --mode=network
---resource=MYSQLINSTANCE --resource-group=MYHOSTGROUP --aggregation='total' --critical-network-out-total='10' --verbose
+--resource=MYVMNAME --resource-group=VMRESOURCEGROUP --critical-bytes-out='10000' --verbose
 
 Using resource id :
 
 perl centreon_plugins.pl --plugin=cloud::azure::compute::virtualmachine::plugin --custommode=azcli --mode=network
---resource='/subscriptions/xxx/resourceGroups/xxx/providers/Microsoft.Compute/virtualMachines/xxx'
---aggregation='total' --critical-network-out-total='10' --verbose
+--resource='/subscriptions/xxx/resourceGroups/xxx/providers/Microsoft.Compute/virtualMachines/xxx' --critical-bytes-out='10000' --verbose
 
 Default aggregation: 'total' / All aggregations are valid.
 
@@ -240,19 +139,18 @@ Set resource group (Required if resource's name is used).
 
 Filter metrics (Can be: 'Network In', 'Network Out') (Can be a regexp).
 
-=item B<--warning-$metric$-$aggregation$>
+=item B<--warning-$label$>
 
-Thresholds warning ($metric$ can be: 'network-in', 'network-out', 
-$aggregation$ can be: 'minimum', 'maximum', 'average', 'total').
+Warning thresholds ($label$ can be: 'bytes-in', 'bytes-out'). 
 
-=item B<--critical-$metric$-$aggregation$>
+=item B<--critical-$label$>
 
-Thresholds critical ($metric$ can be: 'network-in', 'network-out', 
-$aggregation$ can be: 'minimum', 'maximum', 'average', 'total').
+Critical thresholds ($label$ can be: 'bytes-in', 'bytes-out'). 
 
 =item B<--per-sec>
 
-Change the data to be unit/sec.
+Transform value to obtain Bytes/second.
+(Inherited from base class)
 
 =back
 
diff --git a/centreon-plugins/cloud/azure/compute/virtualmachine/mode/vmsstate.pm b/centreon-plugins/cloud/azure/compute/virtualmachine/mode/vmsstate.pm
index c30afeabe..7debdae21 100644
--- a/centreon-plugins/cloud/azure/compute/virtualmachine/mode/vmsstate.pm
+++ b/centreon-plugins/cloud/azure/compute/virtualmachine/mode/vmsstate.pm
@@ -24,22 +24,7 @@ use base qw(centreon::plugins::templates::counter);
 
 use strict;
 use warnings;
-use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold);
-
-sub custom_status_output {
-    my ($self, %options) = @_;
-    
-    my $msg = sprintf('state: %s', $self->{result_values}->{state});
-    return $msg;
-}
-
-sub custom_status_calc {
-    my ($self, %options) = @_;
-    
-    $self->{result_values}->{state} = $options{new_datas}->{$self->{instance} . '_state'};
-    $self->{result_values}->{display} = $options{new_datas}->{$self->{instance} . '_display'};
-    return 0;
-}
+use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold_ng);
 
 sub prefix_global_output {
     my ($self, %options) = @_;
@@ -62,7 +47,7 @@ sub set_counters {
     ];
 
     $self->{maps_counters}->{global} = [
-        { label => 'total-running', set => {
+        { label => 'total-running', nlabel => 'azure.compute.vm.running.count', set => {
                 key_values => [ { name => 'running' }  ],
                 output_template => "running : %s",
                 perfdatas => [
@@ -70,7 +55,7 @@ sub set_counters {
                 ],
             }
         },
-        { label => 'total-stopped', set => {
+        { label => 'total-stopped', nlabel => 'azure.compute.vm.stopped.count', set => {
                 key_values => [ { name => 'stopped' }  ],
                 output_template => "stopped : %s",
                 perfdatas => [
@@ -82,11 +67,10 @@ sub set_counters {
     
     $self->{maps_counters}->{vms} = [
         { label => 'status', threshold => 0, set => {
-                key_values => [ { name => 'state' }, { name => 'display' } ],
-                closure_custom_calc => $self->can('custom_status_calc'),
-                closure_custom_output => $self->can('custom_status_output'),
+                key_values => [ { name => 'state' }, { name => 'name' } ],
+                output_template => 'state: %s',
                 closure_custom_perfdata => sub { return 0; },
-                closure_custom_threshold_check => \&catalog_status_threshold,
+                closure_custom_threshold_check => \&catalog_status_threshold_ng,
             }
         },
     ];
@@ -94,16 +78,13 @@ sub set_counters {
 
 sub new {
     my ($class, %options) = @_;
-    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options, force_new_perfdata => 1);
     bless $self, $class;
     
-    $options{options}->add_options(arguments =>
-                                {
-                                    "resource-group:s"      => { name => 'resource_group' },
-                                    "filter-name:s"         => { name => 'filter_name' },
-                                    "warning-status:s"      => { name => 'warning_status', default => '' },
-                                    "critical-status:s"     => { name => 'critical_status', default => '' },
-                                });
+    $options{options}->add_options(arguments => {
+        "resource-group:s"      => { name => 'resource_group' },
+        "filter-name:s"         => { name => 'filter_name' },
+    });
     
     return $self;
 }
@@ -112,7 +93,6 @@ sub check_options {
     my ($self, %options) = @_;
     $self->SUPER::check_options(%options);
 
-    $self->change_macros(macros => ['warning_status', 'critical_status']);
 }
 
 sub manage_selection {
diff --git a/centreon-plugins/cloud/azure/custom/mode.pm b/centreon-plugins/cloud/azure/custom/mode.pm
index 5e6b98ea0..6a824bbe2 100644
--- a/centreon-plugins/cloud/azure/custom/mode.pm
+++ b/centreon-plugins/cloud/azure/custom/mode.pm
@@ -31,8 +31,8 @@ sub new {
     bless $self, $class;
 
     $options{options}->add_options(arguments => {
-        'filter-dimension:s' => { name => 'filter_dimension' },
-        'per-sec'            => { name => 'per_second'}
+        'filter-dimension:s'   => { name => 'filter_dimension' },
+        'per-sec'              => { name => 'per_second'}
     });
 
     $options{options}->add_help(package => __PACKAGE__, sections => 'CUSTOM MODE OPTIONS', once => 1);
@@ -68,7 +68,7 @@ sub custom_metric_perfdata {
     my $options = $self->{instance_mode}->{metrics_mapping}->{$self->{result_values}->{metric}};
     my $value = defined($self->{instance_mode}->{option_results}->{per_second}) ? $self->{result_values}->{value}->{per_second} : $self->{result_values}->{value}->{absolute};
     my $format = defined($self->{instance_mode}->{metrics_mapping}->{$self->{result_values}->{metric}}->{template}) ? $self->{instance_mode}->{metrics_mapping}->{$self->{result_values}->{metric}}->{template} : '%.2f';
-    if (defined($self->{instance_mode}->{option_results}->{per_second})) {
+    if (defined($self->{instance_mode}->{option_results}->{per_second}) && $self->{instance_mode}->{metrics_mapping}->{$self->{result_values}->{metric}}->{nlabel} !~ /\.persecond$/) {
         $self->{instance_mode}->{metrics_mapping}->{$self->{result_values}->{metric}}->{nlabel} .= '.persecond';
         $self->{instance_mode}->{metrics_mapping}->{$self->{result_values}->{metric}}->{unit} .= '/s';
     }
@@ -176,7 +176,8 @@ sub manage_selection {
         my $metric_name = lc($metric);
         $metric_name =~ s/ /_/g;
         foreach my $aggregation (@{$self->{az_aggregations}}) {
-            next if (!defined($metric_results{$self->{az_resource}}->{$metric_name}->{lc($aggregation)}) && !defined($self->{option_results}->{zeroed}));
+            next if (!defined($metric_results{$self->{az_resource}}->{$metric_name}->{lc($aggregation)}) && !defined($aggregation) && !defined($self->{option_results}->{zeroed}));
+            next if (defined($self->{skip_aggregation}->{$metric}->{lc($aggregation)}) && $self->{skip_aggregation}->{$metric}->{lc($aggregation)} == 0);
             $self->{metrics}->{$self->{az_resource}}->{display} = $self->{az_resource};
             $self->{metrics}->{$self->{az_resource}}->{statistics}->{lc($aggregation)}->{display} = lc($aggregation);
             $self->{metrics}->{$self->{az_resource}}->{statistics}->{lc($aggregation)}->{timeframe} = $self->{az_timeframe};
diff --git a/centreon-plugins/cloud/azure/network/expressroute/mode/circuitstatus.pm b/centreon-plugins/cloud/azure/network/expressroute/mode/circuitstatus.pm
index a0bb34099..6cc87ca07 100644
--- a/centreon-plugins/cloud/azure/network/expressroute/mode/circuitstatus.pm
+++ b/centreon-plugins/cloud/azure/network/expressroute/mode/circuitstatus.pm
@@ -24,7 +24,7 @@ use base qw(centreon::plugins::templates::counter);
 
 use strict;
 use warnings;
-use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold);
+use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold_ng);
 
 sub custom_status_output {
     my ($self, %options) = @_;
@@ -37,17 +37,6 @@ sub custom_status_output {
     return $msg;
 }
 
-sub custom_status_calc {
-    my ($self, %options) = @_;
-    
-    $self->{result_values}->{circuit_status} = $options{new_datas}->{$self->{instance} . '_circuit_status'};
-    $self->{result_values}->{provider_status} = $options{new_datas}->{$self->{instance} . '_provider_status'};
-    $self->{result_values}->{provider_name} = $options{new_datas}->{$self->{instance} . '_provider_name'};
-    $self->{result_values}->{provider_location} = $options{new_datas}->{$self->{instance} . '_provider_location'};
-    $self->{result_values}->{display} = $options{new_datas}->{$self->{instance} . '_display'};
-    return 0;
-}
-
 sub prefix_circuit_output {
     my ($self, %options) = @_;
     
@@ -62,15 +51,18 @@ sub set_counters {
     ];
 
     $self->{maps_counters}->{circuits} = [
-        { label => 'status', threshold => 0, set => {
+        { 
+            label => 'status',
+            type => 2,
+            critical_default => '%{circuit_status} ne "Enabled" || %{provider_status} ne "Provisioned"' 
+            set => {
                 key_values => [ { name => 'circuit_status' }, { name => 'provider_status' }, { name => 'provider_name' },
-                                { name => 'provider_location' }, { name => 'display' } ],
-                closure_custom_calc => $self->can('custom_status_calc'),
+                                { name => 'provider_location' }, { name => 'name' } ],
                 closure_custom_output => $self->can('custom_status_output'),
                 closure_custom_perfdata => sub { return 0; },
-                closure_custom_threshold_check => \&catalog_status_threshold,
+                closure_custom_threshold_check => \&catalog_status_threshold_ng,
             }
-        },
+        }
     ];
 }
 
@@ -79,14 +71,11 @@ sub new {
     my $self = $class->SUPER::new(package => __PACKAGE__, %options);
     bless $self, $class;
     
-    $options{options}->add_options(arguments =>
-                                {
-                                    "resource-group:s"      => { name => 'resource_group' },
-                                    "location:s"            => { name => 'location' },
-                                    "filter-name:s"         => { name => 'filter_name' },
-                                    "warning-status:s"      => { name => 'warning_status', default => '' },
-                                    "critical-status:s"     => { name => 'critical_status', default => '%{circuit_status} ne "Enabled" || %{provider_status} ne "Provisioned"' },
-                                });
+    $options{options}->add_options(arguments => {
+        "resource-group:s"      => { name => 'resource_group' },
+        "location:s"            => { name => 'location' },
+        "filter-name:s"         => { name => 'filter_name' }
+    });
     
     return $self;
 }
@@ -95,7 +84,6 @@ sub check_options {
     my ($self, %options) = @_;
     $self->SUPER::check_options(%options);
 
-    $self->change_macros(macros => ['warning_status', 'critical_status']);
 }
 
 sub manage_selection {
@@ -110,7 +98,7 @@ sub manage_selection {
             && $circuit->{location} !~ /$self->{option_results}->{location}/);
         
         $self->{circuits}->{$circuit->{id}} = {
-            display => $circuit->{name},
+            name => $circuit->{name},
             circuit_status => ($circuit->{circuitProvisioningState}) ? $circuit->{circuitProvisioningState} : $circuit->{properties}->{circuitProvisioningState},
             provider_status => ($circuit->{serviceProviderProvisioningState}) ? $circuit->{serviceProviderProvisioningState} : $circuit->{properties}->{serviceProviderProvisioningState},
             provider_name => ($circuit->{serviceProviderProperties}->{serviceProviderName}) ? $circuit->{serviceProviderProperties}->{serviceProviderName} : $circuit->{properties}->{serviceProviderProperties}->{serviceProviderName},
diff --git a/centreon-plugins/cloud/azure/network/expressroute/mode/traffic.pm b/centreon-plugins/cloud/azure/network/expressroute/mode/traffic.pm
index 379c227a3..954d94e3c 100644
--- a/centreon-plugins/cloud/azure/network/expressroute/mode/traffic.pm
+++ b/centreon-plugins/cloud/azure/network/expressroute/mode/traffic.pm
@@ -20,98 +20,43 @@
 
 package cloud::azure::network::expressroute::mode::traffic;
 
-use base qw(centreon::plugins::templates::counter);
+use base qw(cloud::azure::custom::mode);
 
 use strict;
 use warnings;
 
-sub prefix_traffic_output {
-    my ($self, %options) = @_;
-    
-    return "Circuit '" . $options{instance_value}->{display} . "' " . $options{instance_value}->{stat} . " ";
-}
-
-sub custom_traffic_calc {
-    my ($self, %options) = @_;
-    
-    $self->{result_values}->{stat} = $options{new_datas}->{$self->{instance} . '_stat'};
-    $self->{result_values}->{metric_perf} = lc($options{extra_options}->{metric_perf});
-    $self->{result_values}->{metric_label} = lc($options{extra_options}->{metric_label});
-    $self->{result_values}->{metric_name} = $options{new_datas}->{$self->{instance} . '_' . $self->{result_values}->{metric_perf} . '_' . $self->{result_values}->{stat} . '_name'};
-    $self->{result_values}->{timeframe} = $options{new_datas}->{$self->{instance} . '_timeframe'};
-    $self->{result_values}->{value} = $options{new_datas}->{$self->{instance} . '_' . $self->{result_values}->{metric_perf} . '_' . $self->{result_values}->{stat}};
-    $self->{result_values}->{display} = $options{new_datas}->{$self->{instance} . '_display'};
-    return 0;
-}
-
-sub custom_metric_threshold {
+sub get_metrics_mapping {
     my ($self, %options) = @_;
 
-    my $exit = $self->{perfdata}->threshold_check(value => $self->{result_values}->{value},
-                                                  threshold => [ { label => 'critical-' . $self->{result_values}->{metric_label} . "-" . $self->{result_values}->{stat}, exit_litteral => 'critical' },
-                                                                 { label => 'warning-' . $self->{result_values}->{metric_label} . "-" . $self->{result_values}->{stat}, exit_litteral => 'warning' } ]);
-    return $exit;
-}
-
-sub custom_traffic_perfdata {
-    my ($self, %options) = @_;
-
-    my $extra_label = '';
-    $extra_label = '_' . lc($self->{result_values}->{display}) if (!defined($options{extra_instance}) || $options{extra_instance} != 0);
-
-    $self->{output}->perfdata_add(label => $self->{result_values}->{metric_perf} . "_" . $self->{result_values}->{stat} . $extra_label,
-				                  unit => 'b/s',
-                                  value => sprintf("%d", $self->{result_values}->{value}),
-                                  warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{result_values}->{metric_label} . "-" . $self->{result_values}->{stat}),
-                                  critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{result_values}->{metric_label} . "-" . $self->{result_values}->{stat}),
-                                  min => 0
-                                 );
-}
-
-sub custom_traffic_output {
-    my ($self, %options) = @_;
-
-    my ($value, $unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{value}, network => 1);
-    my $msg = $self->{result_values}->{metric_name}  . ": " . $value . $unit . "/s";
-    return $msg;
-}
-
-sub set_counters {
-    my ($self, %options) = @_;
-    
-    $self->{maps_counters_type} = [
-        { name => 'metric', type => 1, cb_prefix_output => 'prefix_traffic_output', message_multiple => "All traffic metrics are ok", skipped_code => { -10 => 1 } },
-    ];
-
-    foreach my $aggregation ('minimum', 'maximum', 'average', 'total') {
-        foreach my $metric ('BitsInPerSecond', 'BitsOutPerSecond') {
-            my $metric_perf = lc($metric);
-            my $metric_label = lc($metric);
-            $metric_perf =~ s/ /_/g;
-            $metric_label =~ s/ /-/g;
-            my $entry = { label => $metric_label . '-' . $aggregation, set => {
-                                key_values => [ { name => $metric_perf . '_' . $aggregation }, { name => 'display' },
-                                    { name => 'stat' }, { name => 'stat' }, { name => $metric_perf . '_' . $aggregation . '_name' } ],
-                                closure_custom_calc => $self->can('custom_traffic_calc'),
-                                closure_custom_calc_extra_options => { metric_perf => $metric_perf,
-                                    metric_label => $metric_label },
-                                closure_custom_output => $self->can('custom_traffic_output'),
-                                closure_custom_perfdata => $self->can('custom_traffic_perfdata'),
-                                closure_custom_threshold_check => $self->can('custom_traffic_threshold'),
-                            }
-                        };
-            push @{$self->{maps_counters}->{metric}}, $entry;
+    my $metrics_mapping = {
+        'BitsInPerSecond' => {
+            'output' => 'Traffic In',
+            'label'  => 'traffic-in',
+            'nlabel' => 'azexpressroute.traffic.in.bitspersecond',
+            'unit'   => 'b/s',
+            'min'    => '0',
+            'max'    => ''
+        },
+        'BitsOutPerSecond' => {
+            'output' => 'Traffic Out',
+            'label'  => 'traffic-out',
+            'nlabel' => 'azexpressroute.traffic.in.bitspersecond',
+            'unit'   => 'b/s',
+            'min'    => '0',
+            'max'    => ''
         }
-    }
+    };
+
+    return $metrics_mapping;
 }
 
 sub new {
     my ($class, %options) = @_;
-    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options, force_new_perfdata => 1);
     bless $self, $class;
     
     $options{options}->add_options(arguments => {
-        "resource:s@"           => { name => 'resource' },
+        "resource:s"            => { name => 'resource' },
         "resource-group:s"      => { name => 'resource_group' },
         "filter-metric:s"       => { name => 'filter_metric' },
     });
@@ -123,18 +68,27 @@ sub check_options {
     my ($self, %options) = @_;
     $self->SUPER::check_options(%options);
 
-    if (!defined($self->{option_results}->{resource})) {
-        $self->{output}->add_option_msg(short_msg => "Need to specify either --resource <name> with --resource-group option or --resource <id>.");
+    if (!defined($self->{option_results}->{resource}) || $self->{option_results}->{resource} eq '') {
+        $self->{output}->add_option_msg(short_msg => 'Need to specify either --resource <name> with --resource-group option or --resource <id>.');
         $self->{output}->option_exit();
     }
+
+    my $resource = $self->{option_results}->{resource};
+    my $resource_group = defined($self->{option_results}->{resource_group}) ? $self->{option_results}->{resource_group} : '';
+
+    if ($resource =~ /^\/subscriptions\/.*\/resourceGroups\/(.*)\/providers\/Microsoft\.Network\/expressRouteCircuits\/(.*)$/) {
+        $resource_group = $1;
+        $resource = $2;
+    }
     
-    $self->{az_resource} = $self->{option_results}->{resource};
-    $self->{az_resource_group} = $self->{option_results}->{resource_group} if (defined($self->{option_results}->{resource_group}));
+    $self->{az_resource} = $resource;
+    $self->{az_resource_group} = $resource_group;
     $self->{az_resource_type} = 'expressRouteCircuits';
     $self->{az_resource_namespace} = 'Microsoft.Network';
     $self->{az_timeframe} = defined($self->{option_results}->{timeframe}) ? $self->{option_results}->{timeframe} : 900;
     $self->{az_interval} = defined($self->{option_results}->{interval}) ? $self->{option_results}->{interval} : "PT5M";
     $self->{az_aggregations} = ['Average'];
+
     if (defined($self->{option_results}->{aggregation})) {
         $self->{az_aggregations} = [];
         foreach my $stat (@{$self->{option_results}->{aggregation}}) {
@@ -144,58 +98,13 @@ sub check_options {
         }
     }
 
-    foreach my $metric ('BitsInPerSecond', 'BitsOutPerSecond') {
+    foreach my $metric (keys %{$self->{metrics_mapping}}) {
         next if (defined($self->{option_results}->{filter_metric}) && $self->{option_results}->{filter_metric} ne ''
             && $metric !~ /$self->{option_results}->{filter_metric}/);
-
         push @{$self->{az_metrics}}, $metric;
     }
 }
 
-sub manage_selection {
-    my ($self, %options) = @_;
-
-    my %metric_results;
-    foreach my $resource (@{$self->{az_resource}}) {
-        my $resource_group = $self->{az_resource_group};
-        my $resource_name = $resource;
-        if ($resource =~ /^\/subscriptions\/.*\/resourceGroups\/(.*)\/providers\/Microsoft\.Network\/expressRouteCircuits\/(.*)$/) {
-            $resource_group = $1;
-            $resource_name = $2;
-        }
-
-        ($metric_results{$resource_name}, undef, undef) = $options{custom}->azure_get_metrics(
-            resource => $resource_name,
-            resource_group => $resource_group,
-            resource_type => $self->{az_resource_type},
-            resource_namespace => $self->{az_resource_namespace},
-            metrics => $self->{az_metrics},
-            aggregations => $self->{az_aggregations},
-            timeframe => $self->{az_timeframe},
-            interval => $self->{az_interval},
-        );
-        
-        foreach my $metric (@{$self->{az_metrics}}) {
-            my $metric_name = lc($metric);
-            $metric_name =~ s/ /_/g;
-            foreach my $aggregation (@{$self->{az_aggregations}}) {
-                next if (!defined($metric_results{$resource_name}->{$metric_name}->{lc($aggregation)}) && !defined($self->{option_results}->{zeroed}));
-
-                $self->{metric}->{$resource_name . "_" . lc($aggregation)}->{display} = $resource_name;
-                $self->{metric}->{$resource_name . "_" . lc($aggregation)}->{timeframe} = $self->{az_timeframe};
-                $self->{metric}->{$resource_name . "_" . lc($aggregation)}->{stat} = lc($aggregation);
-                $self->{metric}->{$resource_name . "_" . lc($aggregation)}->{$metric_name . "_" . lc($aggregation) . '_name'} = $metric_results{$resource_name}->{$metric_name}->{name};
-                $self->{metric}->{$resource_name . "_" . lc($aggregation)}->{$metric_name . "_" . lc($aggregation)} = defined($metric_results{$resource_name}->{$metric_name}->{lc($aggregation)}) ? $metric_results{$resource_name}->{$metric_name}->{lc($aggregation)} : 0;
-            }
-        }
-    }
-
-    if (scalar(keys %{$self->{metric}}) <= 0) {
-        $self->{output}->add_option_msg(short_msg => 'No metrics. Check your options or use --zeroed option to set 0 on undefined values');
-        $self->{output}->option_exit();
-    }
-}
-
 1;
 
 __END__
@@ -234,15 +143,13 @@ Set resource group (Required if resource's name is used).
 
 Filter metrics (Can be: 'BitsInPerSecond', 'BitsOutPerSecond') (Can be a regexp).
 
-=item B<--warning-$metric$-$aggregation$>
+=item B<--warning-traffic-in>
 
-Thresholds warning ($metric$ can be: 'bitsinpersecond', 'bitsoutpersecond',
-$aggregation$ can be: 'minimum', 'maximum', 'average').
+Critical threshold for BitsInPerSecond.
 
-=item B<--critical-$metric$-$aggregation$>
+=item B<--critical-traffic-out>
 
-Thresholds critical ($metric$ can be: 'bitsinpersecond', 'bitsoutpersecond',
-$aggregation$ can be: 'minimum', 'maximum', 'average').
+Critical threshold for BitsOutPerSecond.
 
 =back
 
diff --git a/centreon-plugins/cloud/azure/network/vpngateway/mode/sitetraffic.pm b/centreon-plugins/cloud/azure/network/vpngateway/mode/sitetraffic.pm
index 9f0b21e2b..9d64cbf3e 100644
--- a/centreon-plugins/cloud/azure/network/vpngateway/mode/sitetraffic.pm
+++ b/centreon-plugins/cloud/azure/network/vpngateway/mode/sitetraffic.pm
@@ -20,118 +20,51 @@
 
 package cloud::azure::network::vpngateway::mode::sitetraffic;
 
-use base qw(centreon::plugins::templates::counter);
+use base qw(cloud::azure::custom::mode);
 
 use strict;
 use warnings;
 
-sub prefix_metric_output {
-    my ($self, %options) = @_;
-    
-    return "VPN Gateway '" . $options{instance_value}->{display} . "' " . $options{instance_value}->{stat} . " ";
-}
-
-sub custom_metric_calc {
-    my ($self, %options) = @_;
-    
-    $self->{result_values}->{stat} = $options{new_datas}->{$self->{instance} . '_stat'};
-    $self->{result_values}->{metric_perf} = lc($options{extra_options}->{metric_perf});
-    $self->{result_values}->{metric_label} = lc($options{extra_options}->{metric_label});
-    $self->{result_values}->{metric_name} = $options{new_datas}->{$self->{instance} . '_' . $self->{result_values}->{metric_perf} . '_' . $self->{result_values}->{stat} . '_name'};
-    $self->{result_values}->{timeframe} = $options{new_datas}->{$self->{instance} . '_timeframe'};
-    $self->{result_values}->{value} = $options{new_datas}->{$self->{instance} . '_' . $self->{result_values}->{metric_perf} . '_' . $self->{result_values}->{stat}};
-    $self->{result_values}->{display} = $options{new_datas}->{$self->{instance} . '_display'};
-    return 0;
-}
-
-sub custom_metric_threshold {
+sub get_metrics_mapping {
     my ($self, %options) = @_;
 
-    my $exit = $self->{perfdata}->threshold_check(value => $self->{result_values}->{value},
-                                                  threshold => [ { label => 'critical-' . $self->{result_values}->{metric_label} . "-" . $self->{result_values}->{stat}, exit_litteral => 'critical' },
-                                                                 { label => 'warning-' . $self->{result_values}->{metric_label} . "-" . $self->{result_values}->{stat}, exit_litteral => 'warning' } ]);
-    return $exit;
-}
-
-sub custom_traffic_perfdata {
-    my ($self, %options) = @_;
-
-    my $extra_label = '';
-    $extra_label = '_' . lc($self->{result_values}->{display}) if (!defined($options{extra_instance}) || $options{extra_instance} != 0);
-
-    $self->{output}->perfdata_add(label => $self->{result_values}->{metric_perf} . "_" . $self->{result_values}->{stat} . $extra_label,
-				                  unit => 'B/s',
-                                  value => sprintf("%.2f", $self->{result_values}->{value}),
-                                  warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{result_values}->{metric_label} . "-" . $self->{result_values}->{stat}),
-                                  critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{result_values}->{metric_label} . "-" . $self->{result_values}->{stat}),
-                                  min => 0
-                                 );
-}
-
-sub custom_traffic_output {
-    my ($self, %options) = @_;
-
-    my ($value, $unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{value});
-    my $msg = $self->{result_values}->{metric_name}  . ": " . $value . $unit . "/s";
-    return $msg;
-}
-
-sub set_counters {
-    my ($self, %options) = @_;
-    
-    $self->{maps_counters_type} = [
-        { name => 'metric', type => 1, cb_prefix_output => 'prefix_metric_output', message_multiple => "All traffic metrics are ok", skipped_code => { -10 => 1 } },
-    ];
-
-    foreach my $aggregation ('average') {
-        foreach my $metric ('AverageBandwidth', 'P2SBandwidth') {
-            my $metric_perf = lc($metric);
-            my $metric_label = lc($metric);
-            $metric_perf =~ s/ /_/g;
-            $metric_label =~ s/ /-/g;
-            my $entry = { label => $metric_label . '-' . $aggregation, set => {
-                                key_values => [ { name => $metric_perf . '_' . $aggregation }, { name => 'display' },
-                                    { name => 'stat' }, { name => $metric_perf . '_' . $aggregation . '_name' }, { name => 'timeframe' } ],
-                                closure_custom_calc => $self->can('custom_metric_calc'),
-                                closure_custom_calc_extra_options => { metric_perf => $metric_perf,
-                                    metric_label => $metric_label },
-                                closure_custom_output => $self->can('custom_traffic_output'),
-                                closure_custom_perfdata => $self->can('custom_traffic_perfdata'),
-                                closure_custom_threshold_check => $self->can('custom_metric_threshold'),
-                            }
-                        };
-            push @{$self->{maps_counters}->{metric}}, $entry;
+    my $metrics_mapping = {
+        'AverageBandwidth' => {
+            'output' => 'Average bandwidth',
+            'label'  => 'bandwidth-average',
+            'nlabel' => 'azvpngateway.site.traffic.bandwidth.bytespersecond',
+            'unit'   => 'B',
+            'min'    => '0',
+            'max'    => ''
+        },
+        'P2SBandwidth' => {
+            'output' => 'Point-to-site bandwidth',
+            'label'  => 'p2s-bandwidth',
+            'nlabel' => 'azvpngateway.p2s.traffic.bandwidth.bytespersecond',
+            'unit'   => 'B',
+            'min'    => '0',
+            'max'    => ''
+        },
+        'P2SConnectionCount' => {
+            'output' => 'Point-to-site connections',
+            'label'  => 'p2s-connections',
+            'nlabel' => 'azvpngateway.p2s.connections.count',
+            'unit'   => '',
+            'min'    => '0',
+            'max'    => ''
         }
-    }
-    foreach my $aggregation ('maximum') {
-        foreach my $metric ('P2SConnectionCount') {
-            my $metric_perf = lc($metric);
-            my $metric_label = lc($metric);
-            $metric_perf =~ s/ /_/g;
-            $metric_label =~ s/ /-/g;
-            my $entry = { label => $metric_label . '-' . $aggregation, set => {
-                                key_values => [ { name => $metric_perf . '_' . $aggregation }, { name => 'display' },
-                                    { name => $metric_perf . '_' . $aggregation . '_name' }, { name => 'stat' } ],
-                                output_template => 'P2S Connection Count: %d',
-                                perfdatas => [
-                                    { label => $metric_perf . '_' . $aggregation, value => $metric_perf . '_' . $aggregation , 
-                                      template => '%d', label_extra_instance => 1, instance_use => 'display',
-                                      min => 0 },
-                                ],
-                            }
-                        };
-            push @{$self->{maps_counters}->{metric}}, $entry;
-        }
-    }
+    };
+
+    return $metrics_mapping;
 }
 
 sub new {
     my ($class, %options) = @_;
-    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options, force_new_perfdata => 1);
     bless $self, $class;
     
     $options{options}->add_options(arguments => {
-        "resource:s@"           => { name => 'resource' },
+        "resource:s"            => { name => 'resource' },
         "resource-group:s"      => { name => 'resource_group' },
         "filter-metric:s"       => { name => 'filter_metric' },
     });
@@ -143,18 +76,31 @@ sub check_options {
     my ($self, %options) = @_;
     $self->SUPER::check_options(%options);
 
-    if (!defined($self->{option_results}->{resource})) {
-        $self->{output}->add_option_msg(short_msg => "Need to specify either --resource <name> with --resource-group option or --resource <id>.");
+    if (!defined($self->{option_results}->{resource}) || $self->{option_results}->{resource} eq '') {
+        $self->{output}->add_option_msg(short_msg => 'Need to specify either --resource <name> with --resource-group option or --resource <id>.');
         $self->{output}->option_exit();
     }
+
+    my $resource = $self->{option_results}->{resource};
+    my $resource_group = defined($self->{option_results}->{resource_group}) ? $self->{option_results}->{resource_group} : '';
+
+    if ($resource =~ /^\/subscriptions\/.*\/resourceGroups\/(.*)\/providers\/Microsoft\.Network\/virtualNetworkGateways\/(.*)$/) {
+        $resource_group = $1;
+        $resource = $2;
+    }
     
-    $self->{az_resource} = $self->{option_results}->{resource};
-    $self->{az_resource_group} = $self->{option_results}->{resource_group} if (defined($self->{option_results}->{resource_group}));
+    $self->{az_resource} = $resource;
+    $self->{az_resource_group} = $resource_group;
     $self->{az_resource_type} = 'virtualNetworkGateways';
     $self->{az_resource_namespace} = 'Microsoft.Network';
     $self->{az_timeframe} = defined($self->{option_results}->{timeframe}) ? $self->{option_results}->{timeframe} : 900;
     $self->{az_interval} = defined($self->{option_results}->{interval}) ? $self->{option_results}->{interval} : "PT5M";
-    $self->{az_aggregations} = ['Average', 'Maximum'];
+    $self->{az_aggregations} = ['Average', 'Total'];
+
+    $self->{skip_aggregation}->{AverageBandwidth}->{total} = 0;
+    $self->{skip_aggregation}->{P2SBandwidth}->{total} = 0;
+    $self->{skip_aggregation}->{P2SConnectionCount}->{average} = 0;
+    
     if (defined($self->{option_results}->{aggregation})) {
         $self->{az_aggregations} = [];
         foreach my $stat (@{$self->{option_results}->{aggregation}}) {
@@ -164,58 +110,13 @@ sub check_options {
         }
     }
 
-    foreach my $metric ('AverageBandwidth', 'P2SBandwidth', 'P2SConnectionCount') {
+    foreach my $metric (keys %{$self->{metrics_mapping}}) {
         next if (defined($self->{option_results}->{filter_metric}) && $self->{option_results}->{filter_metric} ne ''
             && $metric !~ /$self->{option_results}->{filter_metric}/);
-
         push @{$self->{az_metrics}}, $metric;
     }
 }
 
-sub manage_selection {
-    my ($self, %options) = @_;
-
-    my %metric_results;
-    foreach my $resource (@{$self->{az_resource}}) {
-        my $resource_group = $self->{az_resource_group};
-        my $resource_name = $resource;
-        if ($resource =~ /^\/subscriptions\/.*\/resourceGroups\/(.*)\/providers\/Microsoft\.Network\/virtualNetworkGateways\/(.*)$/) {
-            $resource_group = $1;
-            $resource_name = $2;
-        }
-
-        ($metric_results{$resource_name}, undef) = $options{custom}->azure_get_metrics(
-            resource => $resource_name,
-            resource_group => $resource_group,
-            resource_type => $self->{az_resource_type},
-            resource_namespace => $self->{az_resource_namespace},
-            metrics => $self->{az_metrics},
-            aggregations => $self->{az_aggregations},
-            timeframe => $self->{az_timeframe},
-            interval => $self->{az_interval},
-        );
-        
-        foreach my $metric (@{$self->{az_metrics}}) {
-            my $metric_name = lc($metric);
-            $metric_name =~ s/ /_/g;
-            foreach my $aggregation (@{$self->{az_aggregations}}) {
-                next if (!defined($metric_results{$resource_name}->{$metric_name}->{lc($aggregation)}) && !defined($self->{option_results}->{zeroed}));
-
-                $self->{metric}->{$resource_name . "_" . lc($aggregation)}->{display} = $resource_name;
-                $self->{metric}->{$resource_name . "_" . lc($aggregation)}->{timeframe} = $self->{az_timeframe};
-                $self->{metric}->{$resource_name . "_" . lc($aggregation)}->{stat} = lc($aggregation);
-                $self->{metric}->{$resource_name . "_" . lc($aggregation)}->{$metric_name . "_" . lc($aggregation) . '_name'} = $metric_results{$resource_name}->{$metric_name}->{name};
-                $self->{metric}->{$resource_name . "_" . lc($aggregation)}->{$metric_name . "_" . lc($aggregation)} = defined($metric_results{$resource_name}->{$metric_name}->{lc($aggregation)}) ? $metric_results{$resource_name}->{$metric_name}->{lc($aggregation)} : 0;
-            }
-        }
-    }
-
-    if (scalar(keys %{$self->{metric}}) <= 0) {
-        $self->{output}->add_option_msg(short_msg => 'No metrics. Check your options or use --zeroed option to set 0 on undefined values');
-        $self->{output}->option_exit();
-    }
-}
-
 1;
 
 __END__
@@ -229,16 +130,16 @@ Example:
 Using resource name :
 
 perl centreon_plugins.pl --plugin=cloud::azure::network::vpngateway::plugin --custommode=azcli --mode=site-traffic
---resource=MyResource --resource-group=MYRGROUP --aggregation='average' --critical-averagebandwidth-average='10'
+--resource=MyResource --resource-group=MYRGROUP --aggregation='average' --aggregation='total' --critical-bandwidth-average='10' 
 --verbose
 
 Using resource id :
 
 perl centreon_plugins.pl --plugin=cloud::azure::network::vpngateway::plugin --custommode=azcli --mode=site-traffic
 --resource='/subscriptions/xxx/resourceGroups/xxx/providers/Microsoft.Network/virtualNetworkGateways/xxx'
---aggregation='average' --critical-averagebandwidth-average='10' --verbose
+--aggregation='average' --aggregation='total' --critical-bandwidth-average='10' --verbose
 
-Default aggregation: 'average', 'maximum' / All aggregations are valid.
+Default aggregation: 'average' (*Bandwidth), 'total' (P2SConnectionCount)
 
 =over 8
 
@@ -255,15 +156,15 @@ Set resource group (Required if resource's name is used).
 Filter metrics (Can be: 'AverageBandwidth', 'P2SBandwidth', 'P2SConnectionCount')
 (Can be a regexp).
 
-=item B<--warning-$metric$-$aggregation$>
+=item B<--warning-$label$>
 
-Thresholds warning ($metric$ can be: 'averagebandwidth', 'p2sbandwidth',
-'p2sconnectioncount', $aggregation$ can be: 'total', 'minimum', 'maximum', 'average').
+Warning thresholds 
+($label$ can be: 'bandwidth-average', 'p2s-bandwidth', p2s-connections)
 
-=item B<--critical-$metric$-$aggregation$>
+=item B<--critical-$label$>
 
-Thresholds critical ($metric$ can be: 'averagebandwidth', 'p2sbandwidth',
-'p2sconnectioncount', $aggregation$ can be: 'total', 'minimum', 'maximum', 'average').
+Critical thresholds
+($label$ can be: 'bandwidth-average', 'p2s-bandwidth', p2s-connections)
 
 =back
 
diff --git a/centreon-plugins/cloud/azure/network/vpngateway/mode/tunneltraffic.pm b/centreon-plugins/cloud/azure/network/vpngateway/mode/tunneltraffic.pm
index 029bf32de..e2d6dd95d 100644
--- a/centreon-plugins/cloud/azure/network/vpngateway/mode/tunneltraffic.pm
+++ b/centreon-plugins/cloud/azure/network/vpngateway/mode/tunneltraffic.pm
@@ -20,154 +20,77 @@
 
 package cloud::azure::network::vpngateway::mode::tunneltraffic;
 
-use base qw(centreon::plugins::templates::counter);
+use base qw(cloud::azure::custom::mode);
 
 use strict;
 use warnings;
 
-sub prefix_metric_output {
-    my ($self, %options) = @_;
-    
-    return "VPN Gateway '" . $options{instance_value}->{display} . "' " . $options{instance_value}->{stat} . " ";
-}
-
-sub custom_metric_calc {
-    my ($self, %options) = @_;
-    
-    $self->{result_values}->{stat} = $options{new_datas}->{$self->{instance} . '_stat'};
-    $self->{result_values}->{metric_perf} = lc($options{extra_options}->{metric_perf});
-    $self->{result_values}->{metric_label} = lc($options{extra_options}->{metric_label});
-    $self->{result_values}->{metric_name} = $options{new_datas}->{$self->{instance} . '_' . $self->{result_values}->{metric_perf} . '_' . $self->{result_values}->{stat} . '_name'};
-    $self->{result_values}->{timeframe} = $options{new_datas}->{$self->{instance} . '_timeframe'};
-    $self->{result_values}->{value} = $options{new_datas}->{$self->{instance} . '_' . $self->{result_values}->{metric_perf} . '_' . $self->{result_values}->{stat}};
-    $self->{result_values}->{value_per_sec} = $self->{result_values}->{value} / $self->{result_values}->{timeframe};
-    $self->{result_values}->{display} = $options{new_datas}->{$self->{instance} . '_display'};
-
-    return 0;
-}
-
-sub custom_metric_threshold {
+sub get_metrics_mapping {
     my ($self, %options) = @_;
 
-    my $exit = $self->{perfdata}->threshold_check(value => defined($self->{instance_mode}->{option_results}->{per_sec}) ?  $self->{result_values}->{value_per_sec} : $self->{result_values}->{value},
-                                                  threshold => [ { label => 'critical-' . $self->{result_values}->{metric_label} . "-" . $self->{result_values}->{stat}, exit_litteral => 'critical' },
-                                                                 { label => 'warning-' . $self->{result_values}->{metric_label} . "-" . $self->{result_values}->{stat}, exit_litteral => 'warning' } ]);
-    return $exit;
-}
-
-sub custom_traffic_perfdata {
-    my ($self, %options) = @_;
-
-    my $extra_label = '';
-    $extra_label = '_' . lc($self->{result_values}->{display}) if (!defined($options{extra_instance}) || $options{extra_instance} != 0);
-
-    $self->{output}->perfdata_add(label => $self->{result_values}->{metric_perf} . "_" . $self->{result_values}->{stat} . $extra_label,
-				                  unit => defined($self->{instance_mode}->{option_results}->{per_sec}) ? 'B/s' : 'B',
-                                  value => sprintf("%.2f", defined($self->{instance_mode}->{option_results}->{per_sec}) ? $self->{result_values}->{value_per_sec} : $self->{result_values}->{value}),
-                                  warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{result_values}->{metric_label} . "-" . $self->{result_values}->{stat}),
-                                  critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{result_values}->{metric_label} . "-" . $self->{result_values}->{stat}),
-                                  min => 0
-                                 );
-}
-
-sub custom_traffic_output {
-    my ($self, %options) = @_;
-    my $msg = "";
-
-    if (defined($self->{instance_mode}->{option_results}->{per_sec})) {
-        my ($value, $unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{value_per_sec});
-        $msg = $self->{result_values}->{metric_name}  . ": " . $value . $unit . "/s"; 
-    } else {
-        my ($value, $unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{value});
-        $msg = $self->{result_values}->{metric_name}  . ": " . $value . $unit;
-    }
-    return $msg;
-}
-
-sub custom_packets_perfdata {
-    my ($self, %options) = @_;
-
-    my $extra_label = '';
-    $extra_label = '_' . lc($self->{result_values}->{display}) if (!defined($options{extra_instance}) || $options{extra_instance} != 0);
-
-    $self->{output}->perfdata_add(label => $self->{result_values}->{metric_perf} . "_" . $self->{result_values}->{stat} . $extra_label,
-                                  unit => defined($self->{instance_mode}->{option_results}->{per_sec}) ? 'packets/s' : 'packets',
-                                  value => sprintf("%.2f", defined($self->{instance_mode}->{option_results}->{per_sec}) ? $self->{result_values}->{value_per_sec} : $self->{result_values}->{value}),
-                                  warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{result_values}->{metric_label} . "-" . $self->{result_values}->{stat}),
-                                  critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{result_values}->{metric_label} . "-" . $self->{result_values}->{stat}),
-                                  min => 0
-                                 );
-}
-
-sub custom_packets_output {
-    my ($self, %options) = @_;
-    my $msg ="";
-
-    if (defined($self->{instance_mode}->{option_results}->{per_sec})) {
-        $msg = sprintf("%s: %.2f packets/s", $self->{result_values}->{metric_name}, $self->{result_values}->{value_per_sec});
-    } else {
-        $msg = sprintf("%s: %.2f packets", $self->{result_values}->{metric_name}, $self->{result_values}->{value});
-    } 
-    return $msg;
-}
-
-sub set_counters {
-    my ($self, %options) = @_;
-    
-    $self->{maps_counters_type} = [
-        { name => 'metric', type => 1, cb_prefix_output => 'prefix_metric_output', message_multiple => "All traffic metrics are ok", skipped_code => { -10 => 1 } },
-    ];
-
-    foreach my $aggregation ('minimum', 'maximum', 'average', 'total') {
-        foreach my $metric ('TunnelIngressBytes', 'TunnelEgressBytes') {
-            my $metric_perf = lc($metric);
-            my $metric_label = lc($metric);
-            $metric_perf =~ s/ /_/g;
-            $metric_label =~ s/ /-/g;
-            my $entry = { label => $metric_label . '-' . $aggregation, set => {
-                                key_values => [ { name => $metric_perf . '_' . $aggregation }, { name => 'display' },
-                                    { name => 'stat' }, { name => $metric_perf . '_' . $aggregation . '_name' }, { name => 'timeframe' } ],
-                                closure_custom_calc => $self->can('custom_metric_calc'),
-                                closure_custom_calc_extra_options => { metric_perf => $metric_perf,
-                                    metric_label => $metric_label },
-                                closure_custom_output => $self->can('custom_traffic_output'),
-                                closure_custom_perfdata => $self->can('custom_traffic_perfdata'),
-                                closure_custom_threshold_check => $self->can('custom_metric_threshold'),
-                            }
-                        };
-            push @{$self->{maps_counters}->{metric}}, $entry;
+    my $metrics_mapping = {
+        'TunnelIngressBytes' => {
+            'output' => 'Ingress bytes',
+            'label'  => 'traffic-in',
+            'nlabel' => 'azvpngateway.tunnel.ingress.bytes',
+            'unit'   => 'B',
+            'min'    => '0',
+            'max'    => ''
+        },
+        'TunnelEgressBytes' => {
+            'output' => 'Egress bytes',
+            'label'  => 'traffic-out',
+            'nlabel' => 'azvpngateway.tunnel.egress.bytes',
+            'unit'   => 'B',
+            'min'    => '0',
+            'max'    => ''
+        },
+        'TunnelIngressPackets' => {
+            'output' => 'Ingress packets',
+            'label'  => 'packets-in',
+            'nlabel' => 'azvpngateway.tunnel.packets.in.count',
+            'unit'   => '',
+            'min'    => '0',
+            'max'    => ''
+        },
+        'TunnelEgressPackets' => {
+            'output' => 'Egress packets',
+            'label'  => 'packets-out',
+            'nlabel' => 'azvpngateway.tunnel.packets.out.count',
+            'unit'   => '',
+            'min'    => '0',
+            'max'    => ''
+        },
+        'TunnelIngressPacketDropTSMismatch' => {
+            'output' => 'Ingress packets dropped (TSmismatch)',
+            'label'  => 'dropped-packets-in',
+            'nlabel' => 'azvpngateway.tunnel.dropped.packets.in.count',
+            'unit'   => '',
+            'min'    => '0',
+            'max'    => ''
+        },
+        'TunnelEgressPacketDropTSMismatch' => {
+            'output' => 'Egress packets dropped (TSmismatch)',
+            'label'  => 'dropped-packets-out',
+            'nlabel' => 'azvpngateway.tunnel.dropped.packets.out.count',
+            'unit'   => '',
+            'min'    => '0',
+            'max'    => ''
         }
-        foreach my $metric ('TunnelIngressPackets', 'TunnelEgressPackets', 'TunnelIngressPacketDropTSMismatch', 'TunnelEgressPacketDropTSMismatch') {
-            my $metric_perf = lc($metric);
-            my $metric_label = lc($metric);
-            $metric_perf =~ s/ /_/g;
-            $metric_label =~ s/ /-/g;
-            my $entry = { label => $metric_label . '-' . $aggregation, set => {
-                                key_values => [ { name => $metric_perf . '_' . $aggregation }, { name => 'display' },
-                                    { name => 'stat' }, { name => $metric_perf . '_' . $aggregation . '_name' }, { name => 'timeframe' } ],
-                                closure_custom_calc => $self->can('custom_metric_calc'),
-                                closure_custom_calc_extra_options => { metric_perf => $metric_perf,
-                                    metric_label => $metric_label },
-                                closure_custom_output => $self->can('custom_packets_output'),
-                                closure_custom_perfdata => $self->can('custom_packets_perfdata'),
-                                closure_custom_threshold_check => $self->can('custom_metric_threshold'),
-                            }
-                        };
-            push @{$self->{maps_counters}->{metric}}, $entry;
-        }
-    }
+    };
+
+    return $metrics_mapping;
 }
 
 sub new {
     my ($class, %options) = @_;
-    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options, force_new_perfdata => 1);
     bless $self, $class;
     
     $options{options}->add_options(arguments => {
-        "resource:s@"           => { name => 'resource' },
-        "resource-group:s"      => { name => 'resource_group' },
-        "filter-metric:s"       => { name => 'filter_metric' },
-        "per-sec"               => { name => 'per_sec' },
+        "resource:s"       => { name => 'resource' },
+        "resource-group:s" => { name => 'resource_group' },
+        "filter-metric:s"  => { name => 'filter_metric' }
     });
 
     return $self;
@@ -177,18 +100,27 @@ sub check_options {
     my ($self, %options) = @_;
     $self->SUPER::check_options(%options);
 
-    if (!defined($self->{option_results}->{resource})) {
-        $self->{output}->add_option_msg(short_msg => "Need to specify either --resource <name> with --resource-group option or --resource <id>.");
+    if (!defined($self->{option_results}->{resource}) || $self->{option_results}->{resource} eq '') {
+        $self->{output}->add_option_msg(short_msg => 'Need to specify either --resource <name> with --resource-group option or --resource <id>.');
         $self->{output}->option_exit();
     }
+
+    my $resource = $self->{option_results}->{resource};
+    my $resource_group = defined($self->{option_results}->{resource_group}) ? $self->{option_results}->{resource_group} : '';
+
+    if ($resource =~ /^\/subscriptions\/.*\/resourceGroups\/(.*)\/providers\/Microsoft\.Network\/virtualNetworkGateways\/(.*)$/) {
+        $resource_group = $1;
+        $resource = $2;
+    }
     
-    $self->{az_resource} = $self->{option_results}->{resource};
-    $self->{az_resource_group} = $self->{option_results}->{resource_group} if (defined($self->{option_results}->{resource_group}));
+    $self->{az_resource} = $resource;
+    $self->{az_resource_group} = $resource_group;
     $self->{az_resource_type} = 'virtualNetworkGateways';
     $self->{az_resource_namespace} = 'Microsoft.Network';
     $self->{az_timeframe} = defined($self->{option_results}->{timeframe}) ? $self->{option_results}->{timeframe} : 900;
     $self->{az_interval} = defined($self->{option_results}->{interval}) ? $self->{option_results}->{interval} : "PT5M";
     $self->{az_aggregations} = ['Total'];
+
     if (defined($self->{option_results}->{aggregation})) {
         $self->{az_aggregations} = [];
         foreach my $stat (@{$self->{option_results}->{aggregation}}) {
@@ -198,59 +130,13 @@ sub check_options {
         }
     }
 
-    foreach my $metric ('TunnelIngressBytes', 'TunnelEgressBytes', 'TunnelIngressPackets', 'TunnelEgressPackets',
-        'TunnelIngressPacketDropTSMismatch', 'TunnelEgressPacketDropTSMismatch') {
+    foreach my $metric (keys %{$self->{metrics_mapping}}) {
         next if (defined($self->{option_results}->{filter_metric}) && $self->{option_results}->{filter_metric} ne ''
             && $metric !~ /$self->{option_results}->{filter_metric}/);
-
         push @{$self->{az_metrics}}, $metric;
     }
 }
 
-sub manage_selection {
-    my ($self, %options) = @_;
-
-    my %metric_results;
-    foreach my $resource (@{$self->{az_resource}}) {
-        my $resource_group = $self->{az_resource_group};
-        my $resource_name = $resource;
-        if ($resource =~ /^\/subscriptions\/.*\/resourceGroups\/(.*)\/providers\/Microsoft\.Network\/virtualNetworkGateways\/(.*)$/) {
-            $resource_group = $1;
-            $resource_name = $2;
-        }
-
-        ($metric_results{$resource_name}, undef) = $options{custom}->azure_get_metrics(
-            resource => $resource_name,
-            resource_group => $resource_group,
-            resource_type => $self->{az_resource_type},
-            resource_namespace => $self->{az_resource_namespace},
-            metrics => $self->{az_metrics},
-            aggregations => $self->{az_aggregations},
-            timeframe => $self->{az_timeframe},
-            interval => $self->{az_interval},
-        );
-        
-        foreach my $metric (@{$self->{az_metrics}}) {
-            my $metric_name = lc($metric);
-            $metric_name =~ s/ /_/g;
-            foreach my $aggregation (@{$self->{az_aggregations}}) {
-                next if (!defined($metric_results{$resource_name}->{$metric_name}->{lc($aggregation)}) && !defined($self->{option_results}->{zeroed}));
-
-                $self->{metric}->{$resource_name . "_" . lc($aggregation)}->{display} = $resource_name;
-                $self->{metric}->{$resource_name . "_" . lc($aggregation)}->{timeframe} = $self->{az_timeframe};
-                $self->{metric}->{$resource_name . "_" . lc($aggregation)}->{stat} = lc($aggregation);
-                $self->{metric}->{$resource_name . "_" . lc($aggregation)}->{$metric_name . "_" . lc($aggregation) . '_name'} = $metric_results{$resource_name}->{$metric_name}->{name};
-                $self->{metric}->{$resource_name . "_" . lc($aggregation)}->{$metric_name . "_" . lc($aggregation)} = defined($metric_results{$resource_name}->{$metric_name}->{lc($aggregation)}) ? $metric_results{$resource_name}->{$metric_name}->{lc($aggregation)} : 0;
-            }
-        }
-    }
-
-    if (scalar(keys %{$self->{metric}}) <= 0) {
-        $self->{output}->add_option_msg(short_msg => 'No metrics. Check your options or use --zeroed option to set 0 on undefined values');
-        $self->{output}->option_exit();
-    }
-}
-
 1;
 
 __END__
@@ -264,16 +150,14 @@ Example:
 Using resource name :
 
 perl centreon_plugins.pl --plugin=cloud::azure::network::vpngateway::plugin --custommode=azcli --mode=tunnel-traffic
---resource=MyResource --resource-group=MYRGROUP --aggregation='total' --critical-tunnelingressbytes-total='10'
+--resource=MyResource --resource-group=MYRGROUP --aggregation='total' --critical-traffic-in='10'
 --verbose
 
 Using resource id :
 
 perl centreon_plugins.pl --plugin=cloud::azure::network::vpngateway::plugin --custommode=azcli --mode=tunnel-traffic
 --resource='/subscriptions/xxx/resourceGroups/xxx/providers/Microsoft.Network/virtualNetworkGateways/xxx'
---aggregation='total' --critical-tunnelingressbytes-total='10' --verbose
-
-Default aggregation: 'total' / All aggregations are valid.
+--aggregation='total' --critical-traffic-in='10' --verbose
 
 =over 8
 
@@ -291,17 +175,15 @@ Filter metrics (Can be: 'TunnelIngressBytes', 'TunnelEgressBytes', 'TunnelIngres
 'TunnelEgressPackets', 'TunnelIngressPacketDropTSMismatch', 'TunnelEgressPacketDropTSMismatch')
 (Can be a regexp).
 
-=item B<--warning-$metric$-$aggregation$>
+=item B<--warning-$label$>
 
-Thresholds warning ($metric$ can be: 'tunnelingressbytes', 'tunnelegressbytes',
-'tunnelingresspackets', 'tunnelegresspackets', 'tunnelingresspacketdroptsmismatch',
-'tunnelegresspacketdroptsmismatch', $aggregation$ can be: 'total', 'minimum', 'maximum', 'average').
+Warning thresholds.
+($label$ can be traffic-in, traffic-out,  packets-in, packets-out, dropped-packets-in, dropped-packets-out)
 
-=item B<--critical-$metric$-$aggregation$>
+=item B<--critical-$label$>
 
-Thresholds critical ($metric$ can be: 'tunnelingressbytes', 'tunnelegressbytes',
-'tunnelingresspackets', 'tunnelegresspackets', 'tunnelingresspacketdroptsmismatch',
-'tunnelegresspacketdroptsmismatch', $aggregation$ can be: 'total', 'minimum', 'maximum', 'average').
+Critical thresholds
+($label$ can be traffic-in, traffic-out,  packets-in, packets-out, dropped-packets-in, dropped-packets-out)
 
 =item B<--per-sec>
 
diff --git a/centreon-plugins/cloud/azure/network/vpngateway/mode/vpngatewaystatus.pm b/centreon-plugins/cloud/azure/network/vpngateway/mode/vpngatewaystatus.pm
index 24133b093..095fa5500 100644
--- a/centreon-plugins/cloud/azure/network/vpngateway/mode/vpngatewaystatus.pm
+++ b/centreon-plugins/cloud/azure/network/vpngateway/mode/vpngatewaystatus.pm
@@ -24,7 +24,7 @@ use base qw(centreon::plugins::templates::counter);
 
 use strict;
 use warnings;
-use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold);
+use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold_ng);
 
 sub custom_status_output {
     my ($self, %options) = @_;
@@ -36,20 +36,10 @@ sub custom_status_output {
     return $msg;
 }
 
-sub custom_status_calc {
-    my ($self, %options) = @_;
-    
-    $self->{result_values}->{provisioning_state} = $options{new_datas}->{$self->{instance} . '_provisioning_state'};
-    $self->{result_values}->{gateway_type} = $options{new_datas}->{$self->{instance} . '_gateway_type'};
-    $self->{result_values}->{vpn_type} = $options{new_datas}->{$self->{instance} . '_vpn_type'};
-    $self->{result_values}->{display} = $options{new_datas}->{$self->{instance} . '_display'};
-    return 0;
-}
-
 sub prefix_vpn_output {
     my ($self, %options) = @_;
     
-    return "VPN Gateway '" . $options{instance_value}->{display} . "' ";
+    return "VPN Gateway '" . $options{instance_value}->{name} . "' ";
 }
 
 sub set_counters {
@@ -60,13 +50,15 @@ sub set_counters {
     ];
 
     $self->{maps_counters}->{vpns} = [
-        { label => 'status', threshold => 0, set => {
-                key_values => [ { name => 'provisioning_state' }, { name => 'gateway_type' }, { name => 'vpn_type' },
-                                { name => 'display' } ],
-                closure_custom_calc => $self->can('custom_status_calc'),
+        { 
+            label => 'status', 
+            type => 2, 
+            critical_default => '%{provisioning_state} ne "Succeeded"',
+            set => { 
+                key_values => [ { name => 'provisioning_state' }, { name => 'gateway_type' }, { name => 'vpn_type' }, { name => 'name' } ],
                 closure_custom_output => $self->can('custom_status_output'),
                 closure_custom_perfdata => sub { return 0; },
-                closure_custom_threshold_check => \&catalog_status_threshold,
+                closure_custom_threshold_check => \&catalog_status_threshold_ng,
             }
         },
     ];
@@ -74,16 +66,13 @@ sub set_counters {
 
 sub new {
     my ($class, %options) = @_;
-    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options, force_new_perfdata => 1);
     bless $self, $class;
     
-    $options{options}->add_options(arguments =>
-                                {
-                                    "resource-group:s"      => { name => 'resource_group' },
-                                    "filter-name:s"         => { name => 'filter_name' },
-                                    "warning-status:s"      => { name => 'warning_status', default => '' },
-                                    "critical-status:s"     => { name => 'critical_status', default => '%{provisioning_state} ne "Succeeded"' },
-                                });
+    $options{options}->add_options(arguments => {
+            "resource-group:s"      => { name => 'resource_group' },
+            "filter-name:s"         => { name => 'filter_name' }
+    });
     
     return $self;
 }
@@ -97,7 +86,6 @@ sub check_options {
         $self->{output}->option_exit();
     }
 
-    $self->change_macros(macros => ['warning_status', 'critical_status']);
 }
 
 sub manage_selection {