diff --git a/network/f5/bigip/snmp/mode/poolstatus.pm b/network/f5/bigip/snmp/mode/poolstatus.pm
index 1fbc52c38..48c3fb445 100644
--- a/network/f5/bigip/snmp/mode/poolstatus.pm
+++ b/network/f5/bigip/snmp/mode/poolstatus.pm
@@ -24,53 +24,60 @@ use base qw(centreon::plugins::templates::counter);
 
 use strict;
 use warnings;
+use centreon::plugins::templates::catalog_functions qw(catalog_status_threshold catalog_status_calc);
 
-my $thresholds = {
-    pool => [
-        ['none', 'CRITICAL'],
-        ['green', 'OK'],
-        ['yellow', 'WARNING'],
-        ['red', 'CRITICAL'],
-        ['blue', 'UNKNOWN'],
-        ['gray', 'UNKNOWN'],
-    ],
-};
-
-sub custom_threshold_output {
+sub custom_status_output {
     my ($self, %options) = @_;
-    
-    return $self->{instance_mode}->get_severity(section => 'pool', value => $self->{result_values}->{AvailState});
-}
 
-sub custom_status_calc {
-    my ($self, %options) = @_;
-    
-    $self->{result_values}->{AvailState} = $options{new_datas}->{$self->{instance} . '_AvailState'};
-    return 0;
+    my $msg = sprintf(
+        'status: %s [state: %s] [reason: %s]',
+        $self->{result_values}->{status},
+        $self->{result_values}->{enabled},
+        $self->{result_values}->{reason},
+    );
+    return $msg;
 }
 
 sub set_counters {
     my ($self, %options) = @_;
     
     $self->{maps_counters_type} = [
-        { name => 'pool', type => 1, cb_prefix_output => 'prefix_pool_output', message_multiple => 'All Pools are ok' },
+        { name => 'pool', type => 1, cb_prefix_output => 'prefix_pool_output', message_multiple => 'All Pools are ok', skipped_code => { -10 => 1 } },
     ];
+
     $self->{maps_counters}->{pool} = [
         { label => 'status', threshold => 0, set => {
-                key_values => [ { name => 'AvailState' } ],
-                closure_custom_calc => $self->can('custom_status_calc'),
-                output_template => 'Status : %s', output_error_template => 'Status : %s',
-                output_use => 'AvailState',
+                key_values => [ { name => 'enabled' }, { name => 'status' }, { name => 'reason' },{ name => 'display' } ],
+                closure_custom_calc => \&catalog_status_calc,
+                closure_custom_output => $self->can('custom_status_output'),
                 closure_custom_perfdata => sub { return 0; },
-                closure_custom_threshold_check => $self->can('custom_threshold_output'),
+                closure_custom_threshold_check => \&catalog_status_threshold,
             }
         },
         { label => 'current-server-connections', set => {
-                key_values => [ { name => 'ltmPoolStatServerCurConns' }, { name => 'Name' } ],
-                output_template => 'Current Server Connections : %s', output_error_template => "Current Server Connections : %s",
+                key_values => [ { name => 'ltmPoolStatServerCurConns' }, { name => 'display' } ],
+                output_template => 'current server connections: %s',
                 perfdatas => [
-                    { label => 'current_server_connections', value => 'ltmPoolStatServerCurConns_absolute',  template => '%s',
-                      min => 0, label_extra_instance => 1, instance_use => 'Name_absolute' },
+                    { label => 'current_server_connections', value => 'ltmPoolStatServerCurConns_absolute', template => '%s',
+                      min => 0, label_extra_instance => 1, instance_use => 'display_absolute' },
+                ],
+            }
+        },
+        { label => 'current-active-members', display_ok => 0, set => {
+                key_values => [ { name => 'ltmPoolActiveMemberCnt' }, { name => 'display' } ],
+                output_template => 'current active members: %s',
+                perfdatas => [
+                    { label => 'current_active_members', value => 'ltmPoolActiveMemberCnt_absolute', template => '%s',
+                      min => 0, label_extra_instance => 1, instance_use => 'display_absolute' },
+                ],
+            }
+        },
+        { label => 'current-total-members', display_ok => 0, set => {
+                key_values => [ { name => 'ltmPoolMemberCnt' }, { name => 'display' } ],
+                output_template => 'current total members: %s',
+                perfdatas => [
+                    { label => 'current_total_members', value => 'ltmPoolMemberCnt_absolute', template => '%s',
+                      min => 0, label_extra_instance => 1, instance_use => 'display_absolute' },
                 ],
             }
         },
@@ -80,7 +87,7 @@ sub set_counters {
 sub prefix_pool_output {
     my ($self, %options) = @_;
     
-    return "Pool '" . $options{instance_value}->{Name} . "' ";
+    return "Pool '" . $options{instance_value}->{display} . "' ";
 }
 
 sub new {
@@ -89,8 +96,11 @@ sub new {
     bless $self, $class;
     
     $options{options}->add_options(arguments => { 
-        "filter-name:s"           => { name => 'filter_name' },
-        "threshold-overload:s@"   => { name => 'threshold_overload' },
+        'filter-name:s'     => { name => 'filter_name' },
+        'unknown-status:s'  => { name => 'unknown_status', default => '' },
+        'warning-status:s'  => { name => 'warning_status', default => '%{enabled} eq "enabled" and %{status} eq "yellow"' },
+        'critical-status:s' => { name => 'critical_status', default => '%{enabled} eq "enabled" and %{status} eq "red"' },
+
     });
     
     return $self;
@@ -100,133 +110,98 @@ sub check_options {
     my ($self, %options) = @_;
     $self->SUPER::check_options(%options);
 
-    $self->{overload_th} = {};
-    foreach my $val (@{$self->{option_results}->{threshold_overload}}) {
-        if ($val !~ /^(.*?),(.*?),(.*)$/) {
-            $self->{output}->add_option_msg(short_msg => "Wrong threshold-overload option '" . $val . "'.");
-            $self->{output}->option_exit();
-        }
-        my ($section, $status, $filter) = ($1, $2, $3);
-        if ($self->{output}->is_litteral_status(status => $status) == 0) {
-            $self->{output}->add_option_msg(short_msg => "Wrong threshold-overload status '" . $val . "'.");
-            $self->{output}->option_exit();
-        }
-        $self->{overload_th}->{$section} = [] if (!defined($self->{overload_th}->{$section}));
-        push @{$self->{overload_th}->{$section}}, {filter => $filter, status => $status};
-    }
+    $self->change_macros(macros => ['warning_status', 'critical_status', 'unknown_status']);
 }
 
-sub get_severity {
-    my ($self, %options) = @_;
-    my $status = 'UNKNOWN'; # default 
-    
-    if (defined($self->{overload_th}->{$options{section}})) {
-        foreach (@{$self->{overload_th}->{$options{section}}}) {            
-            if ($options{value} =~ /$_->{filter}/i) {
-                $status = $_->{status};
-                return $status;
-            }
-        }
-    }
-    foreach (@{$thresholds->{$options{section}}}) {           
-        if ($options{value} =~ /$$_[0]/i) {
-            $status = $$_[1];
-            return $status;
-        }
-    }
-    
-    return $status;
-}
-
-my %map_pool_status = (
-    0 => 'none',
-    1 => 'green',
-    2 => 'yellow',
-    3 => 'red',
-    4 => 'blue', # unknown
-    5 => 'gray',
-);
-my %map_pool_enabled = (
-    0 => 'none',
-    1 => 'enabled',
-    2 => 'disabled',
-    3 => 'disabledbyparent',
-);
+my $map_pool_status = {
+    0 => 'none', 1 => 'green',
+    2 => 'yellow', 3 => 'red',
+    4 => 'blue', 5 => 'gray',
+};
+my $map_pool_enabled = {
+    0 => 'none', 1 => 'enabled', 2 => 'disabled', 3 => 'disabledbyparent',
+};
 
 # New OIDS
 my $mapping = {
     new => {
-        AvailState => { oid => '.1.3.6.1.4.1.3375.2.2.5.5.2.1.2', map => \%map_pool_status },
-        EnabledState => { oid => '.1.3.6.1.4.1.3375.2.2.5.5.2.1.3', map => \%map_pool_enabled },
+        AvailState => { oid => '.1.3.6.1.4.1.3375.2.2.5.5.2.1.2', map => $map_pool_status },
+        EnabledState => { oid => '.1.3.6.1.4.1.3375.2.2.5.5.2.1.3', map => $map_pool_enabled },
         StatusReason => { oid => '.1.3.6.1.4.1.3375.2.2.5.5.2.1.5' },
     },
     old => {
-        AvailState => { oid => '.1.3.6.1.4.1.3375.2.2.5.1.2.1.18', map => \%map_pool_status },
-        EnabledState => { oid => '.1.3.6.1.4.1.3375.2.2.5.1.2.1.19', map => \%map_pool_enabled },
+        AvailState => { oid => '.1.3.6.1.4.1.3375.2.2.5.1.2.1.18', map => $map_pool_status },
+        EnabledState => { oid => '.1.3.6.1.4.1.3375.2.2.5.1.2.1.19', map => $map_pool_enabled },
         StatusReason => { oid => '.1.3.6.1.4.1.3375.2.2.5.1.2.1.21' },
     },
 };
 my $mapping2 = {
     ltmPoolStatServerCurConns => { oid => '.1.3.6.1.4.1.3375.2.2.5.2.3.1.8' },
+    ltmPoolActiveMemberCnt    => { oid => '.1.3.6.1.4.1.3375.2.2.5.1.2.1.8' },
+    ltmPoolMemberCnt          => { oid => '.1.3.6.1.4.1.3375.2.2.5.1.2.1.23' },
 };
 
 sub manage_selection {
     my ($self, %options) = @_;
     
-    my $snmp_result = $options{snmp}->get_multiple_table(oids => [
-                                                            { oid => $mapping->{new}->{AvailState}->{oid} },
-                                                            { oid => $mapping->{old}->{AvailState}->{oid} },
-                                                         ],  nothing_quit => 1);
+    my $snmp_result = $options{snmp}->get_multiple_table(
+        oids => [
+            { oid => $mapping->{new}->{AvailState}->{oid} },
+            { oid => $mapping->{old}->{AvailState}->{oid} },
+        ],
+        nothing_quit => 1
+    );
     
     my ($branch_name, $map) = ($mapping->{new}->{AvailState}->{oid}, 'new');
     if (!defined($snmp_result->{$mapping->{new}->{AvailState}->{oid}}) || scalar(keys %{$snmp_result->{$mapping->{new}->{AvailState}->{oid}}}) == 0)  {
         ($branch_name, $map) = ($mapping->{old}->{AvailState}->{oid}, 'old');
     }
-    
+
     $self->{pool} = {};
     foreach my $oid (keys %{$snmp_result->{$branch_name}}) {
-        $oid =~ /^$branch_name\.(.*)$/;
-        my $instance = $1;
+        $oid =~ /^$branch_name\.(.*?)\.(.*)$/;
+        my ($num, $index) = ($1, $2);
         
-        my $result = $options{snmp}->map_instance(mapping => $mapping->{$map}, results => $snmp_result->{$branch_name}, instance => $instance);
-        $result->{Name} = '';
-        foreach (split /\./, $instance) {
-            $result->{Name} .= chr if ($_ >= 32 && $_ <= 126);
-        }
-        $result->{Name} =~ s/^.//;
+        my $result = $options{snmp}->map_instance(mapping => $mapping->{$map}, results => $snmp_result->{$branch_name}, instance => $num . '.' . $index);
+        my $name = $self->{output}->to_utf8(join('', map(chr($_), split(/\./, $index))));
         
         if (defined($self->{option_results}->{filter_name}) && $self->{option_results}->{filter_name} ne '' &&
-            $result->{Name} !~ /$self->{option_results}->{filter_name}/) {
-            $self->{output}->output_add(long_msg => "skipping pool '" . $result->{Name} . "'.", debug => 1);
+            $name !~ /$self->{option_results}->{filter_name}/) {
+            $self->{output}->output_add(long_msg => "skipping pool '" . $name . "'.", debug => 1);
             next;
         }
-        
-        $self->{pool}->{$instance} = { Name => $result->{Name}, AvailState => $result->{AvailState} };
+
+        $self->{pool}->{$num . '.' . $index} = {
+            display => $name,
+            status => $result->{AvailState}
+        };
     }
-    
-    $options{snmp}->load(oids => [$mapping->{$map}->{EnabledState}->{oid},
-        $mapping->{$map}->{StatusReason}->{oid}, $mapping2->{ltmPoolStatServerCurConns}->{oid}
+
+    $options{snmp}->load(
+        oids => [
+            $mapping->{$map}->{EnabledState}->{oid},
+            $mapping->{$map}->{StatusReason}->{oid},
+            $mapping2->{ltmPoolStatServerCurConns}->{oid},
+            $mapping2->{ltmPoolActiveMemberCnt}->{oid},
+            $mapping2->{ltmPoolMemberCnt}->{oid},
         ], 
-        instances => [keys %{$self->{pool}}], instance_regexp => '^(.*)$');
+        instances => [keys %{$self->{pool}}], 
+        instance_regexp => '^(.*)$'
+    );
     $snmp_result = $options{snmp}->get_leef(nothing_quit => 1);
-    
+
     foreach (keys %{$self->{pool}}) {
         my $result = $options{snmp}->map_instance(mapping => $mapping->{$map}, results => $snmp_result, instance => $_);
         my $result2 = $options{snmp}->map_instance(mapping => $mapping2, results => $snmp_result, instance => $_);
         
-        delete $result->{AvailState};
-        if ($result->{EnabledState} !~ /enabled/) {
-            $self->{output}->output_add(long_msg => "skipping '" . $self->{pool}->{$_}->{Name} . "': state is '$result->{EnabledState}'.", debug => 1);
-            delete $self->{pool}->{$_};
-            next;
-        }
-        $self->{pool}->{$_}->{ltmPoolStatServerCurConns} = $result2->{ltmPoolStatServerCurConns};
         $result->{StatusReason} = '-' if (!defined($result->{StatusReason}) || $result->{StatusReason} eq '');
-        foreach my $name (keys %$result) {
-            $self->{pool}->{$_}->{$name} = $result->{$name};
-        }
+        $self->{pool}->{$_}->{reason} = $result->{StatusReason};
+        $self->{pool}->{$_}->{enabled} = $result->{EnabledState};
+        $self->{pool}->{$_}->{ltmPoolStatServerCurConns} = $result2->{ltmPoolStatServerCurConns};
+        $self->{pool}->{$_}->{ltmPoolActiveMemberCnt} = $result2->{ltmPoolActiveMemberCnt};
+        $self->{pool}->{$_}->{ltmPoolMemberCnt} = $result2->{ltmPoolMemberCnt};
     }
-    
+
     if (scalar(keys %{$self->{pool}}) <= 0) {
         $self->{output}->add_option_msg(short_msg => "No entry found.");
         $self->{output}->option_exit();
@@ -247,21 +222,25 @@ Check Pools status.
 
 Filter by name (regexp can be used).
 
-=item B<--threshold-overload>
+=item B<--unknown-status>
 
-Set to overload default threshold values (syntax: section,status,regexp)
-It used before default thresholds (order stays).
-Example: --threshold-overload='pool,CRITICAL,^(?!(green)$)'
+Set warning threshold for status (Default: '').
+Can used special variables like: %{enabled}, %{status}, %{display}
 
-=item B<--warning-*>
+=item B<--warning-status>
 
-Threshold warning.
-Can be: 'current-server-connections'.
+Set warning threshold for status (Default: '%{enabled} eq "enabled" and %{status} eq "yellow"').
+Can used special variables like: %{enabled}, %{status}, %{display}
 
-=item B<--critical-*>
+=item B<--critical-status>
 
-Threshold critical.
-Can be: 'current-server-connections'.
+Set critical threshold for status (Default: '%{enabled} eq "enabled" and %{status} eq "red"').
+Can used special variables like: %{enabled}, %{status}, %{display}
+
+=item B<--warning-*> B<--critical-*>
+
+Thresholds.
+Can be: 'current-server-connections', 'current-active-members', 'current-total-members'.
 
 =back