diff --git a/centreon-plugins/os/hpux/local/mode/inodes.pm b/centreon-plugins/os/hpux/local/mode/inodes.pm
index 32a73c3e7..d7ef109c0 100644
--- a/centreon-plugins/os/hpux/local/mode/inodes.pm
+++ b/centreon-plugins/os/hpux/local/mode/inodes.pm
@@ -1,5 +1,5 @@
 #
-# Copyright 2017 Centreon (http://www.centreon.com/)
+# Copyright 2018 Centreon (http://www.centreon.com/)
 #
 # Centreon is a full-fledged industry-strength solution that meets
 # the needs in IT infrastructure and application monitoring for
@@ -20,12 +20,38 @@
 
 package os::hpux::local::mode::inodes;
 
-use base qw(centreon::plugins::mode);
+use base qw(centreon::plugins::templates::counter);
 
 use strict;
 use warnings;
 use centreon::plugins::misc;
 
+sub set_counters {
+    my ($self, %options) = @_;
+    
+    $self->{maps_counters_type} = [
+        { name => 'inodes', type => 1, cb_prefix_output => 'prefix_inodes_output', message_multiple => 'All partitions inodes usage are ok' }
+    ];
+    
+    $self->{maps_counters}->{inodes} = [
+        { label => 'usage', set => {
+                key_values => [ { name => 'used' }, { name => 'display' } ],
+                output_template => 'Used: %s %%',
+                perfdatas => [
+                    { label => 'used', value => 'used_absolute', template => '%d',
+                      unit => '%', min => 0, max => 100, label_extra_instance => 1, instance_use => 'display_absolute' },
+                ],
+            }
+        },
+    ];
+}
+
+sub prefix_inodes_output {
+    my ($self, %options) = @_;
+    
+    return "Inodes partition '" . $options{instance_value}->{display} . "' ";
+}
+
 sub new {
     my ($class, %options) = @_;
     my $self = $class->SUPER::new(package => __PACKAGE__, %options);
@@ -34,65 +60,51 @@ sub new {
     $self->{version} = '1.0';
     $options{options}->add_options(arguments =>
                                 {
-                                  "hostname:s"        => { name => 'hostname' },
-                                  "remote"            => { name => 'remote' },
-                                  "ssh-option:s@"     => { name => 'ssh_option' },
-                                  "ssh-path:s"        => { name => 'ssh_path' },
-                                  "ssh-command:s"     => { name => 'ssh_command', default => 'ssh' },
-                                  "timeout:s"         => { name => 'timeout', default => 30 },
-                                  "sudo"              => { name => 'sudo' },
-                                  "command:s"         => { name => 'command', default => 'bdf' },
-                                  "command-path:s"    => { name => 'command_path' },
-                                  "command-options:s" => { name => 'command_options', default => '-i 2>&1' },
-                                  "filter-fs:s"       => { name => 'filter_fs', },
-                                  "warning:s"         => { name => 'warning' },
-                                  "critical:s"        => { name => 'critical' },
-                                  "units:s"           => { name => 'units', default => '%' },
-                                  "free"              => { name => 'free' },
-                                  "name:s"            => { name => 'name' },
+                                  "hostname:s"          => { name => 'hostname' },
+                                  "remote"              => { name => 'remote' },
+                                  "ssh-option:s@"       => { name => 'ssh_option' },
+                                  "ssh-path:s"          => { name => 'ssh_path' },
+                                  "ssh-command:s"       => { name => 'ssh_command', default => 'ssh' },
+                                  "timeout:s"           => { name => 'timeout', default => 30 },
+                                  "sudo"                => { name => 'sudo' },
+                                  "command:s"           => { name => 'command', default => 'bdf' },
+                                  "command-path:s"      => { name => 'command_path' },
+                                  "command-options:s"   => { name => 'command_options', default => '-i 2>&1' },
+                                  "filter-fs:s"         => { name => 'filter_fs', },
+                                  "name:s"              => { name => 'name' },
                                   "regexp"              => { name => 'use_regexp' },
                                   "regexp-isensitive"   => { name => 'use_regexpi' },
-                                  "space-reservation:s" => { name => 'space_reservation' },
                                 });
     $self->{result} = {};
     return $self;
 }
 
-sub check_options {
-    my ($self, %options) = @_;
-    $self->SUPER::init(%options);
-    if (($self->{perfdata}->threshold_validate(label => 'warning', value => $self->{option_results}->{warning})) == 0) {
-       $self->{output}->add_option_msg(short_msg => "Wrong warning threshold '" . $self->{option_results}->{warning} . "'.");
-       $self->{output}->option_exit();
-    }
-    if (($self->{perfdata}->threshold_validate(label => 'critical', value => $self->{option_results}->{critical})) == 0) {
-       $self->{output}->add_option_msg(short_msg => "Wrong critical threshold '" . $self->{option_results}->{critical} . "'.");
-       $self->{output}->option_exit();
-    }
-}
-
 sub manage_selection {
     my ($self, %options) = @_;
 
-    my $stdout = centreon::plugins::misc::execute(output => $self->{output},
-                                                  options => $self->{option_results},
-                                                  sudo => $self->{option_results}->{sudo},
-                                                  command => $self->{option_results}->{command},
-                                                  command_path => $self->{option_results}->{command_path},
-                                                  command_options => $self->{option_results}->{command_options});
+    my ($stdout, $exit_code) = centreon::plugins::misc::execute(
+        output => $self->{output},
+        options => $self->{option_results},
+        sudo => $self->{option_results}->{sudo},
+        command => $self->{option_results}->{command},
+        command_path => $self->{option_results}->{command_path},
+        command_options => $self->{option_results}->{command_options},
+        no_quit => 1
+    );
+    $self->{inodes} = {};
     my @lines = split /\n/, $stdout;
     # Header not needed
     shift @lines;
     while (my $line = shift @lines) {
         # When the line is too long, the FS name is printed on a separated line
         if ($line !~ /^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)/) {
-            $line .= "    ".shift @lines;
+            $line .= "    " . shift @lines;
         }
         next if ($line !~ /^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)/);
         my ($fs, $size, $used, $available, $percent, $iused, $ifree, $ipercent, $mount) = ($1, $2, $3, $4, $5, $6, $7, $8, $9);
         
         next if (defined($self->{option_results}->{filter_fs}) && $self->{option_results}->{filter_fs} ne '' &&
-                 $fs !~ /$self->{option_results}->{filter_fs}/);
+            $fs !~ /$self->{option_results}->{filter_fs}/);
         
         next if (defined($self->{option_results}->{name}) && defined($self->{option_results}->{use_regexp}) && defined($self->{option_results}->{use_regexpi}) 
             && $mount !~ /$self->{option_results}->{name}/i);
