diff --git a/apps/voip/cisco/meetingplace/plugin.pm b/apps/voip/cisco/meetingplace/plugin.pm
index 01eedf3e7..e00141893 100644
--- a/apps/voip/cisco/meetingplace/plugin.pm
+++ b/apps/voip/cisco/meetingplace/plugin.pm
@@ -32,16 +32,15 @@ sub new {
 
     $self->{version} = '1.0';
     %{$self->{modes}} = (
-			 'cpu'		=> 'snmp_standard::mode::cpu',
-			 'memory'	=> 'os::windows::snmp::mode::memory',
-			 'storage'	=> 'snmp_standard::mode::storage',
-                         'audio-ports' => 'apps::voip::cisco::meetingplace::mode::audioports',
-                         'video-ports' => 'apps::voip::cisco::meetingplace::mode::videoports',
-                         'audio-licenses' => 'apps::voip::cisco::meetingplace::mode::audiolicenses',
-                         'video-licenses' => 'apps::voip::cisco::meetingplace::mode::videolicenses',
-                         'packet-errors' => 'snmp_standard::mode::packeterrors',
-                         'traffic' => 'snmp_standard::mode::traffic',
-                         );
+            'cpu'               => 'snmp_standard::mode::cpu',
+            'memory'            => 'os::windows::snmp::mode::memory',
+            'storage'           => 'snmp_standard::mode::storage',
+            'audio-ports'       => 'apps::voip::cisco::meetingplace::mode::audioports',
+            'video-ports'       => 'apps::voip::cisco::meetingplace::mode::videoports',
+            'audio-licenses'    => 'apps::voip::cisco::meetingplace::mode::audiolicenses',
+            'video-licenses'    => 'apps::voip::cisco::meetingplace::mode::videolicenses',
+            'interfaces'        => 'snmp_standard::mode::interfaces', 
+    );
 
     return $self;
 }
