diff --git a/os/linux/local/mode/mountpoint.pm b/os/linux/local/mode/mountpoint.pm
new file mode 100644
index 000000000..4fd3d078e
--- /dev/null
+++ b/os/linux/local/mode/mountpoint.pm
@@ -0,0 +1,264 @@
+#
+# 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
+# service performance.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+package os::linux::local::mode::mountpoint;
+
+use base qw(centreon::plugins::templates::counter);
+
+use strict;
+use warnings;
+use centreon::plugins::misc;
+
+my $instance_mode;
+
+sub custom_status_threshold {
+    my ($self, %options) = @_;
+    my $status = 'ok';
+    my $message;
+
+    eval {
+        local $SIG{__WARN__} = sub { $message = $_[0]; };
+        local $SIG{__DIE__} = sub { $message = $_[0]; };
+
+        if (defined($instance_mode->{option_results}->{critical_status}) && $instance_mode->{option_results}->{critical_status} ne '' &&
+            eval "$instance_mode->{option_results}->{critical_status}") {
+            $status = 'critical';
+        } elsif (defined($instance_mode->{option_results}->{warning_status}) && $instance_mode->{option_results}->{warning_status} ne '' &&
+            eval "$instance_mode->{option_results}->{warning_status}") {
+            $status = 'warning';
+        }
+    };
+    if (defined($message)) {
+        $self->{output}->output_add(long_msg => 'filter status issue: ' . $message);
+    }
+
+    return $status;
+}
+
+sub custom_status_output {
+    my ($self, %options) = @_;
+
+    return "options are '" . $self->{result_values}->{options} . "' [type: " . $self->{result_values}->{type} . "]";
+}
+
+sub custom_status_calc {
+    my ($self, %options) = @_;
+
+    $self->{result_values}->{display} = $options{new_datas}->{$self->{instance} . '_display'};
+    $self->{result_values}->{type} = $options{new_datas}->{$self->{instance} . '_type'};
+    $self->{result_values}->{options} = $options{new_datas}->{$self->{instance} . '_options'};
+
+    return 0;
+}
+
+sub prefix_output {
+    my ($self, %options) = @_;
+
+    return "Mount point '" . $options{instance_value}->{display} . "' ";
+}
+
+sub set_counters {
+    my ($self, %options) = @_;
+    
+    $self->{maps_counters_type} = [
+        { name => 'mountpoints', type => 1, cb_prefix_output => 'prefix_output', message_multiple => 'All mount points options are ok' }
+    ];
+    
+    $self->{maps_counters}->{mountpoints} = [
+        { label => 'options', set => {
+                key_values => [ { name => 'display' }, { name => 'options' }, { name => 'type' } ],
+                closure_custom_calc => $self->can('custom_status_calc'),
+                closure_custom_output => $self->can('custom_status_output'),
+                closure_custom_perfdata => sub { return 0; },
+                closure_custom_threshold_check => $self->can('custom_status_threshold'),
+            }
+        },
+    ];
+}
+
+sub new {
+    my ($class, %options) = @_;
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    bless $self, $class;
+
+    $self->{version} = '1.0';
+    $options{options}->add_options(arguments =>
+                                {
+                                    "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 => 'mount' },
+                                    "command-path:s"        => { name => 'command_path' },
+                                    "command-options:s"     => { name => 'command_options', default => ' 2>&1' },
+                                    "filter-device:s"       => { name => 'filter_device' },
+                                    "filter-mountpoint:s"   => { name => 'filter_mountpoint' },
+                                    "filter-type:s"         => { name => 'filter_type' },
+                                    "warning-status:s"      => { name => 'warning_status', default => '' },
+                                    "critical-status:s"     => { name => 'critical_status', default => '%{options} !~ /^rw/i && %{type} !~ /tmpfs/i' },
+                                });
+    $self->{result} = {};
+    return $self;
+}
+
+sub check_options {
+    my ($self, %options) = @_;
+    $self->SUPER::check_options(%options);
+
+    $instance_mode = $self;
+    $self->change_macros();
+}
+
+sub change_macros {
+    my ($self, %options) = @_;
+
+    foreach (('warning_status', 'critical_status')) {
+        if (defined($self->{option_results}->{$_})) {
+            $self->{option_results}->{$_} =~ s/%\{(.*?)\}/\$self->{result_values}->{$1}/g;
+        }
+    }
+}
+
+sub manage_selection {
+    my ($self, %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->{mountpoints} = {};
+    
+    my @lines = split /\n/, $stdout;
+    foreach my $line (@lines) {
+        next if ($line !~ /^\s*(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+\((.*)\)/);
+        my ($device, $mountpoint, $type, $options) = ($1, $3, $5, $6);
+        
+        if (defined($self->{option_results}->{filter_type}) && $self->{option_results}->{filter_type} ne '' &&
+            $type !~ /$self->{option_results}->{filter_type}/) {
+            $self->{output}->output_add(long_msg => "skipping '" . $mountpoint . "': no matching filter.", debug => 1);
+            next;
+        }
+        if (defined($self->{option_results}->{filter_device}) && $self->{option_results}->{filter_device} ne '' &&
+            $device !~ /$self->{option_results}->{filter_device}/) {
+            $self->{output}->output_add(long_msg => "skipping '" . $mountpoint . "': no matching filter.", debug => 1);
+            next;
+        }
+        if (defined($self->{option_results}->{filter_mountpoint}) && $self->{option_results}->{filter_mountpoint} ne '' &&
+            $mountpoint !~ /$self->{option_results}->{filter_mountpoint}/) {
+            $self->{output}->output_add(long_msg => "skipping '" . $mountpoint . "': no matching filter.", debug => 1);
+            next;
+        }
+
+        $self->{mountpoints}->{$mountpoint} = {
+            display => $mountpoint,
+            type => $type,
+            options => $options,
+        };
+    }
+    
+    if (scalar(keys %{$self->{mountpoints}}) <= 0) {
+        $self->{output}->add_option_msg(short_msg => "No mount points found");
+        $self->{output}->option_exit();
+    }
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+Check mount points options.
+
+=over 8
+
+=item B<--remote>
+
+Execute command remotely in 'ssh'.
+
+=item B<--hostname>
+
+Hostname to query (need --remote).
+
+=item B<--ssh-option>
+
+Specify multiple options like the user (example: --ssh-option='-l=centreon-engine' --ssh-option='-p=52').
+
+=item B<--ssh-path>
+
+Specify ssh command path (default: none)
+
+=item B<--ssh-command>
+
+Specify ssh command (default: 'ssh'). Useful to use 'plink'.
+
+=item B<--timeout>
+
+Timeout in seconds for the command (Default: 30).
+
+=item B<--sudo>
+
+Use 'sudo' to execute the command.
+
+=item B<--command>
+
+Command to get information (Default: 'mount').
+
+=item B<--command-path>
+
+Command path (Default: none).
+
+=item B<--command-options>
+
+Command options (Default: ' 2>&1').
+
+=item B<--filter-mountpoint>
+
+Filter mount point name (Can use regexp).
+
+=item B<--filter-device>
+
+Filter device name (Can use regexp).
+
+=item B<--filter-type>
+
+Filter mount point type (Can use regexp).
+
+=item B<--warning-status>
+
+Threshold warning.
+
+=item B<--critical-status>
+
+Threshold critical
+(Default: '%{options} !~ /^rw/i && %{type} !~ /tmpfs/i').
+
+=back
+
+=cut
\ No newline at end of file
diff --git a/os/linux/local/mode/mountro.pm b/os/linux/local/mode/mountro.pm
deleted file mode 100644
index 237c3f5cf..000000000
--- a/os/linux/local/mode/mountro.pm
+++ /dev/null
@@ -1,203 +0,0 @@
-#
-# 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
-# service performance.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-package os::linux::local::mode::mountro;
-
-use base qw(centreon::plugins::mode);
-
-use strict;
-use warnings;
-use centreon::plugins::misc;
-
-sub new {
-    my ($class, %options) = @_;
-    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
-    bless $self, $class;
-
-    $self->{version} = '1.0';
-    $options{options}->add_options(arguments =>
-                                {
-                                  "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 => 'mount' },
-                                  "command-path:s"    => { name => 'command_path' },
-                                  "command-options:s" => { name => 'command_options', default => ' 2>&1' },
-                                  "critical:s"        => { name => 'critical', default => 1 },
-                                  "filter-name:s"     => { name => 'filter_name', },
-                                });
-    $self->{result} = {};
-    return $self;
-}
-
-sub check_options {
-    my ($self, %options) = @_;
-    $self->SUPER::init(%options);
-    $self->{crit} = $self->{option_results}->{critical};
-    if (($self->{perfdata}->threshold_validate(label => 'crit', value => $self->{crit})) == 0 ||  $self->{crit}<=0 ){
-       $self->{output}->add_option_msg(short_msg => "Wrong critical threshold '" . $self->{crit} . "'.");
-       $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 $counter = 0;
-    my @lines = split /\n/, $stdout;
-    # Header not needed
-    shift @lines;
-    foreach my $line (@lines) {
-        next if ($line !~ /^\s*(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)(.*)/);
-        my ($device, $mountpoint, $filesystem, $options) = ($1, $3, $5, $6);
-        next if ($options !~ /ro[\s,]/ && $options !~ /read-only/);
-        if (defined($self->{option_results}->{filter_name}) && $self->{option_results}->{filter_name} ne '' &&
-            $filesystem !~ /$self->{option_results}->{filter_name}/) {
-            $self->{output}->output_add(long_msg => "Skipping partition '" . $filesystem . "': no matching filter name");
-            next;
-        }
-        $self->{result}->{"$counter.mountpoint"} = $mountpoint;
-        $self->{result}->{"$counter.device"} = $device;
-        $self->{result}->{"$counter.options"} = $options;
-        $self->{result}->{"$counter.filesystem"} = $filesystem;
-        $self->{result}->{"$counter.description"} = "Mountpoint $mountpoint from $device with Filesystem $filesystem is mounted readonly ($options)";
-        $counter = $counter + 1;
-    }
-}
-
-sub run {
-    my ($self, %options) = @_;
-
-    $self->manage_selection();
-    my $countFs=0;
-    foreach my $identifier (sort(keys %{$self->{result}})) {
-        #print $identifier . "=" . $self->{result}->{$identifier}. "\n";
-        next if ($identifier !~ /description/);
-        $self->{output}->output_add(long_msg => "'" . $self->{result}->{$identifier} . "'");
-        $countFs = $countFs + 1;
-    }
-        $self->{output}->perfdata_add(label => 'count_roFs',
-                                  value => $countFs,
-                                  critical => $self->{perfdata}->get_perfdata_for_output(label => 'crit'),
-                                  min => 1);
-
-    my $exit = $self->{perfdata}->threshold_check(value => $countFs,
-                                                  threshold => [ { label => 'crit', 'exit_litteral' => 'critical' } ]);
-        if (($countFs < $self->{crit})){
-            $self->{output}->output_add(severity => 'OK',
-                                short_msg => 'No Read-Only Filesystems');
-        }else{
-            $self->{output}->output_add(severity => 'CRITICAL',
-                                short_msg => 'There is at least 1 Filesystem mounted as RO');
-        }
-
-
-    $self->{output}->display(nolabel => 1);
-    $self->{output}->exit();
-}
-
-sub disco_format {
-    my ($self, %options) = @_;
-
-    $self->{output}->add_disco_format(elements => ['roFS']);
-}
-
-sub disco_show {
-    my ($self, %options) = @_;
-
-    $self->manage_selection();
-    foreach my $name (sort(keys %{$self->{result}})) {
-        next if ($name !~ /description/);
-        $self->{output}->add_disco_entry(roFS => $self->{result}->{$name},
-                                         );
-    }
-}
-
-1;
-
-__END__
-
-=head1 MODE
-
-List partitions.
-
-=over 8
-
-=item B<--remote>
-
-Execute command remotely in 'ssh'.
-
-=item B<--hostname>
-
-Hostname to query (need --remote).
-
-=item B<--critical>
-Threshold critical Amount of read-only Filesystems (default: 0)
-
-=item B<--ssh-option>
-
-Specify multiple options like the user (example: --ssh-option='-l=centreon-engine' --ssh-option='-p=52').
-
-=item B<--ssh-path>
-
-Specify ssh command path (default: none)
-
-=item B<--ssh-command>
-
-Specify ssh command (default: 'ssh'). Useful to use 'plink'.
-
-=item B<--timeout>
-
-Timeout in seconds for the command (Default: 30).
-
-=item B<--sudo>
-
-Use 'sudo' to execute the command.
-
-=item B<--command>
-
-Command to get information (Default: 'mount').
-
-=item B<--command-path>
-
-Command path (Default: none).
-
-=item B<--command-options>
-
-Command options (Default: ' 2>&1').
-
-=item B<--filter-name>
-
-Filter filesystem name (regexp can be used) eg: (!fs).
-
-=back
-
-=cut
\ No newline at end of file
diff --git a/os/linux/local/plugin.pm b/os/linux/local/plugin.pm
index 64b1d8510..61f663510 100644
--- a/os/linux/local/plugin.pm
+++ b/os/linux/local/plugin.pm
@@ -41,11 +41,11 @@ sub new {
                          'files-date'                => 'os::linux::local::mode::filesdate',
                          'inodes'                    => 'os::linux::local::mode::inodes',
                          'load'                      => 'os::linux::local::mode::loadaverage',
-                         'list-readonly-filesystems' => 'os::linux::local::mode::mountro',
                          'list-interfaces'           => 'os::linux::local::mode::listinterfaces',
                          'list-partitions'           => 'os::linux::local::mode::listpartitions',
                          'list-storages'             => 'os::linux::local::mode::liststorages',
                          'memory'                    => 'os::linux::local::mode::memory',
+                         'mountpoint'                => 'os::linux::local::mode::mountpoint',
                          'packet-errors'             => 'os::linux::local::mode::packeterrors',
                          'paging'                    => 'os::linux::local::mode::paging',
                          'process'                   => 'os::linux::local::mode::process',