@@ -100,102 +112,18 @@ sub manage_selection {
             && $mount !~ /$self->{option_results}->{name}/);
         next if (defined($self->{option_results}->{name}) && !defined($self->{option_results}->{use_regexp}) && !defined($self->{option_results}->{use_regexpi})
             && $mount ne $self->{option_results}->{name});
-
-    next if ($ifree !~ m/^\d+$/ || $iused !~ m/^\d+$/ || $ipercent !~ m/^\d+%$/);
-
-        $self->{result}->{$mount} = {fs => $fs, total => $ifree + $iused, used => $iused, free => $ifree};
-    }
-    
-    if (scalar(keys %{$self->{result}}) <= 0) {
-        if (defined($self->{option_results}->{name})) {
-            $self->{output}->add_option_msg(short_msg => "No file systems found for mount point '" . $self->{option_results}->{name} . "'.");
-        } else {
-            $self->{output}->add_option_msg(short_msg => "No file systems found.");
-        }
-        $self->{output}->option_exit();
-    }
-}
-
-sub run {
-    my ($self, %options) = @_;
-    
-    $self->manage_selection();
-    if (!defined($self->{option_results}->{name}) || defined($self->{option_results}->{use_regexp})) {
-        $self->{output}->output_add(severity => 'OK',
-                                    short_msg => 'All file systems are ok.');
-    }
-    
-    my $num_disk_check = 0;
-    foreach my $name (sort(keys %{$self->{result}})) {
-        my $total_size = $self->{result}->{$name}->{total};
-        if (defined($self->{option_results}->{space_reservation})) {
-            $total_size = $total_size - ($self->{option_results}->{space_reservation} * $total_size / 100);
-        }
-        next if ($total_size == 0);
         
-        $num_disk_check++;
-        my $total_used = $self->{result}->{$name}->{used};
-        my $total_free = $self->{result}->{$name}->{free};
-        my $prct_used = $total_used * 100 / $total_size;
-        my $prct_free = 100 - $prct_used;
-
-        my ($exit, $threshold_value);
-
-        $threshold_value = $total_used;
-        $threshold_value = $total_free if (defined($self->{option_results}->{free}));
-        if ($self->{option_results}->{units} eq '%') {
-            $threshold_value = $prct_used;
-            $threshold_value = $prct_free if (defined($self->{option_results}->{free}));
-        } 
-        $exit = $self->{perfdata}->threshold_check(value => $threshold_value, threshold => [ { label => 'critical', 'exit_litteral' => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]);
-
-        #my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $total_size);
-        #my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $total_used);
-        #my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => ($total_size - $total_used));
-
-        my ($total_size_value, $total_size_unit) =  ($total_size, 'inodes');
-        my ($total_used_value, $total_used_unit) = ($total_used, 'inodes');
-        my ($total_free_value, $total_free_unit) = (($total_size - $total_used), 'inodes');
-
-        $self->{output}->output_add(long_msg => sprintf("FS '%s' Total: %s Used: %s (%.2f%%) Free: %s (%.2f%%)", $name,
-                                            $total_size_value . " " . $total_size_unit,
-                                            $total_used_value . " " . $total_used_unit, $prct_used,
-                                            $total_free_value . " " . $total_free_unit, $prct_free));
-        if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1) || (defined($self->{option_results}->{name}) && !defined($self->{option_results}->{use_regexp}))) {
-            $self->{output}->output_add(severity => $exit,
-                                        short_msg => sprintf("FS '%s' Total: %s Used: %s (%.2f%%) Free: %s (%.2f%%)", $name,
-                                            $total_size_value . " " . $total_size_unit,
-                                            $total_used_value . " " . $total_used_unit, $prct_used,
-                                            $total_free_value . " " . $total_free_unit, $prct_free));
-        }    
-
-        my $label = 'used';
-        my $value_perf = $total_used;
-        if (defined($self->{option_results}->{free})) {
-            $label = 'free';
-            $value_perf = $total_free;
-        }
-        my $extra_label = '';
-        $extra_label = '_' . $name if (!defined($self->{option_results}->{name}) || defined($self->{option_results}->{use_regexp}));
-        my %total_options = ();
-        if ($self->{option_results}->{units} eq '%') {
-            $total_options{total} = $total_size;
-            $total_options{cast_int} = 1; 
-        }
-        $self->{output}->perfdata_add(label => $label . $extra_label,
-                                      value => $value_perf,
-                                      warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning', %total_options),
-                                      critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical', %total_options),
-                                      min => 0, max => $total_size);
-    }
-
-    if ($num_disk_check == 0) {
-        $self->{output}->add_option_msg(short_msg => "No file systems checked.");
-        $self->{output}->option_exit();
+        $ipercent =~ s/%//g;
+        $self->{inodes}->{$mount} = { display => $mount, used => $ipercent };
     }
     