diff --git a/network/alcatel/omniswitch/6850/plugin.pm b/network/alcatel/omniswitch/6850/plugin.pm
index 99ecfe72a..356ead358 100644
--- a/network/alcatel/omniswitch/6850/plugin.pm
+++ b/network/alcatel/omniswitch/6850/plugin.pm
@@ -34,12 +34,11 @@ sub new {
     %{$self->{modes}} = (
                         'cpu'               => 'network::alcatel::common::mode::cpu',
                         'hardware'          => 'network::alcatel::common::mode::hardware',
+                        'interfaces'        => 'snmp_standard::mode::interfaces', 
                         'list-interfaces'   => 'snmp_standard::mode::listinterfaces',
                         'flash-memory'      => 'network::alcatel::common::mode::flashmemory',
                         'memory'            => 'network::alcatel::common::mode::memory',
-                        'packet-errors'     => 'snmp_standard::mode::packeterrors',
                         'spanning-tree'     => 'snmp_standard::mode::spanningtree',
-                        'traffic'           => 'snmp_standard::mode::traffic',
                         );
 
     return $self;
diff --git a/network/arkoon/plugin.pm b/network/arkoon/plugin.pm
index 51b4568b1..2cda06cba 100644
--- a/network/arkoon/plugin.pm
+++ b/network/arkoon/plugin.pm
@@ -37,9 +37,8 @@ sub new {
                          'swap'             => 'snmp_standard::mode::swap',
                          'inodes'           => 'snmp_standard::mode::inodes',
                          'processcount'     => 'snmp_standard::mode::processcount',
+                         'interfaces'       => 'snmp_standard::mode::interfaces',
                          'list-interfaces'  => 'snmp_standard::mode::listinterfaces',
-                         'packet-errors'    => 'snmp_standard::mode::packeterrors',
-                         'traffic'          => 'snmp_standard::mode::traffic',
                          'uptime'           => 'snmp_standard::mode::uptime',
                          );
 
diff --git a/network/aruba/standard/snmp/plugin.pm b/network/aruba/standard/snmp/plugin.pm
index ceb8648b1..eb7d82c95 100644
--- a/network/aruba/standard/snmp/plugin.pm
+++ b/network/aruba/standard/snmp/plugin.pm
@@ -36,9 +36,8 @@ sub new {
                          'ap-users'         => 'centreon::common::aruba::snmp::mode::apusers',
                          'cpu'              => 'centreon::common::aruba::snmp::mode::cpu',
                          'hardware'         => 'centreon::common::aruba::snmp::mode::hardware',
+                         'interfaces'       => 'snmp_standard::mode::interfaces',
                          'list-interfaces'  => 'snmp_standard::mode::listinterfaces',
-                         'packet-errors'    => 'snmp_standard::mode::packeterrors',
-                         'traffic'          => 'snmp_standard::mode::traffic',
                          'memory'           => 'centreon::common::aruba::snmp::mode::memory',
                          'storage'          => 'centreon::common::aruba::snmp::mode::storage',
                          );
diff --git a/network/brocade/plugin.pm b/network/brocade/plugin.pm
index 66d696b8e..0a1743275 100644
--- a/network/brocade/plugin.pm
+++ b/network/brocade/plugin.pm
@@ -32,10 +32,11 @@ sub new {
 
     $self->{version} = '1.0';
     %{$self->{modes}} = (
-                         'cpu'      => 'network::brocade::mode::cpu',
-                         'hardware' => 'network::brocade::mode::hardware',
-                         'memory'   => 'network::brocade::mode::memory',
-                         'traffic'  => 'snmp_standard::mode::traffic',
+                         'cpu'              => 'network::brocade::mode::cpu',
+                         'hardware'         => 'network::brocade::mode::hardware',
+                         'interfaces'       => 'snmp_standard::mode::interfaces',
+                         'list-interfaces'  => 'snmp_standard::mode::listinterfaces',
+                         'memory'           => 'network::brocade::mode::memory',
                          );
 
     return $self;
diff --git a/network/cisco/asa/plugin.pm b/network/cisco/asa/plugin.pm
index b8fd96a8f..2aa3c2e11 100644
--- a/network/cisco/asa/plugin.pm
+++ b/network/cisco/asa/plugin.pm
@@ -34,11 +34,10 @@ sub new {
     %{$self->{modes}} = (
                          'cpu'              => 'centreon::common::cisco::standard::snmp::mode::cpu',
                          'failover'         => 'network::cisco::asa::mode::failover',
+                         'interfaces'       => 'snmp_standard::mode::interfaces', 
                          'list-interfaces'  => 'snmp_standard::mode::listinterfaces',
                          'memory'           => 'centreon::common::cisco::standard::snmp::mode::memory',
-                         'packet-errors'    => 'snmp_standard::mode::packeterrors',
                          'sessions'         => 'network::cisco::asa::mode::sessions',
-                         'traffic'          => 'snmp_standard::mode::traffic',
                          );
 
     return $self;
diff --git a/network/cisco/ironport/snmp/plugin.pm b/network/cisco/ironport/snmp/plugin.pm
index 73e8c287e..7cfce585a 100644
--- a/network/cisco/ironport/snmp/plugin.pm
+++ b/network/cisco/ironport/snmp/plugin.pm
@@ -34,9 +34,9 @@ sub new {
     %{$self->{modes}} = (
                          'cpu'              => 'network::cisco::ironport::snmp::mode::cpu',
                          'hardware'         => 'network::cisco::ironport::snmp::mode::hardware',
+                         'interfaces'       => 'snmp_standard::mode::interfaces', 
                          'list-interfaces'  => 'snmp_standard::mode::listinterfaces',
                          'memory'           => 'network::cisco::ironport::snmp::mode::memory',
-                         'traffic'          => 'snmp_standard::mode::traffic',
                          );
 
     return $self;
diff --git a/network/cisco/smallbusiness/standard/snmp/plugin.pm b/network/cisco/smallbusiness/standard/snmp/plugin.pm
index 655f62016..d86c42f5f 100644
--- a/network/cisco/smallbusiness/standard/snmp/plugin.pm
+++ b/network/cisco/smallbusiness/standard/snmp/plugin.pm
@@ -34,10 +34,9 @@ sub new {
     %{$self->{modes}} = (
                          'cpu'              => 'centreon::common::cisco::smallbusiness::snmp::mode::cpu',
                          'environment'      => 'centreon::common::cisco::smallbusiness::snmp::mode::environment',
+                         'interfaces'       => 'snmp_standard::mode::interfaces', 
                          'list-interfaces'  => 'snmp_standard::mode::listinterfaces',
-                         'packet-errors'    => 'snmp_standard::mode::packeterrors',
                          'spanning-tree'    => 'snmp_standard::mode::spanningtree',
-                         'traffic'          => 'snmp_standard::mode::traffic',
                          );
 
     return $self;
diff --git a/network/cisco/standard/snmp/plugin.pm b/network/cisco/standard/snmp/plugin.pm
index a1923bcbb..7890a70d0 100644
--- a/network/cisco/standard/snmp/plugin.pm
+++ b/network/cisco/standard/snmp/plugin.pm
@@ -32,17 +32,15 @@ sub new {
 
     $self->{version} = '1.0';
     %{$self->{modes}} = (
-                         'anycast'          => 'snmp_standard::mode::anycast',
                          'cpu'              => 'centreon::common::cisco::standard::snmp::mode::cpu',
                          'environment'      => 'centreon::common::cisco::standard::snmp::mode::environment',
                          'hsrp'             => 'centreon::common::cisco::standard::snmp::mode::hsrp',
+                         'interfaces'       => 'snmp_standard::mode::interfaces', 
                          'ipsla'            => 'centreon::common::cisco::standard::snmp::mode::ipsla',
                          'list-interfaces'  => 'snmp_standard::mode::listinterfaces',
                          'memory'           => 'centreon::common::cisco::standard::snmp::mode::memory',
-                         'packet-errors'    => 'snmp_standard::mode::packeterrors',
                          'spanning-tree'    => 'snmp_standard::mode::spanningtree',
                          'stack'            => 'centreon::common::cisco::standard::snmp::mode::stack',
-                         'traffic'          => 'snmp_standard::mode::traffic',
                          );
 
     return $self;
diff --git a/network/cisco/wlc/snmp/plugin.pm b/network/cisco/wlc/snmp/plugin.pm
index e914a4c56..c76e60fc5 100644
--- a/network/cisco/wlc/snmp/plugin.pm
+++ b/network/cisco/wlc/snmp/plugin.pm
@@ -38,9 +38,9 @@ sub new {
                          'ap-users'                 => 'centreon::common::airespace::snmp::mode::apusers',
                          'cpu'                      => 'centreon::common::airespace::snmp::mode::cpu',
                          'hardware'         => 'centreon::common::airespace::snmp::mode::hardware',
+                         'interfaces'       => 'snmp_standard::mode::interfaces', 
                          'list-interfaces'  => 'snmp_standard::mode::listinterfaces',
                          'memory'           => 'centreon::common::airespace::snmp::mode::memory',
-                         'traffic'          => 'snmp_standard::mode::traffic',
                          );
 
     return $self;
diff --git a/network/citrix/netscaler/mpx8000/plugin.pm b/network/citrix/netscaler/mpx8000/plugin.pm
index 12183b270..960a164c3 100644
--- a/network/citrix/netscaler/mpx8000/plugin.pm
+++ b/network/citrix/netscaler/mpx8000/plugin.pm
@@ -37,11 +37,11 @@ sub new {
             'storage'               => 'network::citrix::netscaler::common::mode::storage',
             'health'                => 'network::citrix::netscaler::common::mode::health',
             'ha-state'              => 'network::citrix::netscaler::common::mode::hastate',
+            'interfaces'            => 'snmp_standard::mode::interfaces',
             'list-interfaces'       => 'snmp_standard::mode::listinterfaces',
             'list-vservers'         => 'network::citrix::netscaler::common::mode::listvservers',
             'vserver-status'        => 'network::citrix::netscaler::common::mode::vserverstatus',
             'memory'                => 'network::citrix::netscaler::common::mode::memory',
-            'traffic'               => 'snmp_standard::mode::traffic',
     );
 
     return $self;
diff --git a/network/dell/6200/plugin.pm b/network/dell/6200/plugin.pm
index 31e9cd77b..3e76e88a5 100644
--- a/network/dell/6200/plugin.pm
+++ b/network/dell/6200/plugin.pm
@@ -34,9 +34,9 @@ sub new {
     %{$self->{modes}} = (
                           'global-status'   => 'centreon::common::dell::powerconnect3000::mode::globalstatus',
                           'environment'     => 'centreon::common::fastpath::mode::environment',
+                          'interfaces'      => 'snmp_standard::mode::interfaces',
                           'memory'          => 'centreon::common::fastpath::mode::memory',
                           'cpu'             => 'centreon::common::fastpath::mode::cpu',
-                          'traffic'         => 'snmp_standard::mode::traffic',
                           'list-interfaces' => 'snmp_standard::mode::listinterfaces',
                          );
 
diff --git a/network/dell/n4000/plugin.pm b/network/dell/n4000/plugin.pm
index 26fe83ab6..de13e704c 100644
--- a/network/dell/n4000/plugin.pm
+++ b/network/dell/n4000/plugin.pm
@@ -34,9 +34,9 @@ sub new {
     %{$self->{modes}} = (
                           'global-status'   => 'centreon::common::dell::powerconnect3000::mode::globalstatus',
                           'environment'     => 'centreon::common::fastpath::mode::environment',
+                          'interfaces'      => 'snmp_standard::mode::interfaces', 
                           'memory'          => 'centreon::common::fastpath::mode::memory',
                           'cpu'             => 'centreon::common::fastpath::mode::cpu',
-                          'traffic'         => 'snmp_standard::mode::traffic',
                           'list-interfaces' => 'snmp_standard::mode::listinterfaces',
                          );
 
diff --git a/network/dlink/dgs3100/snmp/plugin.pm b/network/dlink/dgs3100/snmp/plugin.pm
index 610408605..cc4836f62 100644
--- a/network/dlink/dgs3100/snmp/plugin.pm
+++ b/network/dlink/dgs3100/snmp/plugin.pm
@@ -34,8 +34,8 @@ sub new {
     %{$self->{modes}} = (
                          'cpu'              => 'network::dlink::dgs3100::snmp::mode::cpu',
                          'hardware'         => 'network::dlink::dgs3100::snmp::mode::hardware',
+                         'interfaces'       => 'snmp_standard::mode::interfaces',
                          'list-interfaces'  => 'snmp_standard::mode::listinterfaces',
-                         'traffic'          => 'snmp_standard::mode::traffic',
                          );
 
     return $self;
diff --git a/network/dlink/standard/snmp/plugin.pm b/network/dlink/standard/snmp/plugin.pm
index 5d1dae640..ade75917d 100644
--- a/network/dlink/standard/snmp/plugin.pm
+++ b/network/dlink/standard/snmp/plugin.pm
@@ -34,8 +34,8 @@ sub new {
     %{$self->{modes}} = (
                          'cpu'              => 'network::dlink::standard::snmp::mode::cpu',
                          'hardware'         => 'network::dlink::standard::snmp::mode::hardware',
+                         'interfaces'       => 'snmp_standard::mode::interfaces',
                          'list-interfaces'  => 'snmp_standard::mode::listinterfaces',
-                         'traffic'          => 'snmp_standard::mode::traffic',
                          );
 
     return $self;
diff --git a/network/extreme/snmp/plugin.pm b/network/extreme/snmp/plugin.pm
index 90f84e6a2..4c2441ef5 100644
--- a/network/extreme/snmp/plugin.pm
+++ b/network/extreme/snmp/plugin.pm
@@ -34,10 +34,10 @@ sub new {
     %{$self->{modes}} = (
                          'cpu'              => 'network::extreme::snmp::mode::cpu',
                          'hardware'         => 'network::extreme::snmp::mode::hardware',
+                         'interfaces'       => 'snmp_standard::mode::interfaces',
                          'list-interfaces'  => 'snmp_standard::mode::listinterfaces',
                          'memory'           => 'network::extreme::snmp::mode::memory',
                          'stack'            => 'network::extreme::snmp::mode::stack',
-                         'traffic'          => 'snmp_standard::mode::traffic',
                          );
 
     return $self;
diff --git a/network/fortinet/fortigate/plugin.pm b/network/fortinet/fortigate/plugin.pm
index 907b04635..ec7970c82 100644
--- a/network/fortinet/fortigate/plugin.pm
+++ b/network/fortinet/fortigate/plugin.pm
@@ -36,11 +36,11 @@ sub new {
                          'cpu'                  => 'centreon::common::fortinet::fortigate::mode::cpu',
                          'disk'                 => 'centreon::common::fortinet::fortigate::mode::disk',
                          'hardware'             => 'centreon::common::fortinet::fortigate::mode::hardware',
+                         'interfaces'           => 'snmp_standard::mode::interfaces', 
                          'ips-stats'            => 'centreon::common::fortinet::fortigate::mode::ipsstats',
                          'list-virtualdomains'  => 'centreon::common::fortinet::fortigate::mode::listvirtualdomains',
                          'memory'               => 'centreon::common::fortinet::fortigate::mode::memory',
                          'sessions'             => 'centreon::common::fortinet::fortigate::mode::sessions',
-                         'traffic'              => 'snmp_standard::mode::traffic',
                          'virus'                => 'centreon::common::fortinet::fortigate::mode::virus',
                          );
 
diff --git a/network/h3c/snmp/plugin.pm b/network/h3c/snmp/plugin.pm
index b6d4f67ed..9c9fcd65b 100644
--- a/network/h3c/snmp/plugin.pm
+++ b/network/h3c/snmp/plugin.pm
@@ -34,9 +34,9 @@ sub new {
     %{$self->{modes}} = (
                          'cpu'              => 'network::h3c::snmp::mode::cpu',
                          'hardware'         => 'network::h3c::snmp::mode::hardware',
+                         'interfaces'       => 'snmp_standard::mode::interfaces', 
                          'list-interfaces'  => 'snmp_standard::mode::listinterfaces',
                          'memory'           => 'network::h3c::snmp::mode::memory',
-                         'traffic'          => 'snmp_standard::mode::traffic',
                          );
 
     return $self;
diff --git a/network/hirschmann/standard/snmp/plugin.pm b/network/hirschmann/standard/snmp/plugin.pm
index 0289a32d1..6a35b8220 100644
--- a/network/hirschmann/standard/snmp/plugin.pm
+++ b/network/hirschmann/standard/snmp/plugin.pm
@@ -34,10 +34,10 @@ sub new {
     %{$self->{modes}} = (
                          'cpu'              => 'network::hirschmann::standard::snmp::mode::cpu',
                          'hardware'         => 'network::hirschmann::standard::snmp::mode::hardware',
+                         'interfaces'       => 'snmp_standard::mode::interfaces',
                          'list-interfaces'  => 'snmp_standard::mode::listinterfaces',
                          'memory'           => 'network::hirschmann::standard::snmp::mode::memory',
                          'processcount'     => 'network::hirschmann::standard::snmp::mode::processcount',
-                         'traffic'          => 'snmp_standard::mode::traffic',
                          );
 
     return $self;
diff --git a/network/hp/procurve/plugin.pm b/network/hp/procurve/plugin.pm
index 5c2382b02..c8f4132eb 100644
--- a/network/hp/procurve/plugin.pm
+++ b/network/hp/procurve/plugin.pm
@@ -34,10 +34,9 @@ sub new {
     %{$self->{modes}} = (
                          'cpu'              => 'network::hp::procurve::mode::cpu',
                          'environment'      => 'network::hp::procurve::mode::environment',
-                         'memory'           => 'network::hp::procurve::mode::memory',
-                         'packet-errors'    => 'snmp_standard::mode::packeterrors',
-                         'traffic'          => 'snmp_standard::mode::traffic',
+                         'interfaces'       => 'snmp_standard::mode::interfaces',
                          'list-interfaces'  => 'snmp_standard::mode::listinterfaces',
+                         'memory'           => 'network::hp::procurve::mode::memory',
                          );
 
     return $self;
diff --git a/network/juniper/ex/plugin.pm b/network/juniper/ex/plugin.pm
index 8bc837ca4..83887f372 100644
--- a/network/juniper/ex/plugin.pm
+++ b/network/juniper/ex/plugin.pm
@@ -35,7 +35,7 @@ sub new {
                          'hardware'             => 'network::juniper::common::junos::mode::hardware',
                          'cpu-routing'          => 'network::juniper::common::junos::mode::cpurouting', # routing engine
                          'memory-routing'       => 'network::juniper::common::junos::mode::memoryrouting', # routing engine
-                         'traffic'              => 'snmp_standard::mode::traffic',
+                         'interfaces'           => 'snmp_standard::mode::interfaces', 
                          'list-interfaces'      => 'snmp_standard::mode::listinterfaces',
                          'list-storages'        => 'snmp_standard::mode::liststorages',
                          'storage'              => 'snmp_standard::mode::storage',
diff --git a/network/juniper/mag/plugin.pm b/network/juniper/mag/plugin.pm
index 8a853423a..afefe878e 100644
--- a/network/juniper/mag/plugin.pm
+++ b/network/juniper/mag/plugin.pm
@@ -34,11 +34,12 @@ sub new {
     %{$self->{modes}} = (
                          'cpu'                  => 'network::juniper::common::ive::mode::cpu',
                          'disk'                 => 'network::juniper::common::ive::mode::disk',
+                         'interfaces'           => 'snmp_standard::mode::interfaces',
+                         'list-interfaces'      => 'snmp_standard::mode::listinterfaces',
                          'logfile'              => 'network::juniper::common::ive::mode::logfile',
                          'users'                => 'network::juniper::common::ive::mode::users',
                          'memory'               => 'snmp_standard::mode::memory',
                          'swap'                 => 'snmp_standard::mode::swap',
-                         'traffic'              => 'snmp_standard::mode::traffic',
                          'blade-temperature'    => 'network::juniper::mag::mode::bladetemperature',
                          );
 
diff --git a/network/juniper/mseries/plugin.pm b/network/juniper/mseries/plugin.pm
index ab4ee4035..a45395f36 100644
--- a/network/juniper/mseries/plugin.pm
+++ b/network/juniper/mseries/plugin.pm
@@ -35,7 +35,7 @@ sub new {
                          'hardware'             => 'network::juniper::common::junos::mode::hardware',
                          'cpu-routing'          => 'network::juniper::common::junos::mode::cpurouting', # routing engine
                          'memory-routing'       => 'network::juniper::common::junos::mode::memoryrouting', # routing engine
-                         'traffic'              => 'snmp_standard::mode::traffic',
+                         'interfaces'           => 'snmp_standard::mode::interfaces', 
                          'list-interfaces'      => 'snmp_standard::mode::listinterfaces',
                          'list-storages'        => 'snmp_standard::mode::liststorages',
                          'storage'              => 'snmp_standard::mode::storage',
diff --git a/network/juniper/sa/plugin.pm b/network/juniper/sa/plugin.pm
index cd2ece925..5cbd1cb6b 100644
--- a/network/juniper/sa/plugin.pm
+++ b/network/juniper/sa/plugin.pm
@@ -37,9 +37,10 @@ sub new {
                          'disk'                 => 'network::juniper::common::ive::mode::disk',
                          'logfile'              => 'network::juniper::common::ive::mode::logfile',
                          'users'                => 'network::juniper::common::ive::mode::users',
+                         'interfaces'           => 'snmp_standard::mode::interfaces',
+                         'list-interfaces'      => 'snmp_standard::mode::listinterfaces',
                          'memory'               => 'snmp_standard::mode::memory',
                          'swap'                 => 'snmp_standard::mode::swap',
-                         'traffic'              => 'snmp_standard::mode::traffic',
                          );
 
     return $self;
diff --git a/network/juniper/srx/plugin.pm b/network/juniper/srx/plugin.pm
index ebb37b9bf..4b6eb3b09 100644
--- a/network/juniper/srx/plugin.pm
+++ b/network/juniper/srx/plugin.pm
@@ -39,7 +39,7 @@ sub new {
                          'memory-forwarding'    => 'network::juniper::common::junos::mode::memoryforwarding', # packet forwarding engine
                          'cp-sessions'          => 'network::juniper::common::junos::mode::cpsessions', # CP = 'central point'
                          'flow-sessions'        => 'network::juniper::common::junos::mode::flowsessions',
-                         'traffic'              => 'snmp_standard::mode::traffic',
+                         'interfaces'           => 'snmp_standard::mode::interfaces', 
                          'list-interfaces'      => 'snmp_standard::mode::listinterfaces',
                          'list-storages'        => 'snmp_standard::mode::liststorages',
                          'storage'              => 'snmp_standard::mode::storage',
diff --git a/network/juniper/ssg/plugin.pm b/network/juniper/ssg/plugin.pm
index f95d2104c..bd4f9f759 100644
--- a/network/juniper/ssg/plugin.pm
+++ b/network/juniper/ssg/plugin.pm
@@ -32,12 +32,12 @@ sub new {
 
     $self->{version} = '1.0';
     %{$self->{modes}} = (
-			 'cpu'			=> 'network::juniper::common::screenos::mode::cpu',
-			 'memory'		=> 'network::juniper::common::screenos::mode::memory',
-			 'sessions'		=> 'network::juniper::common::screenos::mode::sessions',
-			 'hardware'		=> 'network::juniper::common::screenos::mode::hardware',
-                         'traffic'              => 'snmp_standard::mode::traffic',
-                         'list-interfaces'      => 'snmp_standard::mode::listinterfaces',
+                        'cpu'               => 'network::juniper::common::screenos::mode::cpu',
+                        'memory'            => 'network::juniper::common::screenos::mode::memory',
+                        'sessions'          => 'network::juniper::common::screenos::mode::sessions',
+                        'hardware'          => 'network::juniper::common::screenos::mode::hardware',
+                        'interfaces'        => 'snmp_standard::mode::interfaces', 
+                        'list-interfaces'   => 'snmp_standard::mode::listinterfaces',
                          );
 
     return $self;
diff --git a/network/netasq/snmp/plugin.pm b/network/netasq/snmp/plugin.pm
index eba8bf06f..e79cbd440 100644
--- a/network/netasq/snmp/plugin.pm
+++ b/network/netasq/snmp/plugin.pm
@@ -34,12 +34,13 @@ sub new {
     %{$self->{modes}} = (
                          'cpu'                  => 'snmp_standard::mode::cpu',
                          'cpu-detailed'         => 'snmp_standard::mode::cpudetailed',
+                         'interfaces'           => 'snmp_standard::mode::interfaces',
+                         'list-interfaces'      => 'snmp_standard::mode::listinterfaces',
                          'load'                 => 'snmp_standard::mode::loadaverage',
                          'ha-status'            => 'network::netasq::snmp::mode::hastatus',
                          'memory'               => 'snmp_standard::mode::memory',
                          'storage'              => 'snmp_standard::mode::storage',
                          'swap'                 => 'snmp_standard::mode::swap',
-                         'traffic'              => 'snmp_standard::mode::traffic',
                          'vpn-status'           => 'network::netasq::snmp::mode::vpnstatus',
                          );
 
diff --git a/network/oneaccess/snmp/plugin.pm b/network/oneaccess/snmp/plugin.pm
index 944ce698a..23d0a2ee5 100644
--- a/network/oneaccess/snmp/plugin.pm
+++ b/network/oneaccess/snmp/plugin.pm
@@ -33,9 +33,9 @@ sub new {
     $self->{version} = '0.5';
     %{$self->{modes}} = (
                         'cpu'               => 'network::oneaccess::snmp::mode::cpu',
+                        'interfaces'        => 'snmp_standard::mode::interfaces', 
                         'list-interfaces'   => 'snmp_standard::mode::listinterfaces',
                         'memory'            => 'network::oneaccess::snmp::mode::memory',
-                        'traffic'           => 'snmp_standard::mode::traffic',
                         );
 
     return $self;
diff --git a/network/paloalto/snmp/plugin.pm b/network/paloalto/snmp/plugin.pm
index 1b763c8bd..9b0365d2d 100644
--- a/network/paloalto/snmp/plugin.pm
+++ b/network/paloalto/snmp/plugin.pm
@@ -34,10 +34,9 @@ sub new {
     %{$self->{modes}} = (
                         'cluster-status'    => 'network::paloalto::snmp::mode::clusterstatus',
                         'cpu'               => 'snmp_standard::mode::cpu',
-                        'traffic'           => 'snmp_standard::mode::traffic',
+                        'interfaces'        => 'snmp_standard::mode::interfaces', 
                         'list-interfaces'   => 'snmp_standard::mode::listinterfaces',
                         'hardware'          => 'snmp_standard::mode::hardwaredevice',
-                        'packet-errors'     => 'snmp_standard::mode::packeterrors',
                         'panorama'          => 'network::paloalto::snmp::mode::panorama',
                         'sessions'          => 'network::paloalto::snmp::mode::sessions',
                          );
diff --git a/network/redback/snmp/plugin.pm b/network/redback/snmp/plugin.pm
index d15189f09..bde6e4636 100644
--- a/network/redback/snmp/plugin.pm
+++ b/network/redback/snmp/plugin.pm
@@ -35,10 +35,9 @@ sub new {
                          'cpu'              => 'network::redback::snmp::mode::cpu',
                          'disk-usage'       => 'network::redback::snmp::mode::disk',
                          'hardware'         => 'network::redback::snmp::mode::hardware',
+                         'interfaces'       => 'snmp_standard::mode::interfaces',
                          'list-interfaces'  => 'snmp_standard::mode::listinterfaces',
                          'memory'           => 'network::redback::snmp::mode::memory',
-                         'packet-errors'    => 'snmp_standard::mode::packeterrors',
-                         'traffic'          => 'snmp_standard::mode::traffic',
                          );
 
     return $self;
diff --git a/network/ruggedcom/plugin.pm b/network/ruggedcom/plugin.pm
index 8c2395e6b..d387ef2d4 100644
--- a/network/ruggedcom/plugin.pm
+++ b/network/ruggedcom/plugin.pm
@@ -34,9 +34,9 @@ sub new {
     %{$self->{modes}} = (
                          'errors'               => 'network::ruggedcom::mode::errors',
                          'hardware'             => 'network::ruggedcom::mode::hardware',
+                         'interfaces'           => 'snmp_standard::mode::interfaces', 
                          'memory'               => 'network::ruggedcom::mode::memory',
                          'temperature'          => 'network::ruggedcom::mode::temperature',
-                         'traffic'              => 'snmp_standard::mode::traffic',
                          'list-interfaces'      => 'snmp_standard::mode::listinterfaces',
                          );
 
diff --git a/network/stonesoft/snmp/plugin.pm b/network/stonesoft/snmp/plugin.pm
index 9b52e9092..7a1458a7f 100644
--- a/network/stonesoft/snmp/plugin.pm
+++ b/network/stonesoft/snmp/plugin.pm
@@ -35,12 +35,12 @@ sub new {
                          'memory'               => 'network::stonesoft::snmp::mode::memory',
                          'cpu'                  => 'network::stonesoft::snmp::mode::cpu',
                          'connections'          => 'network::stonesoft::snmp::mode::connections',
+                         'interfaces'           => 'snmp_standard::mode::interfaces', 
                          'storage'              => 'network::stonesoft::snmp::mode::storage',
                          'cluster-state'        => 'network::stonesoft::snmp::mode::clusterstate',
                          'cluster-load'         => 'network::stonesoft::snmp::mode::clusterload',
                          'rejected-packets'     => 'network::stonesoft::snmp::mode::rejectedpackets',
                          'dropped-packets'      => 'network::stonesoft::snmp::mode::droppedpackets',
-                         'traffic'              => 'snmp_standard::mode::traffic',
                          'list-interfaces'      => 'snmp_standard::mode::listinterfaces',
                          );
 
diff --git a/os/aix/snmp/plugin.pm b/os/aix/snmp/plugin.pm
index 8075e3a52..a1895b17d 100644
--- a/os/aix/snmp/plugin.pm
+++ b/os/aix/snmp/plugin.pm
@@ -33,12 +33,12 @@ sub new {
     $self->{version} = '0.1';
     %{$self->{modes}} = (
                          'cpu'              => 'snmp_standard::mode::cpu',
+                         'interfaces'       => 'snmp_standard::mode::interfaces',
                          'list-interfaces'  => 'snmp_standard::mode::listinterfaces',
                          'list-storages'    => 'snmp_standard::mode::liststorages',
                          'processcount'     => 'snmp_standard::mode::processcount',
                          'storage'          => 'snmp_standard::mode::storage',
                          'swap'             => 'os::aix::snmp::mode::swap',
-                         'traffic'          => 'snmp_standard::mode::traffic',
                          );
 
     return $self;
diff --git a/os/freebsd/snmp/plugin.pm b/os/freebsd/snmp/plugin.pm
index a3d57c874..1ec8e033d 100644
--- a/os/freebsd/snmp/plugin.pm
+++ b/os/freebsd/snmp/plugin.pm
@@ -37,17 +37,16 @@ sub new {
                          'diskio'           => 'snmp_standard::mode::diskio',
                          'disk-usage'       => 'snmp_standard::mode::diskusage',
                          'inodes'           => 'snmp_standard::mode::inodes',
+                         'interfaces'       => 'snmp_standard::mode::interfaces',
                          'load'             => 'snmp_standard::mode::loadaverage',
                          'list-diskspath'   => 'snmp_standard::mode::listdiskspath',
                          'list-interfaces'  => 'snmp_standard::mode::listinterfaces',
                          'list-storages'    => 'snmp_standard::mode::liststorages',
                          'memory'           => 'snmp_standard::mode::memory',
-                         'packet-errors'    => 'snmp_standard::mode::packeterrors',
                          'processcount'     => 'snmp_standard::mode::processcount',
                          'storage'          => 'snmp_standard::mode::storage',
                          'swap'             => 'snmp_standard::mode::swap',
                          'tcpcon'           => 'snmp_standard::mode::tcpcon',
-                         'traffic'          => 'snmp_standard::mode::traffic',
                          'uptime'           => 'snmp_standard::mode::uptime',
                          );
 
diff --git a/os/linux/snmp/plugin.pm b/os/linux/snmp/plugin.pm
index dbe3b8fb0..14d619403 100644
--- a/os/linux/snmp/plugin.pm
+++ b/os/linux/snmp/plugin.pm
@@ -43,13 +43,11 @@ sub new {
                          'list-interfaces'  => 'snmp_standard::mode::listinterfaces',
                          'list-storages'    => 'snmp_standard::mode::liststorages',
                          'memory'           => 'snmp_standard::mode::memory',
-                         'packet-errors'    => 'snmp_standard::mode::packeterrors',
                          'processcount'     => 'snmp_standard::mode::processcount',
                          'storage'          => 'snmp_standard::mode::storage',
                          'swap'             => 'snmp_standard::mode::swap',
                          'time'             => 'snmp_standard::mode::ntp',
                          'tcpcon'           => 'snmp_standard::mode::tcpcon',
-                         'traffic'          => 'snmp_standard::mode::traffic',
                          'uptime'           => 'snmp_standard::mode::uptime',
                          );
 
diff --git a/os/solaris/snmp/plugin.pm b/os/solaris/snmp/plugin.pm
index cd82800b9..b01ba6b1c 100644
--- a/os/solaris/snmp/plugin.pm
+++ b/os/solaris/snmp/plugin.pm
@@ -34,13 +34,12 @@ sub new {
     %{$self->{modes}} = (
                          'cpu-detailed'     => 'snmp_standard::mode::cpudetailed',
                          'load'             => 'snmp_standard::mode::loadaverage',
+                         'interfaces'       => 'snmp_standard::mode::interfaces',
                          'list-interfaces'  => 'snmp_standard::mode::listinterfaces',
                          'list-storages'    => 'snmp_standard::mode::liststorages',
-                         'packet-errors'    => 'snmp_standard::mode::packeterrors',
                          'processcount'     => 'snmp_standard::mode::processcount',
                          'storage'          => 'snmp_standard::mode::storage',
                          'tcpcon'           => 'snmp_standard::mode::tcpcon',
-                         'traffic'          => 'snmp_standard::mode::traffic',
                          'uptime'           => 'snmp_standard::mode::uptime',
                          );
 
diff --git a/os/windows/snmp/plugin.pm b/os/windows/snmp/plugin.pm
index 1147560ce..820182370 100644
--- a/os/windows/snmp/plugin.pm
+++ b/os/windows/snmp/plugin.pm
@@ -32,18 +32,16 @@ sub new {
 
     $self->{version} = '0.1';
     %{$self->{modes}} = (
-                         'anycast'          => 'snmp_standard::mode::anycast',
                          'cpu'              => 'snmp_standard::mode::cpu',
+                         'interfaces'       => 'snmp_standard::mode::interfaces',
                          'list-interfaces'  => 'snmp_standard::mode::listinterfaces',
                          'list-storages'    => 'snmp_standard::mode::liststorages',
                          'memory'           => 'os::windows::snmp::mode::memory',
-                         'packet-errors'    => 'snmp_standard::mode::packeterrors',
                          'processcount'     => 'snmp_standard::mode::processcount',
                          'service'          => 'os::windows::snmp::mode::service',
                          'storage'          => 'snmp_standard::mode::storage',
                          'swap'             => 'os::windows::snmp::mode::swap',
                          'time'             => 'snmp_standard::mode::ntp',
-                         'traffic'          => 'snmp_standard::mode::traffic',
                          'uptime'           => 'snmp_standard::mode::uptime',
                          );
 
diff --git a/storage/dell/equallogic/snmp/plugin.pm b/storage/dell/equallogic/snmp/plugin.pm
index bb9deadbe..ee4b3ee21 100644
--- a/storage/dell/equallogic/snmp/plugin.pm
+++ b/storage/dell/equallogic/snmp/plugin.pm
@@ -35,9 +35,9 @@ sub new {
                          'array-stats'      => 'storage::dell::equallogic::snmp::mode::arraystats',
                          'disk-usage'       => 'storage::dell::equallogic::snmp::mode::diskusage',
                          'hardware'         => 'storage::dell::equallogic::snmp::mode::hardware',
+                         'interfaces'       => 'snmp_standard::mode::interfaces',
                          'list-interfaces'  => 'snmp_standard::mode::listinterfaces',
                          'pool-usage'       => 'storage::dell::equallogic::snmp::mode::poolusage',
-                         'traffic'          => 'snmp_standard::mode::traffic',
                          );
 
     return $self;
diff --git a/storage/hp/msa2000/snmp/plugin.pm b/storage/hp/msa2000/snmp/plugin.pm
index f98d05602..ab9ae08f9 100644
--- a/storage/hp/msa2000/snmp/plugin.pm
+++ b/storage/hp/msa2000/snmp/plugin.pm
@@ -33,8 +33,8 @@ sub new {
     $self->{version} = '1.0';
     %{$self->{modes}} = (
                          'hardware'         => 'snmp_standard::mode::hardwarefibrealliance',
+                         'interfaces'       => 'snmp_standard::mode::interfaces',
                          'list-interfaces'  => 'snmp_standard::mode::listinterfaces',
-                         'traffic'          => 'snmp_standard::mode::traffic',
                          );
 
     return $self;
diff --git a/storage/panzura/snmp/plugin.pm b/storage/panzura/snmp/plugin.pm
index b6f26887a..849b66464 100644
--- a/storage/panzura/snmp/plugin.pm
+++ b/storage/panzura/snmp/plugin.pm
@@ -38,14 +38,13 @@ sub new {
                          'disk-usage-cloud' => 'snmp_standard::mode::diskusage',
                          'disk-usage-local' => 'storage::panzura::snmp::mode::diskusagelocal',
                          'load'             => 'snmp_standard::mode::loadaverage',
+                         'interfaces'       => 'snmp_standard::mode::interfaces',
                          'list-diskspath'   => 'snmp_standard::mode::listdiskspath',
                          'list-interfaces'  => 'snmp_standard::mode::listinterfaces',
                          'list-storages'    => 'snmp_standard::mode::liststorages',
                          'memory'           => 'storage::panzura::snmp::mode::memory',
-                         'packet-errors'    => 'snmp_standard::mode::packeterrors',
                          'ratios'           => 'storage::panzura::snmp::mode::ratios',
                          'swap'             => 'snmp_standard::mode::swap',
-                         'traffic'          => 'snmp_standard::mode::traffic',
                          );
 
     return $self;
diff --git a/storage/qnap/snmp/plugin.pm b/storage/qnap/snmp/plugin.pm
index 723215274..47d4bc1e6 100644
--- a/storage/qnap/snmp/plugin.pm
+++ b/storage/qnap/snmp/plugin.pm
@@ -34,11 +34,11 @@ sub new {
     %{$self->{modes}} = (
                          'cpu'              => 'snmp_standard::mode::cpu',
                          'hardware'         => 'storage::qnap::snmp::mode::hardware',
+                         'interfaces'       => 'snmp_standard::mode::interfaces',
                          'list-interfaces'  => 'snmp_standard::mode::listinterfaces',
                          'list-storages'    => 'snmp_standard::mode::liststorages',
                          'memory'           => 'storage::qnap::snmp::mode::memory',
                          'storage'          => 'snmp_standard::mode::storage',
-                         'traffic'          => 'snmp_standard::mode::traffic',
                          'volume-usage'     => 'storage::qnap::snmp::mode::volumeusage',
                          );
 
diff --git a/storage/synology/snmp/plugin.pm b/storage/synology/snmp/plugin.pm
index ad88ddcf8..dc118f5c5 100644
--- a/storage/synology/snmp/plugin.pm
+++ b/storage/synology/snmp/plugin.pm
@@ -35,8 +35,8 @@ sub new {
                          'components'           => 'storage::synology::snmp::mode::components',
                          'temperature'          => 'storage::synology::snmp::mode::temperature',
                          'ups'                  => 'storage::synology::snmp::mode::ups',
-                         'traffic'              => 'snmp_standard::mode::traffic',
                          'cpu'                  => 'snmp_standard::mode::cpu',
+                         'interfaces'           => 'snmp_standard::mode::interfaces',
                          'memory'               => 'snmp_standard::mode::memory',
                          'load'                 => 'snmp_standard::mode::loadaverage',
                          'storage'              => 'snmp_standard::mode::storage',