diff --git a/hardware/ups/mge/snmp/mode/environment.pm b/hardware/ups/mge/snmp/mode/environment.pm
index e12888ef7..9b054c132 100644
--- a/hardware/ups/mge/snmp/mode/environment.pm
+++ b/hardware/ups/mge/snmp/mode/environment.pm
@@ -20,130 +20,72 @@
 
 package hardware::ups::mge::snmp::mode::environment;
 
-use base qw(centreon::plugins::mode);
+use base qw(centreon::plugins::templates::counter);
 
 use strict;
 use warnings;
-use centreon::plugins::values;
 
-my $maps_counters = {
-    temperature => { class => 'centreon::plugins::values', obj => undef,
-                 set => {
-                        key_values => [
-                                        { name => 'temperature', no_value => 0, },
-                                      ],
-                        output_template => 'Ambiant Temperature: %.2f C', output_error_template => 'Ambiant Temperature: %s',
-                        perfdatas => [
-                            { value => 'temperature_absolute', label => 'temperature', template => '%.2f',
-                              unit => 'C' },
-                        ],
-                    }
-               },
-    humidity => { class => 'centreon::plugins::values', obj => undef,
-                 set => {
-                        key_values => [
-                                        { name => 'humidity', no_value => 0 },
-                                      ],
-                        output_template => 'Humidity: %.2f %%', output_error_template => 'Humidity: %s',
-                        perfdatas => [
-                            { value => 'humidity_absolute', label => 'humidity', template => '%.2f',
-                              unit => '%', min => 0, max => 100 },
-                        ],
-                    }
-               },
-};
+sub set_counters {
+    my ($self, %options) = @_;
+    
+    $self->{maps_counters_type} = [
+        { name => 'global', type => 0, skipped_code => { -10 => 1 } },
+    ];
 
-my $oid_upsmgEnvironAmbientTemp = '.1.3.6.1.4.1.705.1.8.1.0'; # in 0.1 degree centigrade
-my $oid_upsmgEnvironAmbientHumidity = '.1.3.6.1.4.1.705.1.8.2.0'; # in 0.1 %
+    $self->{maps_counters}->{global} = [
+        { label => 'temperature', nlabel => 'hardware.sensor.temperature.celsius', set => {
+                key_values => [ { name => 'temperature', no_value => 0, } ],
+                output_template => 'Ambiant Temperature: %.2f C', output_error_template => 'Ambiant Temperature: %s',
+                perfdatas => [
+                    { value => 'temperature_absolute', label => 'temperature', template => '%.2f',
+                      unit => 'C' },
+                ],
+            }
+        },
+        { label => 'humidity', nlabel => 'hardware.sensor.humidity.percentage', set => {
+                key_values => [ { name => 'humidity', no_value => 0 } ],
+                output_template => 'Humidity: %.2f %%', output_error_template => 'Humidity: %s',
+                perfdatas => [
+                    { value => 'humidity_absolute', label => 'humidity', template => '%.2f',
+                      unit => '%', min => 0, max => 100 },
+                ],
+            }
+        },
+    ];
+}
 
 sub new {
     my ($class, %options) = @_;
     my $self = $class->SUPER::new(package => __PACKAGE__, %options);
     bless $self, $class;
     
-    $self->{version} = '1.1';
-    $options{options}->add_options(arguments =>
-                                {
-                                });
+    $self->{version} = '1.0';
+    $options{options}->add_options(arguments => {
+    });
 
-    $self->{instance_selected} = {};
-     
-    foreach (keys %{$maps_counters}) {
-        $options{options}->add_options(arguments => {
-                                                     'warning-' . $_ . ':s'    => { name => 'warning-' . $_ },
-                                                     'critical-' . $_ . ':s'    => { name => 'critical-' . $_ },
-                                      });
-        my $class = $maps_counters->{$_}->{class};
-        $maps_counters->{$_}->{obj} = $class->new(output => $self->{output}, perfdata => $self->{perfdata},
-                                                  label => $_);
-        $maps_counters->{$_}->{obj}->set(%{$maps_counters->{$_}->{set}});
-    }
-    
     return $self;
 }
 