-    $self->{output}->display();
-    $self->{output}->exit();
+    if (scalar(keys %{$self->{inodes}}) <= 0) {
+        if ($exit_code != 0) {
+            $self->{output}->output_add(long_msg => "command output:" . $stdout);
+        }
+        $self->{output}->add_option_msg(short_msg => "No storage found (filters or command issue)");
+        $self->{output}->option_exit();
+    }
 }
 
 1;
@@ -204,7 +132,7 @@ __END__
 
 =head1 MODE
 
-Check file systems usage.
+Check inodes usage on partitions.
 
 =over 8
 
@@ -247,23 +175,15 @@ Command path (Default: none).
 
 =item B<--command-options>
 
-Command options (Default: '-P -k 2>&1').
+Command options (Default: '-i 2>&1').
 
-=item B<--warning>
+=item B<--warning-usage>
 
-Threshold warning.
+Threshold warning in percent.
 
-=item B<--critical>
+=item B<--critical-usage>
 
-Threshold critical.
-
-=item B<--units>
-
-Units of thresholds (Default: '%') ('%', 'B').
-
-=item B<--free>
-
-Thresholds are on free space left.
+Threshold critical in percent.
 
 =item B<--name>
 
@@ -281,11 +201,6 @@ Allows to use regexp non case-sensitive (with --regexp).
 
 Filter filesystem (regexp can be used).
 
