diff --git a/database/mssql/mode/databasessize.pm b/database/mssql/mode/databasessize.pm
index 6e37a6627..4ec7bc34e 100644
--- a/database/mssql/mode/databasessize.pm
+++ b/database/mssql/mode/databasessize.pm
@@ -20,50 +20,130 @@
 
 package database::mssql::mode::databasessize;
 
-use base qw(centreon::plugins::mode);
+use base qw(centreon::plugins::templates::counter);
 
 use strict;
 use warnings;
 
+my $instance_mode;
+
+sub set_counters {
+    my ($self, %options) = @_;
+
+    $self->{maps_counters_type} = [
+        { name => 'database', type => 1, cb_prefix_output => 'prefix_database_output', message_multiple => 'All databases are OK' },
+    ];
+
+    $self->{maps_counters}->{database} = [
+        { label => 'database', set => {
+                key_values => [ { name => 'prct_used' }, { name => 'used' }, { name => 'free' }, { name => 'total' }, { name => 'display' } ],
+                closure_custom_calc => \&custom_usage_calc,
+                closure_custom_output => \&custom_usage_output,
+                closure_custom_perfdata => \&custom_usage_perfdata,
+                closure_custom_threshold_check => \&custom_usage_threshold,
+            }
+        },
+    ];
+}
+
+sub custom_usage_perfdata {
+    my ($self, %options) = @_;
+
+    my $label = 'db_' . $self->{result_values}->{display} . '_used';
+    my $value_perf = $self->{result_values}->{used};
+    if (defined($instance_mode->{option_results}->{free})) {
+        $label = 'db_' . $self->{result_values}->{display} . '_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("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) = @_;
+
+    $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}->{prct_used} = $options{new_datas}->{$self->{instance} . '_prct_used'};
+    $self->{result_values}->{free} = $options{new_datas}->{$self->{instance} . '_free'};
+
+    $self->{result_values}->{prct_free} = 100 - $self->{result_values}->{prct_used};
+
+    return 0;
+}
+
 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 =>
-                                { 
-                                  "warning:s"               => { name => 'warning', },
-                                  "critical:s"              => { name => 'critical', },
-                                  "filter:s"                => { name => 'filter', },
-                                  "free"                    => { name => 'free', },
+                                {
+                                "filter-database:s"   => { name => 'filter_database' },
+                                "units:s"             => { name => 'units', default => '%' },
+                                "free"                => { name => 'free' },
+                                "skip"                => { name => 'skip' },
                                 });
-
     return $self;
 }
 
+sub prefix_database_output {
+    my ($self, %options) = @_;
+
+    return "Database '" . $options{instance_value}->{display} . "' ";
+}
+
 sub check_options {
     my ($self, %options) = @_;
-    $self->SUPER::init(%options);
+    $self->SUPER::check_options(%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();
-    }
+    $instance_mode = $self;
 }
 
-sub run {
+sub manage_selection {
     my ($self, %options) = @_;
     # $options{sql} = sqlmode object
     $self->{sql} = $options{sql};
-
-    $self->{output}->output_add(severity => 'OK',
-                                short_msg => "All databases are ok.");
-
     $self->{sql}->connect();
     $self->{sql}->query(query => q{DBCC SQLPERF(LOGSPACE)});
 
@@ -71,7 +151,7 @@ sub run {
 
     my @databases_selected;
     foreach my $row (@$result) {
-        next if (defined($self->{option_results}->{filter}) && $$row[0] !~ /$self->{option_results}->{filter}/); 
+        next if (defined($self->{option_results}->{filter_database}) && $$row[0] !~ /$self->{option_results}->{filter_database}/);
         push @databases_selected, $$row[0];
     }
 
@@ -83,44 +163,17 @@ sub run {
             my $size = convert_bytes($size_brut);
             my $free_brut = $$row[2];
             my $free = convert_bytes($free_brut);
-            my $use = $size - $free;
-            my $percent_use = ($use / $size) * 100;
-            my $percent_free = 100 - $percent_use;
-            my ($use_value, $use_unit) = $self->{perfdata}->change_bytes(value => $use);
-            $self->{output}->output_add(long_msg => sprintf("DB '%s' Size: %s Used: %.2f %s (%.2f%%) Free: %s (%.2f%%)", $database, $size_brut, $use_value, $use_unit, $percent_use, $free_brut, $percent_free));
-            if (defined($self->{option_results}->{free})) {
-                my $exit_code = $self->{perfdata}->threshold_check(value => $percent_free, threshold => [ { label => 'critical', exit_litteral => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]);
-                if (!$self->{output}->is_status(value => $exit_code, compare => 'ok', litteral => 1)) {
-                    $self->{output}->output_add(severity => $exit_code,
-                                                short_msg => sprintf("DB '%s' Size: %s Free: %s (%.2f%%)", $database, $size_brut, $free_brut, $percent_use));
-                }
-                $self->{output}->perfdata_add(label => sprintf("db_%s_free",$database),
-                                              unit => 'B',
-                                              value => int($free),
-                                              warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning', total => $size, cast_int => 1),
-                                              critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical', total => $size, cast_int => 1),
-                                              min => 0,
-                                              max => int($size));
-            } else {
-                my $exit_code = $self->{perfdata}->threshold_check(value => $percent_use, threshold => [ { label => 'critical', 'exit_litteral' => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]);
-                if (!$self->{output}->is_status(value => $exit_code, compare => 'ok', litteral => 1)) {
-                    $self->{output}->output_add(severity => $exit_code,
-                                                short_msg => sprintf("DB '%s' Size: %s Used: %.2f %s (%.2f%%)", $database, $size_brut, $use_value, $use_unit, $percent_use));
-                }
-                $self->{output}->perfdata_add(label => sprintf("db_%s_used",$database),
-                                              unit => 'B',
-                                              value => int($use),
-                                              warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning', total => $size, cast_int => 1),
-                                              critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical', total => $size, cast_int => 1),
-                                              min => 0,
-                                              max => int($size));
-            }
+            my $used = $size - $free;
+            my $percent_used = ($used / $size) * 100;
+
+            $self->{database}->{$database} = {  used => $used,
+                                                free => $free,
+                                                total => $size,
+                                                prct_used => $percent_used,
+                                                display => lc $database };
+
         }
     }
-
-
-    $self->{output}->display();
-    $self->{output}->exit();
 }
 
 sub convert_bytes {
@@ -144,25 +197,29 @@ __END__
 
 =head1 MODE
 
-Check MSSQL databases size.
+Check MSSQL Database usage
 
 =over 8
 
-=item B<--warning>
+=item B<--warning-database>
 
-Threshold warning in percent used.
+Threshold warning.
 
-=item B<--critical>
+=item B<--critical-database>
 
-Threshold critical in percent used.
+Threshold critical.
 
-=item B<--filter>
+=item B<--filter-database>
 
-Filter database.
+Filter database by name. Can be a regex
+
+=item B<--units>
+
+Default is '%', can be 'B'
 
 =item B<--free>
 
-Check free space instead of used space.
+Perfdata show free space
 
 =back