diff --git a/database/mysql/mode/queries.pm b/database/mysql/mode/queries.pm
index 47b108ed7..b33251371 100644
--- a/database/mysql/mode/queries.pm
+++ b/database/mysql/mode/queries.pm
@@ -20,103 +20,96 @@
 
 package database::mysql::mode::queries;
 
-use base qw(centreon::plugins::mode);
+use base qw(centreon::plugins::templates::counter);
 
 use strict;
 use warnings;
-use centreon::plugins::statefile;
+use Digest::MD5 qw(md5_hex);
+
+sub set_counters {
+    my ($self, %options) = @_;
+   
+    $self->{maps_counters_type} = [
+        { name => 'global', type => 0, cb_prefix_output => 'prefix_output' },
+    ];
+   
+    $self->{maps_counters}->{global} = [
+        { label => 'total', set => {
+                key_values => [ { name => 'Queries', diff => 1 } ],
+                per_second => 1,
+                output_template => 'Total : %d',
+                perfdatas => [
+                    { label => 'total_requests', template => '%d', value => 'Queries_per_second',
+                      unit => '/s', min => 0 },
+                ],
+            }
+        },
+    ];
+    
+    foreach ('update', 'delete', 'insert', 'truncate', 'select', 'commit', 'begin') {
+        push @{$self->{maps_counters}->{global}}, {
+            label => $_, display_ok => 0, set => {
+                key_values => [ { name => 'Com_' . $_, diff => 1 } ],
+                per_second => 1,
+                output_template => $_ . ' : %d',
+                perfdatas => [
+                    { label => $_ . '_requests', template => '%d', value => 'Com_' . $_ . '_per_second',
+                      unit => '/s', min => 0 },
+                ],
+            }
+        };
+        push @{$self->{maps_counters}->{global}}, {
+            label => $_ . '-count', display_ok => 0, set => {
+                key_values => [ { name => 'Com_' . $_, diff => 1 } ],
+                output_template => $_ . ' count : %d',
+                perfdatas => [
+                    { label => $_ . '_count', template => '%d', value => 'Com_' . $_ . '_absolute',
+                      min => 0 },
+                ],
+            }
+        };
+    }
+}
+
+sub prefix_output {
+    my ($self, %options) = @_;
+
+    return "Requests ";
+}
 
 sub new {
     my ($class, %options) = @_;
-    my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+    my $self = $class->SUPER::new(package => __PACKAGE__, %options, statefile => 1);
     bless $self, $class;
-    
+
     $self->{version} = '1.0';
-    $options{options}->add_options(arguments =>
-                                { 
-                                  "warning:s"               => { name => 'warning', },
-                                  "critical:s"              => { name => 'critical', },
-                                });
-    $self->{statefile_cache} = centreon::plugins::statefile->new(%options);
+    $options{options}->add_options(arguments => {
+    });
 
     return $self;
 }
 
-sub check_options {
+sub manage_selection {
     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->{statefile_cache}->check_options(%options);
-}
-
-sub run {
-    my ($self, %options) = @_;
-    # $options{sql} = sqlmode object
-    $self->{sql} = $options{sql};
-
-    $self->{sql}->connect();
-    $self->{sql}->query(query => q{
-        SHOW /*!50000 global */ STATUS WHERE Variable_name IN ('Queries', 'Com_update', 'Com_delete', 'Com_insert', 'Com_truncate', 'Com_select') 
-    });
-    my $result = $self->{sql}->fetchall_arrayref();
-    
-    if (!($self->{sql}->is_version_minimum(version => '5.0.76'))) {
+    $options{sql}->connect();
+    if (!($options{sql}->is_version_minimum(version => '5.0.76'))) {
         $self->{output}->add_option_msg(short_msg => "MySQL version '" . $self->{sql}->{version} . "' is not supported (need version >= '5.0.76').");
         $self->{output}->option_exit();
     }
     
-    my $new_datas = {};
-    $self->{statefile_cache}->read(statefile => 'mysql_' . $self->{mode} . '_' . $self->{sql}->get_unique_id4save());
-    my $old_timestamp = $self->{statefile_cache}->get(name => 'last_timestamp');
-    $new_datas->{last_timestamp} = time();
-    
-    if (defined($old_timestamp) && $new_datas->{last_timestamp} - $old_timestamp == 0) {
-        $self->{output}->add_option_msg(short_msg => "Need at least one second between two checks.");
-        $self->{output}->option_exit();
-    }
-    
+    $options{sql}->query(query => q{
+        SHOW /*!50000 global */ STATUS WHERE Variable_name IN ('Queries', 'Com_update', 'Com_delete', 'Com_insert', 'Com_truncate', 'Com_select', 'Com_commit', 'Com_begin')
+    });
+
+    $self->{global} = {};
+    my $result = $options{sql}->fetchall_arrayref();
     foreach my $row (@{$result}) {
-        next if ($$row[0] !~ /^(Queries|Com_update|Com_delete|Com_insert|Com_truncate|Com_select)/i);
-    
-        $new_datas->{$$row[0]} = $$row[1];
-        my $old_val = $self->{statefile_cache}->get(name => $$row[0]);
-        next if (!defined($old_val) || $$row[1] < $old_val);
-        
-        my $value = int(($$row[1] - $old_val) / ($new_datas->{last_timestamp} - $old_timestamp));
-        if ($$row[0] ne 'Queries') {
-            $self->{output}->perfdata_add(label => $$row[0] . '_requests',
-                                      value => $value,
-                                      min => 0);
-            next;
-        }
-        
-        my $exit_code = $self->{perfdata}->threshold_check(value => $value, threshold => [ { label => 'critical', exit_litteral => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]);
-        $self->{output}->output_add(severity => $exit_code,
-                                    short_msg => sprintf("Total requests = %s", $value));
-        $self->{output}->perfdata_add(label => 'total_requests',
-                                      value => $value,
-                                      warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning'),
-                                      critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical'),
-                                      min => 0);
-    }
-    
-    $self->{statefile_cache}->write(data => $new_datas); 
-    if (!defined($old_timestamp)) {
-        $self->{output}->output_add(severity => 'OK',
-                                    short_msg => "Buffer creation...");
+        $self->{global}->{$$row[0]} = $$row[1];
     }
 
-    $self->{output}->display();
-    $self->{output}->exit();
+    $self->{cache_name} = "mysql_" . $self->{mode} . '_' . $options{sql}->get_unique_id4save() . '_' .
+        (defined($self->{option_results}->{filter_counters}) ? md5_hex($self->{option_results}->{filter_counters}) : md5_hex('all'));
 }
 
 1;
@@ -129,13 +122,17 @@ Check average number of queries executed.
 
 =over 8
 
-=item B<--warning>
+=item B<--warning-*>
 
 Threshold warning.
+Can be: 'total', 'update', 'insert', 'delete', 'truncate',
+'select', 'begin', 'commit'.
 
-=item B<--critical>
+=item B<--critical-*>
 
 Threshold critical.
+Can be: 'total', 'update', 'insert', 'delete', 'truncate',
+'select', 'begin', 'commit'.
 
 =back