-sub check_options {
-    my ($self, %options) = @_;
-    $self->SUPER::init(%options);
-    
-    foreach (keys %{$maps_counters}) {
-        $maps_counters->{$_}->{obj}->init(option_results => $self->{option_results});
-    }
-}
-
-sub manage_counters {
-    my ($self, %options) = @_;
-    
-    foreach (sort keys %{$options{maps_counters}}) {
-        $options{maps_counters}->{$_}->{obj}->set(instance => $options{instance});
-    
-        my ($value_check) = $options{maps_counters}->{$_}->{obj}->execute(values => $self->{instance_selected}->{$options{instance}});
-
-        # We don't want to display no value
-        next if ($value_check == -10);
-        if ($value_check != 0) {
-            next;
-        }
-        my $exit = $options{maps_counters}->{$_}->{obj}->threshold_check();
-
-        my $output = $options{maps_counters}->{$_}->{obj}->output();
-        
-        $self->{output}->output_add(severity => $exit,
-                                    short_msg => $output
-                                    );
-        
-        $options{maps_counters}->{$_}->{obj}->perfdata();
-    }
-}
-
-sub run {
-    my ($self, %options) = @_;
-    $self->{snmp} = $options{snmp};
-
-    $self->manage_selection();
-    
-    $self->manage_counters(instance => 'ambiant', maps_counters => $maps_counters);
-    
-    $self->{output}->display();
-    $self->{output}->exit();
-}
-
 sub manage_selection {
     my ($self, %options) = @_;
     my $values_ok = 0;
-    $self->{instance_selected}->{ambiant} = {}; 
     
-    $self->{results} = $self->{snmp}->get_leef(oids => [$oid_upsmgEnvironAmbientTemp, $oid_upsmgEnvironAmbientHumidity],
-                                               nothing_quit => 1);
-    
-    if (defined($self->{results}->{$oid_upsmgEnvironAmbientTemp}) && $self->{results}->{$oid_upsmgEnvironAmbientTemp} ne '' &&
-        $self->{results}->{$oid_upsmgEnvironAmbientTemp} != 0) {
-        $self->{instance_selected}->{ambiant}->{temperature} = $self->{results}->{$oid_upsmgEnvironAmbientTemp} / 10;
+    my $oid_upsmgEnvironAmbientTemp = '.1.3.6.1.4.1.705.1.8.1.0'; # in 0.1 degree centigrade
+    my $oid_upsmgEnvironAmbientHumidity = '.1.3.6.1.4.1.705.1.8.2.0'; # in 0.1 %
+    my $snmp_result = $options{snmp}->get_leef(
+        oids => [$oid_upsmgEnvironAmbientTemp, $oid_upsmgEnvironAmbientHumidity],
+        nothing_quit => 1
+    );
+
+    $self->{global} = {};     
+    if (defined($snmp_result->{$oid_upsmgEnvironAmbientTemp}) && $snmp_result->{$oid_upsmgEnvironAmbientTemp} ne '' &&
+        $snmp_result->{$oid_upsmgEnvironAmbientTemp} != 0) {
+        $self->{global}->{temperature} = $snmp_result->{$oid_upsmgEnvironAmbientTemp} / 10;
         $values_ok++;
     }
-    if (defined($self->{results}->{$oid_upsmgEnvironAmbientHumidity}) && $self->{results}->{$oid_upsmgEnvironAmbientHumidity} ne '' &&
-        $self->{results}->{$oid_upsmgEnvironAmbientHumidity} != 0) {
-        $self->{instance_selected}->{ambiant}->{humidity} = $self->{results}->{$oid_upsmgEnvironAmbientHumidity} / 10;
+    if (defined($snmp_result->{$oid_upsmgEnvironAmbientHumidity}) && $snmp_result->{$oid_upsmgEnvironAmbientHumidity} ne '' &&
+        $snmp_result->{$oid_upsmgEnvironAmbientHumidity} != 0) {
+        $self->{global}->{humidity} = $snmp_result->{$oid_upsmgEnvironAmbientHumidity} / 10;
         $values_ok++;
     }
     
diff --git a/hardware/ups/powerware/snmp/mode/outputlines.pm b/hardware/ups/powerware/snmp/mode/outputlines.pm
index 294195029..004255132 100644
--- a/hardware/ups/powerware/snmp/mode/outputlines.pm
+++ b/hardware/ups/powerware/snmp/mode/outputlines.pm
@@ -20,85 +20,70 @@
 
 package hardware::ups::powerware::snmp::mode::outputlines;
 
-use base qw(centreon::plugins::mode);
+use base qw(centreon::plugins::templates::counter);
 
 use strict;
 use warnings;
-use centreon::plugins::values;
 
-my $maps_counters = {
-    voltage => { class => 'centreon::plugins::values', obj => undef,
-                 set => {
-                        key_values => [
-                                        { name => 'voltage', no_value => 0 },
-                                      ],
-                        output_template => 'Voltage: %.2f V', output_error_template => 'Voltage: %s',
-                        perfdatas => [
-                            { value => 'voltage_absolute', label => 'voltage', template => '%.2f',
-                              unit => 'V', min => 0, label_extra_instance => 1 },
-                        ],
-                    }
-               },
-    current => { class => 'centreon::plugins::values', obj => undef,
-                 set => {
-                        key_values => [
-                                        { name => 'current', no_value => 0 },
-                                      ],
-                        output_template => 'Current: %.2f A', output_error_template => 'Current: %s',
-                        perfdatas => [
-                            { value => 'current_absolute', label => 'current', template => '%.2f',
-                              unit => 'A', min => 0, label_extra_instance => 1 },
-                        ],
-                    }
-               },
-    power => { class => 'centreon::plugins::values', obj => undef,
-                 set => {
-                        key_values => [
-                                        { name => 'power', no_value => 0 },
-                                      ],
-                        output_template => 'Power: %.2f W', output_error_template => 'Power: %s',
-                        perfdatas => [
-                            { value => 'power_absolute', label => 'power', template => '%.2f',
-                              unit => 'W', min => 0, label_extra_instance => 1 },
-                        ],
-                    }
-               },
-};
+sub set_counters {
+    my ($self, %options) = @_;
+    
+    $self->{maps_counters_type} = [
+        { name => 'global', type => 0, skipped_code => { -10 => 1 } },
+        { name => 'oline', type => 1, cb_prefix_output => 'prefix_oline_output', message_multiple => 'All output lines are ok', skipped_code => { -10 => 1 } },
+    ];
 
-my $maps_counters2 = {
-    frequence => { class => 'centreon::plugins::values', obj => undef,
-                 set => {
-                        key_values => [
-                                        { name => 'frequence', no_value => 0 },
-                                      ],
-                        output_template => 'Frequence: %.2f Hz', output_error_template => 'Frequence: %s',
-                        perfdatas => [
-                            { value => 'frequence_absolute', label => 'frequence', template => '%.2f',
-                              unit => 'Hz', min => 0 },
-                        ],
-                    }
-               },
-    load => { class => 'centreon::plugins::values', obj => undef,
-                 set => {
-                        key_values => [
-                                        { name => 'load', no_value => -1 },
-                                      ],
-                        output_template => 'Load: %.2f %%', output_error_template => 'Load: %s',
-                        perfdatas => [
-                            { value => 'load_absolute', label => 'load', template => '%.2f',
-                              unit => '%', min => 0 },
-                        ],
-                    }
-               },
-};
+    $self->{maps_counters}->{global} = [
+        { label => 'load', nlabel => 'lines.output.load.percentage', set => {
+                key_values => [ { name => 'xupsOutputLoad', no_value => -1 } ],
+                output_template => 'Load : %.2f %%',
+                perfdatas => [
+                    { value => 'xupsOutputLoad_absolute', template => '%.2f', 
+                      min => 0, max => 100 },
+                ],
+            }
+        },
+        { label => 'frequence', nlabel => 'lines.output.frequence.hertz', set => {
+                key_values => [ { name => 'xupsOutputFrequency', no_value => 0 } ],
+                output_template => 'Frequence : %.2f Hz',
+                perfdatas => [
+                    { value => 'xupsOutputFrequency_absolute', template => '%.2f', 
+                      unit => 'Hz' },
+                ],
+            }
+        },
+    ];
 
-my $oid_xupsOutputVoltageEntry = '.1.3.6.1.4.1.534.1.4.4.1.2'; # in V
-my $oid_xupsOutputCurrentEntry = '.1.3.6.1.4.1.534.1.4.4.1.3'; # in A
-my $oid_xupsOutputWattsEntry = '.1.3.6.1.4.1.534.1.4.4.1.4'; # in W
-my $oid_xupsOutputFrequencyEntry = '.1.3.6.1.4.1.534.1.4.2';
-my $oid_xupsOutputFrequency = '.1.3.6.1.4.1.534.1.4.2.0'; # in dHZ
-my $oid_xupsOutputLoadEntry = '.1.3.6.1.4.1.534.1.4.1';
-my $oid_xupsOutputLoad = '.1.3.6.1.4.1.534.1.4.1.0'; # in %
+    $self->{maps_counters}->{oline} = [
+        { label => 'current', nlabel => 'line.output.current.ampere', set => {
+                key_values => [ { name => 'xupsOutputCurrent', no_value => 0 } ],
+                output_template => 'Current : %.2f A',
+                perfdatas => [
+                    { value => 'xupsOutputCurrent_absolute', template => '%.2f', 
+                      min => 0, unit => 'A', label_extra_instance => 1 },
+                ],
+            }
+        },
+        { label => 'voltage', nlabel => 'line.output.voltage.volt', set => {
+                key_values => [ { name => 'xupsOutputVoltage', no_value => 0 } ],
+                output_template => 'Voltage : %.2f V',
+                perfdatas => [
+                    { value => 'xupsOutputVoltage_absolute', template => '%.2f', 
+                      unit => 'V', label_extra_instance => 1 },
+                ],
+            }
+        },
+        { label => 'power', nlabel => 'line.output.power.watt', set => {
+                key_values => [ { name => 'xupsOutputWatts', no_value => 0 } ],
+                output_template => 'Power: %.2f W',
+                perfdatas => [
+                    { value => 'xupsOutputWatts_absolute', template => '%.2f', 
+                      unit => 'W', label_extra_instance => 1 },
+                ],
+            }
+        },
+    ];
+}
 
 sub new {
     my ($class, %options) = @_;
@@ -106,157 +91,62 @@ sub new {
     bless $self, $class;
     
     $self->{version} = '1.0';
-    $options{options}->add_options(arguments =>
-                                {
-                                });
+    $options{options}->add_options(arguments => {
+    });
 
-    $self->{instance_selected} = {};
-     
-    foreach (keys %{$maps_counters}) {
-        $options{options}->add_options(arguments => {
-                                                     'warning-' . $_ . ':s'    => { name => 'warning-' . $_ },
-                                                     'critical-' . $_ . ':s'    => { name => 'critical-' . $_ },
-                                      });
-        my $class = $maps_counters->{$_}->{class};
-        $maps_counters->{$_}->{obj} = $class->new(output => $self->{output}, perfdata => $self->{perfdata},
-                                                  label => $_);
-        $maps_counters->{$_}->{obj}->set(%{$maps_counters->{$_}->{set}});
-    }
-    foreach (keys %{$maps_counters2}) {
-        $options{options}->add_options(arguments => {
-                                                     'warning-' . $_ . ':s'    => { name => 'warning-' . $_ },
-                                                     'critical-' . $_ . ':s'    => { name => 'critical-' . $_ },
-                                      });
-        my $class = $maps_counters2->{$_}->{class};
-        $maps_counters2->{$_}->{obj} = $class->new(output => $self->{output}, perfdata => $self->{perfdata},
-                                                  label => $_);
-        $maps_counters2->{$_}->{obj}->set(%{$maps_counters2->{$_}->{set}});
-    }
-    
     return $self;
 }
 
-sub check_options {
+sub prefix_oline_output {
     my ($self, %options) = @_;
-    $self->SUPER::init(%options);
-    
-    foreach (keys %{$maps_counters}) {
-        $maps_counters->{$_}->{obj}->init(option_results => $self->{option_results});
-    }
-    foreach (keys %{$maps_counters2}) {
-        $maps_counters2->{$_}->{obj}->init(option_results => $self->{option_results});
-    }
+
+    return "Output Line '" . $options{instance_value}->{display} . "' ";
 }
 
-sub manage_counters {
-    my ($self, %options) = @_;
-    
-    my ($short_msg, $short_msg_append, $long_msg, $long_msg_append) = ('', '', '', '');
-    my @exits;
-    foreach (sort keys %{$options{maps_counters}}) {
-        $options{maps_counters}->{$_}->{obj}->set(instance => $options{instance});
-    
-        my ($value_check) = $options{maps_counters}->{$_}->{obj}->execute(values => $self->{instance_selected}->{$options{instance}});
+my $mapping = {
+    xupsOutputVoltage   => { oid => '.1.3.6.1.4.1.534.1.4.4.1.2' }, # in V
+    xupsOutputCurrent   => { oid => '.1.3.6.1.4.1.534.1.4.4.1.3' }, # in A
+    xupsOutputWatts     => { oid => '.1.3.6.1.4.1.534.1.4.4.1.4' }, # in W
+};
+my $mapping2 = {
+    xupsOutputLoad      => { oid => '.1.3.6.1.4.1.534.1.4.1', default => -1 }, # in %
+    xupsOutputFrequency => { oid => '.1.3.6.1.4.1.534.1.4.2', default => 0 }, # in dHZ
+};
 
-        # We don't want to display no value
-        next if ($value_check == -10);
-        if ($value_check != 0) {
-            $long_msg .= $long_msg_append . $options{maps_counters}->{$_}->{obj}->output_error();
-            $long_msg_append = ', ';
-            next;
-        }
-        my $exit2 = $options{maps_counters}->{$_}->{obj}->threshold_check();
-        push @exits, $exit2;
-
-        my $output = $options{maps_counters}->{$_}->{obj}->output();
-        $long_msg .= $long_msg_append . $output;
-        $long_msg_append = ', ';
-        
-        if (!$self->{output}->is_status(litteral => 1, value => $exit2, compare => 'ok')) {
-            $short_msg .= $short_msg_append . $output;
-            $short_msg_append = ', ';
-        }
-        
-        $options{maps_counters}->{$_}->{obj}->perfdata(level => 1, extra_instance => $self->{multiple});
-    }
-
-    $self->{output}->output_add(long_msg => $options{label} . " " . $long_msg);
-    my $exit = $self->{output}->get_most_critical(status => [ @exits ]);
-    if (!$self->{output}->is_status(litteral => 1, value => $exit, compare => 'ok')) {
-        $self->{output}->output_add(severity => $exit,
-                                    short_msg => $options{label} . " " . $short_msg
-                                    );
-    }
-    
-    if ($self->{multiple} == 0) {
-        $self->{output}->output_add(short_msg => $options{label} . " " . $long_msg);
-    }
-}
-
-sub run {
-    my ($self, %options) = @_;
-    $self->{snmp} = $options{snmp};
-
-    $self->manage_selection();
-    
-    $self->{multiple} = 1;
-    if (scalar(keys %{$self->{instance_selected}}) == 1) {
-        $self->{multiple} = 0;
-    }
-    
-    if ($self->{multiple} == 1) {
-        $self->{output}->output_add(severity => 'OK',
-                                    short_msg => 'Output Lines are ok.');
-    }
-    
-    foreach my $id (sort keys %{$self->{instance_selected}}) {     
-        $self->manage_counters(instance => $id, maps_counters => $maps_counters, label => "Output Line '" . $id . "'");
-    }
-    
-    $self->{instance_selected}->{lines} = { frequence => defined($self->{results}->{$oid_xupsOutputFrequencyEntry}->{$oid_xupsOutputFrequency}) ? $self->{results}->{$oid_xupsOutputFrequencyEntry}->{$oid_xupsOutputFrequency} * 0.1 : 0,
-                                            load => defined($self->{results}->{$oid_xupsOutputLoadEntry}->{$oid_xupsOutputLoad}) ? $self->{results}->{$oid_xupsOutputLoadEntry}->{$oid_xupsOutputLoad} : -1 };
-    $self->manage_counters(instance => 'lines', maps_counters => $maps_counters2, label => "Output Lines");
-    
-    $self->{output}->display();
-    $self->{output}->exit();
-}
-
-sub add_result {
-    my ($self, %options) = @_;
-    
-    $self->{instance_selected}->{$options{instance}} = {} if (!defined($self->{instance_selected}->{$options{instance}}));
-    $self->{instance_selected}->{$options{instance}}->{$options{name}} = $self->{results}->{$options{oid}}->{$options{oid} . '.' . $options{instance}};
-}
+my $oid_xupsOutput = '.1.3.6.1.4.1.534.1.4';
+my $oid_xupsOutputEntry = '.1.3.6.1.4.1.534.1.4.4.1';
 
 sub manage_selection {
     my ($self, %options) = @_;
  
-    $self->{results} = $self->{snmp}->get_multiple_table(oids => [
-                                                            { oid => $oid_xupsOutputVoltageEntry },
-                                                            { oid => $oid_xupsOutputCurrentEntry },
-                                                            { oid => $oid_xupsOutputWattsEntry },
-                                                            { oid => $oid_xupsOutputFrequencyEntry },
-                                                            { oid => $oid_xupsOutputLoadEntry },
-                                                         ],
-                                                         , nothing_quit => 1);
- 
-    foreach my $oid (keys %{$self->{results}->{$oid_xupsOutputVoltageEntry}}) {
-        $oid =~ /^$oid_xupsOutputVoltageEntry\.(\d)$/;
-        $self->add_result(instance => $1, name => 'voltage', oid => $oid_xupsOutputVoltageEntry);
-    }
-    foreach my $oid (keys %{$self->{results}->{$oid_xupsOutputCurrentEntry}}) {
-        $oid =~ /^$oid_xupsOutputCurrentEntry\.(\d)$/;
-        $self->add_result(instance => $1, name => 'current', oid => $oid_xupsOutputCurrentEntry);
-    }
-    foreach my $oid (keys %{$self->{results}->{$oid_xupsOutputWattsEntry}}) {
-        $oid =~ /^$oid_xupsOutputWattsEntry\.(\d)$/;
-        $self->add_result(instance => $1, name => 'power', oid => $oid_xupsOutputWattsEntry);
+    $self->{oline} = {};
+    my $snmp_result = $options{snmp}->get_table(
+        oid => $oid_xupsOutput,
+        nothing_quit => 1
+    );
+    
+    foreach my $oid (keys %{$snmp_result}) {
+        $oid =~ /^$oid_xupsOutputEntry\.\d+\.(.*)$/;
+        my $instance = $1;
+        next if (defined($self->{oline}->{$instance}));
+        
+        my $result = $options{snmp}->map_instance(mapping => $mapping, results => $snmp_result, instance => $instance);
+        $self->{oline}->{$instance} = { display => $instance, %$result };
     }
     
-    if (scalar(keys %{$self->{instance_selected}}) <= 0) {
+    if (scalar(keys %{$self->{oline}}) <= 0) {
         $self->{output}->add_option_msg(short_msg => "No output lines found.");
         $self->{output}->option_exit();
-    }    
+    }
+
+    my $result = $options{snmp}->map_instance(mapping => $mapping2, results => $snmp_result, instance => '0');
+    
+    $result->{xupsOutputFrequency} = defined($result->{xupsOutputFrequency}) ? ($result->{xupsOutputFrequency} * 0.1) : 0;
+    $result->{xupsOutputLoad} = defined($result->{xupsOutputLoad}) ? $result->{xupsOutputLoad} : -1;
+    $self->{global} = { %$result };
+    
+    use Data::Dumper;
+    print Data::Dumper::Dumper($self->{oline});
 }
 
 1;