-=item B<--space-reservation>
-
-Some filesystem has space reserved (like ext4 for root).
-The value is in percent of total (Default: none).
-
 =back
 
 =cut
diff --git a/centreon-plugins/os/hpux/local/mode/storage.pm b/centreon-plugins/os/hpux/local/mode/storage.pm
index cee6611f6..36f048c84 100644
--- a/centreon-plugins/os/hpux/local/mode/storage.pm
+++ b/centreon-plugins/os/hpux/local/mode/storage.pm
@@ -20,12 +20,107 @@
 
 package os::hpux::local::mode::storage;
 
-use base qw(centreon::plugins::mode);
+use base qw(centreon::plugins::templates::counter);
 
 use strict;
 use warnings;
 use centreon::plugins::misc;
 
+my $instance_mode;
+
+sub custom_usage_perfdata {
+    my ($self, %options) = @_;
+
+    my $label = 'used';
+    my $value_perf = $self->{result_values}->{used};
+    if (defined($instance_mode->{option_results}->{free})) {
+        $label = 'free';
+        $value_perf = $self->{result_values}->{free};
+    }
+    my $extra_label = '';
+    $extra_label = '_' . $self->{result_values}->{display} if (!defined($options{extra_instance}) || $options{extra_instance} != 0);
+    my %total_options = ();
+    if ($instance_mode->{option_results}->{units} eq '%') {
+        $total_options{total} = $self->{result_values}->{total};
+        $total_options{cast_int} = 1;
+    }
+
+    $self->{output}->perfdata_add(label => $label . $extra_label, unit => 'B',
+                                  value => $value_perf,
+                                  warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning-' . $self->{label}, %total_options),
+                                  critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical-' . $self->{label}, %total_options),
+                                  min => 0, max => $self->{result_values}->{total});
+}
+
+sub custom_usage_threshold {
+    my ($self, %options) = @_;
+
+    my ($exit, $threshold_value);
+    $threshold_value = $self->{result_values}->{used};
+    $threshold_value = $self->{result_values}->{free} if (defined($instance_mode->{option_results}->{free}));
+    if ($instance_mode->{option_results}->{units} eq '%') {
+        $threshold_value = $self->{result_values}->{prct_used};
+        $threshold_value = $self->{result_values}->{prct_free} if (defined($instance_mode->{option_results}->{free}));
+    }
+    $exit = $self->{perfdata}->threshold_check(value => $threshold_value, threshold => [ { label => 'critical-' . $self->{label}, exit_litteral => 'critical' }, { label => 'warning-'. $self->{label}, exit_litteral => 'warning' } ]);
+    return $exit;
+}
+
+sub custom_usage_output {
+    my ($self, %options) = @_;
+
+    my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{total});
+    my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{used});
+    my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => $self->{result_values}->{free});
+    my $msg = sprintf("Usage Total: %s Used: %s (%.2f%%) Free: %s (%.2f%%)",
+                   $total_size_value . " " . $total_size_unit,
+                   $total_used_value . " " . $total_used_unit, $self->{result_values}->{prct_used},
+                   $total_free_value . " " . $total_free_unit, $self->{result_values}->{prct_free});
+    return $msg;
+}
+
+sub custom_usage_calc {
+    my ($self, %options) = @_;
+
+    if ($options{new_datas}->{$self->{instance} . '_total'} == 0) {
+        $self->{error_msg} = "total size is 0";
+        return -2;
+    }
+    $self->{result_values}->{display} = $options{new_datas}->{$self->{instance} . '_display'};
+    $self->{result_values}->{total} = $options{new_datas}->{$self->{instance} . '_total'};
+    $self->{result_values}->{used} = $options{new_datas}->{$self->{instance} . '_used'};
+    $self->{result_values}->{free} = $self->{result_values}->{total} - $self->{result_values}->{used};
+    $self->{result_values}->{prct_used} = $self->{result_values}->{used} * 100 / $self->{result_values}->{total};
+    $self->{result_values}->{prct_free} = 100 - $self->{result_values}->{prct_used};
+
+    return 0;
+}
+
+sub set_counters {
+    my ($self, %options) = @_;
+    
+    $self->{maps_counters_type} = [
+        { name => 'disks', type => 1, cb_prefix_output => 'prefix_disks_output', message_multiple => 'All storages are ok' }
+    ];
+    
+    $self->{maps_counters}->{disks} = [
+        { label => 'usage', set => {
+                key_values => [ { name => 'display' }, { name => 'used' }, { name => 'total' } ],
+                closure_custom_calc => $self->can('custom_usage_calc'),
+                closure_custom_output => $self->can('custom_usage_output'),
+                closure_custom_perfdata => $self->can('custom_usage_perfdata'),
+                closure_custom_threshold_check => $self->can('custom_usage_threshold'),
+            }
+        },
+    ];
+}
+
+sub prefix_disks_output {
+    my ($self, %options) = @_;
+    
+    return "Storage '" . $options{instance_value}->{display} . "' ";
+}
+
 sub new {
     my ($class, %options) = @_;
     my $self = $class->SUPER::new(package => __PACKAGE__, %options);
@@ -45,8 +140,6 @@ sub new {
                                   "command-path:s"    => { name => 'command_path' },
                                   "command-options:s" => { name => 'command_options', default => ' 2>&1' },
                                   "filter-fs:s"       => { name => 'filter_fs', },
-                                  "warning:s"         => { name => 'warning' },
-                                  "critical:s"        => { name => 'critical' },
                                   "units:s"           => { name => 'units', default => '%' },
                                   "free"              => { name => 'free' },
                                   "name:s"            => { name => 'name' },
@@ -60,26 +153,24 @@ sub new {
 
 sub check_options {
     my ($self, %options) = @_;
-    $self->SUPER::init(%options);
-    if (($self->{perfdata}->threshold_validate(label => 'warning', value => $self->{option_results}->{warning})) == 0) {
-       $self->{output}->add_option_msg(short_msg => "Wrong warning threshold '" . $self->{option_results}->{warning} . "'.");
-       $self->{output}->option_exit();
-    }
-    if (($self->{perfdata}->threshold_validate(label => 'critical', value => $self->{option_results}->{critical})) == 0) {
-       $self->{output}->add_option_msg(short_msg => "Wrong critical threshold '" . $self->{option_results}->{critical} . "'.");
-       $self->{output}->option_exit();
-    }
+    $self->SUPER::check_options(%options);
+
+    $instance_mode = $self;
 }
 
 sub manage_selection {
     my ($self, %options) = @_;
 
-    my $stdout = centreon::plugins::misc::execute(output => $self->{output},
-                                                  options => $self->{option_results},
-                                                  sudo => $self->{option_results}->{sudo},
-                                                  command => $self->{option_results}->{command},
-                                                  command_path => $self->{option_results}->{command_path},
-                                                  command_options => $self->{option_results}->{command_options});
+    my ($stdout, $exit_code) = centreon::plugins::misc::execute(
+        output => $self->{output},
+        options => $self->{option_results},
+        sudo => $self->{option_results}->{sudo},
+        command => $self->{option_results}->{command},
+        command_path => $self->{option_results}->{command_path},
+        command_options => $self->{option_results}->{command_options},
+        no_quit => 1
+    );
+    $self->{disks} = {};
     my @lines = split /\n/, $stdout;
     # Header not needed
     shift @lines;
@@ -92,7 +183,7 @@ sub manage_selection {
         my ($fs, $size, $used, $available, $percent, $mount) = ($1, $2, $3, $4, $5, $6);
         
         next if (defined($self->{option_results}->{filter_fs}) && $self->{option_results}->{filter_fs} ne '' &&
-                 $fs !~ /$self->{option_results}->{filter_fs}/);
+            $fs !~ /$self->{option_results}->{filter_fs}/);
         
         next if (defined($self->{option_results}->{name}) && defined($self->{option_results}->{use_regexp}) && defined($self->{option_results}->{use_regexpi}) 
             && $mount !~ /$self->{option_results}->{name}/i);
@@ -100,98 +191,21 @@ sub manage_selection {
             && $mount !~ /$self->{option_results}->{name}/);
         next if (defined($self->{option_results}->{name}) && !defined($self->{option_results}->{use_regexp}) && !defined($self->{option_results}->{use_regexpi})
             && $mount ne $self->{option_results}->{name});
-
-    next if ($size !~ m/^\d+$/ || $used !~ m/^\d+$/ || $available !~ m/^\d+$/);
-
-        $self->{result}->{$mount} = {fs => $fs, total => $size, used => $used, free => $available};
-    }
-    
-    if (scalar(keys %{$self->{result}}) <= 0) {
-        if (defined($self->{option_results}->{name})) {
-            $self->{output}->add_option_msg(short_msg => "No storage found for mount point '" . $self->{option_results}->{name} . "'.");
-        } else {
-            $self->{output}->add_option_msg(short_msg => "No storage found.");
-        }
-        $self->{output}->option_exit();
-    }
-}
-
-sub run {
-    my ($self, %options) = @_;
-    
-    $self->manage_selection();
-    if (!defined($self->{option_results}->{name}) || defined($self->{option_results}->{use_regexp})) {
-        $self->{output}->output_add(severity => 'OK',
-                                    short_msg => 'All storages are ok.');
-    }
-    
-    my $num_disk_check = 0;
-    foreach my $name (sort(keys %{$self->{result}})) {
-        my $total_size = $self->{result}->{$name}->{total} * 1024;
-        if (defined($self->{option_results}->{space_reservation})) {
-            $total_size = $total_size - ($self->{option_results}->{space_reservation} * $total_size / 100);
-        }
-        next if ($total_size == 0);
         
-        $num_disk_check++;
-        my $total_used = $self->{result}->{$name}->{used} * 1024;
-        my $total_free = $self->{result}->{$name}->{free} * 1024;
-        my $prct_used = $total_used * 100 / $total_size;
-        my $prct_free = 100 - $prct_used;
-
-        my ($exit, $threshold_value);
-
-        $threshold_value = $total_used;
-        $threshold_value = $total_free if (defined($self->{option_results}->{free}));
-        if ($self->{option_results}->{units} eq '%') {
-            $threshold_value = $prct_used;
-            $threshold_value = $prct_free if (defined($self->{option_results}->{free}));
-        } 
-        $exit = $self->{perfdata}->threshold_check(value => $threshold_value, threshold => [ { label => 'critical', 'exit_litteral' => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]);
-
-        my ($total_size_value, $total_size_unit) = $self->{perfdata}->change_bytes(value => $total_size);
-        my ($total_used_value, $total_used_unit) = $self->{perfdata}->change_bytes(value => $total_used);
-        my ($total_free_value, $total_free_unit) = $self->{perfdata}->change_bytes(value => ($total_size - $total_used));
-
-        $self->{output}->output_add(long_msg => sprintf("Storage '%s' Total: %s Used: %s (%.2f%%) Free: %s (%.2f%%)", $name,
-                                            $total_size_value . " " . $total_size_unit,
-                                            $total_used_value . " " . $total_used_unit, $prct_used,
-                                            $total_free_value . " " . $total_free_unit, $prct_free));
-        if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1) || (defined($self->{option_results}->{name}) && !defined($self->{option_results}->{use_regexp}))) {
-            $self->{output}->output_add(severity => $exit,
-                                        short_msg => sprintf("Storage '%s' Total: %s Used: %s (%.2f%%) Free: %s (%.2f%%)", $name,
-                                            $total_size_value . " " . $total_size_unit,
-                                            $total_used_value . " " . $total_used_unit, $prct_used,
-                                            $total_free_value . " " . $total_free_unit, $prct_free));
-        }    
-
-        my $label = 'used';
-        my $value_perf = $total_used;
-        if (defined($self->{option_results}->{free})) {
-            $label = 'free';
-            $value_perf = $total_free;
+        $size *= 1024;
+        if (defined($self->{option_results}->{space_reservation})) {
+            $size = int($size - ($self->{option_results}->{space_reservation} * $size / 100));
         }
-        my $extra_label = '';
-        $extra_label = '_' . $name if (!defined($self->{option_results}->{name}) || defined($self->{option_results}->{use_regexp}));
-        my %total_options = ();
-        if ($self->{option_results}->{units} eq '%') {
-            $total_options{total} = $total_size;
-            $total_options{cast_int} = 1; 
-        }
-        $self->{output}->perfdata_add(label => $label . $extra_label, unit => 'B',
-                                      value => $value_perf,
-                                      warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning', %total_options),
-                                      critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical', %total_options),
-                                      min => 0, max => $total_size);
-    }
-
-    if ($num_disk_check == 0) {
-        $self->{output}->add_option_msg(short_msg => "No storage checked.");
-        $self->{output}->option_exit();
+        $self->{disks}->{$mount} = { display => $mount, fs => $fs, total => $size, used => $used * 1024 };
     }
     
-    $self->{output}->display();
-    $self->{output}->exit();
+    if (scalar(keys %{$self->{disks}}) <= 0) {
+        if ($exit_code != 0) {
+            $self->{output}->output_add(long_msg => "command output:" . $stdout);
+        }
+        $self->{output}->add_option_msg(short_msg => "No storage found (filters or command issue)");
+        $self->{output}->option_exit();
+    }
 }
 
 1;
@@ -234,7 +248,7 @@ Use 'sudo' to execute the command.
 
 =item B<--command>
 
-Command to get information (Default: 'df').
+Command to get information (Default: 'bdf').
 Can be changed if you have output in a file.
 
 =item B<--command-path>
@@ -243,13 +257,13 @@ Command path (Default: none).
 
 =item B<--command-options>
 
-Command options (Default: '-P -k 2>&1').
+Command options (Default: ' 2>&1').
 
-=item B<--warning>
+=item B<--warning-usage>
 
 Threshold warning.
 
-=item B<--critical>
+=item B<--critical-usage>
 
 Threshold critical.