diff --git a/ChangeLog b/ChangeLog
index 5f5a856a..a2af3ec2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 SNMP::Info - Friendly OO-style interface to Network devices using SNMP.
 
-version 3.16
+version 3.16 (2014-06-23)
 
    [ENHANCEMENTS]
 
diff --git a/Info.pm b/Info.pm
index 8f7e879f..6fe67e4d 100644
--- a/Info.pm
+++ b/Info.pm
@@ -24,7 +24,7 @@ use vars
     qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG %SPEED_MAP
     $NOSUCH $BIGINT $REPEATERS/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 =head1 NAME
 
@@ -32,7 +32,7 @@ SNMP::Info - OO Interface to Network devices and MIBs through SNMP
 
 =head1 VERSION
 
-SNMP::Info - Version 3.15
+SNMP::Info - Version 3.16
 
 =head1 AUTHOR
 
diff --git a/Info/AMAP.pm b/Info/AMAP.pm
index a66dc2fc..d834b55e 100644
--- a/Info/AMAP.pm
+++ b/Info/AMAP.pm
@@ -38,7 +38,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS
     = ( 'ALCATEL-IND1-INTERSWITCH-PROTOCOL-MIB' => 'aipAMAPRemDeviceType', );
diff --git a/Info/AdslLine.pm b/Info/AdslLine.pm
index c11fa820..8996f0f6 100644
--- a/Info/AdslLine.pm
+++ b/Info/AdslLine.pm
@@ -38,7 +38,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = ( 'ADSL-LINE-MIB' => 'adslLineType' );
 
diff --git a/Info/Aggregate.pm b/Info/Aggregate.pm
index ef530839..784b034a 100644
--- a/Info/Aggregate.pm
+++ b/Info/Aggregate.pm
@@ -38,7 +38,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (); # IF-MIB
 
diff --git a/Info/Airespace.pm b/Info/Airespace.pm
index 97b35d83..6bdb3e5c 100644
--- a/Info/Airespace.pm
+++ b/Info/Airespace.pm
@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::MIBS,
diff --git a/Info/Bridge.pm b/Info/Bridge.pm
index af053b69..d9a3db5f 100644
--- a/Info/Bridge.pm
+++ b/Info/Bridge.pm
@@ -42,7 +42,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE $INIT/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     'BRIDGE-MIB'   => 'dot1dBaseBridgeAddress',
diff --git a/Info/CDP.pm b/Info/CDP.pm
index 9a1e54d5..9601bb4f 100644
--- a/Info/CDP.pm
+++ b/Info/CDP.pm
@@ -43,7 +43,7 @@ use SNMP::Info;
 use vars
     qw/$VERSION $DEBUG %FUNCS %GLOBALS %MIBS %MUNGE $INIT %CDP_CAPABILITIES/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 # Five data structures required by SNMP::Info
 %MIBS = ( 'CISCO-CDP-MIB' => 'cdpGlobalRun' );
diff --git a/Info/CiscoAgg.pm b/Info/CiscoAgg.pm
index b70ab873..003b7b4b 100644
--- a/Info/CiscoAgg.pm
+++ b/Info/CiscoAgg.pm
@@ -43,7 +43,7 @@ use SNMP::Info::IEEE802dot3ad 'agg_ports_lag';
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
   %SNMP::Info::IEEE802dot3ad::MIBS,
diff --git a/Info/CiscoConfig.pm b/Info/CiscoConfig.pm
index 365cc6c9..854aa9f1 100644
--- a/Info/CiscoConfig.pm
+++ b/Info/CiscoConfig.pm
@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     'CISCO-CONFIG-COPY-MIB' => 'ccCopyTable',
diff --git a/Info/CiscoPortSecurity.pm b/Info/CiscoPortSecurity.pm
index cf9c1b07..5616ca5e 100644
--- a/Info/CiscoPortSecurity.pm
+++ b/Info/CiscoPortSecurity.pm
@@ -38,7 +38,7 @@ use Exporter;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE %PAECAPABILITIES/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     'CISCO-PORT-SECURITY-MIB' => 'ciscoPortSecurityMIB',
diff --git a/Info/CiscoPower.pm b/Info/CiscoPower.pm
index f417a8ca..db400ab8 100644
--- a/Info/CiscoPower.pm
+++ b/Info/CiscoPower.pm
@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = ( 'CISCO-POWER-ETHERNET-EXT-MIB' => 'cpeExtPsePortEntPhyIndex',
           'CISCO-CDP-MIB' => 'cdpCachePowerConsumption' );
diff --git a/Info/CiscoQOS.pm b/Info/CiscoQOS.pm
index fcffa6e9..a6da42f5 100644
--- a/Info/CiscoQOS.pm
+++ b/Info/CiscoQOS.pm
@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = ( 'CISCO-CLASS-BASED-QOS-MIB' => 'cbQosIfIndex', );
 
diff --git a/Info/CiscoRTT.pm b/Info/CiscoRTT.pm
index 81bb88fc..7542d73b 100644
--- a/Info/CiscoRTT.pm
+++ b/Info/CiscoRTT.pm
@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = ( 'CISCO-RTTMON-MIB' => 'rttMonCtrlAdminOwner', );
 
diff --git a/Info/CiscoStack.pm b/Info/CiscoStack.pm
index 4763941e..64b02158 100644
--- a/Info/CiscoStack.pm
+++ b/Info/CiscoStack.pm
@@ -38,7 +38,7 @@ use Exporter;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE %PORTSTAT/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = ( 'CISCO-STACK-MIB' => 'ciscoStackMIB', );
 
diff --git a/Info/CiscoStats.pm b/Info/CiscoStats.pm
index 39a2ff04..5fe10917 100644
--- a/Info/CiscoStats.pm
+++ b/Info/CiscoStats.pm
@@ -42,7 +42,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     'SNMPv2-MIB'            => 'sysDescr',
diff --git a/Info/CiscoStpExtensions.pm b/Info/CiscoStpExtensions.pm
index 7bb1aa43..810db558 100644
--- a/Info/CiscoStpExtensions.pm
+++ b/Info/CiscoStpExtensions.pm
@@ -36,7 +36,7 @@ use SNMP::Info::Bridge;
 
 use vars qw/$VERSION $DEBUG %MIBS %FUNCS %GLOBALS %MUNGE %PORTSTAT $INIT/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 @SNMP::Info::CiscoStpExtensions::ISA = qw/SNMP::Info::Bridge SNMP::Info Exporter/;
 @SNMP::Info::CiscoStpExtensions::EXPORT_OK = qw//;
diff --git a/Info/CiscoVTP.pm b/Info/CiscoVTP.pm
index 6e829e19..a3966dfe 100644
--- a/Info/CiscoVTP.pm
+++ b/Info/CiscoVTP.pm
@@ -41,7 +41,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     'CISCO-VTP-MIB'                       => 'vtpVlanName',
diff --git a/Info/EDP.pm b/Info/EDP.pm
index 1094e820..2927386c 100644
--- a/Info/EDP.pm
+++ b/Info/EDP.pm
@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     'EXTREME-EDP-MIB'   => 'extremeEdpPortIfIndex',
diff --git a/Info/Entity.pm b/Info/Entity.pm
index 357f58c9..c6b367d0 100644
--- a/Info/Entity.pm
+++ b/Info/Entity.pm
@@ -41,7 +41,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = ( 'ENTITY-MIB' => 'entPhysicalSerialNum' );
 
diff --git a/Info/EtherLike.pm b/Info/EtherLike.pm
index 6597348c..7de65075 100644
--- a/Info/EtherLike.pm
+++ b/Info/EtherLike.pm
@@ -41,7 +41,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = ( 'EtherLike-MIB' => 'etherMIB' );
 
diff --git a/Info/FDP.pm b/Info/FDP.pm
index 758032cc..70187f9e 100644
--- a/Info/FDP.pm
+++ b/Info/FDP.pm
@@ -42,7 +42,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = ( 'FOUNDRY-SN-SWITCH-GROUP-MIB' => 'snFdpGlobalRun' );
 
diff --git a/Info/IEEE802dot11.pm b/Info/IEEE802dot11.pm
index 0b4a993c..bfbe431d 100644
--- a/Info/IEEE802dot11.pm
+++ b/Info/IEEE802dot11.pm
@@ -38,7 +38,7 @@ use Exporter;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = ( 'IEEE802dot11-MIB' => 'dot11DesiredSSID', );
 
diff --git a/Info/IEEE802dot3ad.pm b/Info/IEEE802dot3ad.pm
index aa8e4d80..715e6e9a 100644
--- a/Info/IEEE802dot3ad.pm
+++ b/Info/IEEE802dot3ad.pm
@@ -43,7 +43,7 @@ use SNMP::Info::Aggregate;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
   %SNMP::Info::Aggregate::MIBS,
diff --git a/Info/IPv6.pm b/Info/IPv6.pm
index 69b7a2bc..2e2bcb46 100644
--- a/Info/IPv6.pm
+++ b/Info/IPv6.pm
@@ -44,7 +44,7 @@ use constant {
     IPV6MIB => 3,
 };
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 
 
diff --git a/Info/LLDP.pm b/Info/LLDP.pm
index 493ec12f..726fd3fb 100644
--- a/Info/LLDP.pm
+++ b/Info/LLDP.pm
@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     'LLDP-MIB'          => 'lldpLocSysCapEnabled',
diff --git a/Info/Layer1.pm b/Info/Layer1.pm
index fa10b72d..ca4c2d60 100644
--- a/Info/Layer1.pm
+++ b/Info/Layer1.pm
@@ -41,7 +41,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = ( %SNMP::Info::MIBS, 'SNMP-REPEATER-MIB' => 'rptrPortGroupIndex' );
 
diff --git a/Info/Layer1/Allied.pm b/Info/Layer1/Allied.pm
index 179d06a0..9838b483 100644
--- a/Info/Layer1/Allied.pm
+++ b/Info/Layer1/Allied.pm
@@ -41,7 +41,7 @@ use SNMP::Info::Layer1;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 # Set for No CDP
 %GLOBALS = ( %SNMP::Info::Layer1::GLOBALS, 'root_ip' => 'actualIPAddr', );
diff --git a/Info/Layer1/Asante.pm b/Info/Layer1/Asante.pm
index 2d015ac3..6ab25d1c 100644
--- a/Info/Layer1/Asante.pm
+++ b/Info/Layer1/Asante.pm
@@ -41,7 +41,7 @@ use SNMP::Info::Layer1;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 # Set for No CDP
 %GLOBALS = ( %SNMP::Info::Layer1::GLOBALS, );
diff --git a/Info/Layer1/Bayhub.pm b/Info/Layer1/Bayhub.pm
index 14b5a019..cfdf0b41 100644
--- a/Info/Layer1/Bayhub.pm
+++ b/Info/Layer1/Bayhub.pm
@@ -42,7 +42,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,
diff --git a/Info/Layer1/Cyclades.pm b/Info/Layer1/Cyclades.pm
index dc980ce3..4c9cbe90 100644
--- a/Info/Layer1/Cyclades.pm
+++ b/Info/Layer1/Cyclades.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer1;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer1::MIBS,
diff --git a/Info/Layer1/S3000.pm b/Info/Layer1/S3000.pm
index 5cbe69fc..bbe7f72a 100644
--- a/Info/Layer1/S3000.pm
+++ b/Info/Layer1/S3000.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,
diff --git a/Info/Layer2.pm b/Info/Layer2.pm
index 143866a8..b92a9b31 100644
--- a/Info/Layer2.pm
+++ b/Info/Layer2.pm
@@ -45,7 +45,7 @@ use SNMP::Info::PowerEthernet;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::MIBS,         %SNMP::Info::Bridge::MIBS,
diff --git a/Info/Layer2/Airespace.pm b/Info/Layer2/Airespace.pm
index 7a70f2fd..fe82bdde 100644
--- a/Info/Layer2/Airespace.pm
+++ b/Info/Layer2/Airespace.pm
@@ -40,7 +40,7 @@ use SNMP::Info::Airespace;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::MIBS,      %SNMP::Info::Bridge::MIBS,
diff --git a/Info/Layer2/Aironet.pm b/Info/Layer2/Aironet.pm
index f8f9aacd..cf02219f 100644
--- a/Info/Layer2/Aironet.pm
+++ b/Info/Layer2/Aironet.pm
@@ -49,7 +49,7 @@ use SNMP::Info::IEEE802dot11;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %GLOBALS = (
     %SNMP::Info::IEEE802dot11::GLOBALS,
diff --git a/Info/Layer2/Allied.pm b/Info/Layer2/Allied.pm
index e28449ec..315489b0 100644
--- a/Info/Layer2/Allied.pm
+++ b/Info/Layer2/Allied.pm
@@ -40,7 +40,7 @@ use SNMP::Info::Layer1;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %GLOBALS = ( %SNMP::Info::Layer2::GLOBALS );
 
diff --git a/Info/Layer2/Baystack.pm b/Info/Layer2/Baystack.pm
index 6f7a8c9c..25359a7c 100644
--- a/Info/Layer2/Baystack.pm
+++ b/Info/Layer2/Baystack.pm
@@ -46,7 +46,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,    %SNMP::Info::LLDP::MIBS,
diff --git a/Info/Layer2/C1900.pm b/Info/Layer2/C1900.pm
index 439802e3..d1b28203 100644
--- a/Info/Layer2/C1900.pm
+++ b/Info/Layer2/C1900.pm
@@ -48,7 +48,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %GLOBALS = (
     %SNMP::Info::Layer2::GLOBALS,
diff --git a/Info/Layer2/C2900.pm b/Info/Layer2/C2900.pm
index 59f257ec..234495a3 100644
--- a/Info/Layer2/C2900.pm
+++ b/Info/Layer2/C2900.pm
@@ -41,7 +41,7 @@ use SNMP::Info::Layer2::Cisco;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %GLOBALS = (
     %SNMP::Info::Layer2::Cisco::GLOBALS,
diff --git a/Info/Layer2/Catalyst.pm b/Info/Layer2/Catalyst.pm
index 521677a5..66baa269 100644
--- a/Info/Layer2/Catalyst.pm
+++ b/Info/Layer2/Catalyst.pm
@@ -42,7 +42,7 @@ use SNMP::Info::Layer2::Cisco;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer2::Cisco::MIBS,
diff --git a/Info/Layer2/Centillion.pm b/Info/Layer2/Centillion.pm
index 6498a026..78acd93e 100644
--- a/Info/Layer2/Centillion.pm
+++ b/Info/Layer2/Centillion.pm
@@ -43,7 +43,7 @@ use SNMP::Info::SONMP;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::MIBS,
diff --git a/Info/Layer2/Cisco.pm b/Info/Layer2/Cisco.pm
index c96948f9..d7277a97 100644
--- a/Info/Layer2/Cisco.pm
+++ b/Info/Layer2/Cisco.pm
@@ -52,7 +52,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,
diff --git a/Info/Layer2/CiscoSB.pm b/Info/Layer2/CiscoSB.pm
index eae266d0..9e52a06a 100644
--- a/Info/Layer2/CiscoSB.pm
+++ b/Info/Layer2/CiscoSB.pm
@@ -50,7 +50,7 @@ use SNMP::Info::CDP;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 # This will be filled in with the device's index into the EntPhysicalEntry
 # table by the serial() function.
diff --git a/Info/Layer2/HP.pm b/Info/Layer2/HP.pm
index b6e49c02..bb81ec08 100644
--- a/Info/Layer2/HP.pm
+++ b/Info/Layer2/HP.pm
@@ -52,7 +52,7 @@ use SNMP::Info::Aggregate;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MODEL_MAP %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer2/HP4000.pm b/Info/Layer2/HP4000.pm
index e1225ee8..9f162681 100644
--- a/Info/Layer2/HP4000.pm
+++ b/Info/Layer2/HP4000.pm
@@ -44,7 +44,7 @@ use SNMP::Info::CDP;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %PORTSTAT %MODEL_MAP %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer2/HPVC.pm b/Info/Layer2/HPVC.pm
index d635bc0c..418f2baf 100644
--- a/Info/Layer2/HPVC.pm
+++ b/Info/Layer2/HPVC.pm
@@ -41,7 +41,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,
diff --git a/Info/Layer2/Kentrox.pm b/Info/Layer2/Kentrox.pm
index 7464abad..700444c1 100644
--- a/Info/Layer2/Kentrox.pm
+++ b/Info/Layer2/Kentrox.pm
@@ -36,7 +36,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,
diff --git a/Info/Layer2/N2270.pm b/Info/Layer2/N2270.pm
index b0e06b04..c5e179af 100644
--- a/Info/Layer2/N2270.pm
+++ b/Info/Layer2/N2270.pm
@@ -43,7 +43,7 @@ use SNMP::Info::Airespace;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE $AUTOLOAD $INIT $DEBUG/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::MIBS,        %SNMP::Info::Bridge::MIBS,
diff --git a/Info/Layer2/NAP222x.pm b/Info/Layer2/NAP222x.pm
index 400376f7..8bb0384b 100644
--- a/Info/Layer2/NAP222x.pm
+++ b/Info/Layer2/NAP222x.pm
@@ -42,7 +42,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS, %SNMP::Info::IEEE802dot11::MIBS,
diff --git a/Info/Layer2/NWSS2300.pm b/Info/Layer2/NWSS2300.pm
index af34b37a..dd8225de 100644
--- a/Info/Layer2/NWSS2300.pm
+++ b/Info/Layer2/NWSS2300.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Bridge;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::MIBS,
diff --git a/Info/Layer2/Netgear.pm b/Info/Layer2/Netgear.pm
index 8c3a3c46..f33672c1 100644
--- a/Info/Layer2/Netgear.pm
+++ b/Info/Layer2/Netgear.pm
@@ -41,7 +41,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 # This will be filled in with the device's index into the EntPhysicalEntry
 # table by the serial() function.
diff --git a/Info/Layer2/Orinoco.pm b/Info/Layer2/Orinoco.pm
index 76e959e8..b8ea2f43 100644
--- a/Info/Layer2/Orinoco.pm
+++ b/Info/Layer2/Orinoco.pm
@@ -41,7 +41,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS,
diff --git a/Info/Layer2/Trapeze.pm b/Info/Layer2/Trapeze.pm
index 4a8b5269..c1953b21 100644
--- a/Info/Layer2/Trapeze.pm
+++ b/Info/Layer2/Trapeze.pm
@@ -40,7 +40,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::MIBS,
diff --git a/Info/Layer2/ZyXEL_DSLAM.pm b/Info/Layer2/ZyXEL_DSLAM.pm
index 4fc195f8..dc758e34 100644
--- a/Info/Layer2/ZyXEL_DSLAM.pm
+++ b/Info/Layer2/ZyXEL_DSLAM.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer2;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 # Set for No CDP
 %GLOBALS = ( %SNMP::Info::Layer2::GLOBALS );
diff --git a/Info/Layer3.pm b/Info/Layer3.pm
index 40de6b82..a3234dc7 100644
--- a/Info/Layer3.pm
+++ b/Info/Layer3.pm
@@ -51,7 +51,7 @@ use SNMP::Info::AdslLine;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::MIBS,
diff --git a/Info/Layer3/Aironet.pm b/Info/Layer3/Aironet.pm
index 475f3735..91750a65 100644
--- a/Info/Layer3/Aironet.pm
+++ b/Info/Layer3/Aironet.pm
@@ -41,7 +41,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/AlcatelLucent.pm b/Info/Layer3/AlcatelLucent.pm
index 0cb57276..fdfebafd 100644
--- a/Info/Layer3/AlcatelLucent.pm
+++ b/Info/Layer3/AlcatelLucent.pm
@@ -49,7 +49,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/AlteonAD.pm b/Info/Layer3/AlteonAD.pm
index efd04f33..94cd70fd 100644
--- a/Info/Layer3/AlteonAD.pm
+++ b/Info/Layer3/AlteonAD.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Altiga.pm b/Info/Layer3/Altiga.pm
index 86a225a3..616fcc7d 100644
--- a/Info/Layer3/Altiga.pm
+++ b/Info/Layer3/Altiga.pm
@@ -40,7 +40,7 @@ use SNMP::Info::Layer3;
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE 
             $int_include_vpn $fake_idx $type_class/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
             %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Arista.pm b/Info/Layer3/Arista.pm
index 951879d2..0047559c 100644
--- a/Info/Layer3/Arista.pm
+++ b/Info/Layer3/Arista.pm
@@ -48,7 +48,7 @@ use SNMP::Info::Aggregate;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Aruba.pm b/Info/Layer3/Aruba.pm
index de9f6949..b0f6c2a9 100644
--- a/Info/Layer3/Aruba.pm
+++ b/Info/Layer3/Aruba.pm
@@ -40,7 +40,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/BayRS.pm b/Info/Layer3/BayRS.pm
index 92c53967..899e65d7 100644
--- a/Info/Layer3/BayRS.pm
+++ b/Info/Layer3/BayRS.pm
@@ -43,7 +43,7 @@ use SNMP::Info::Bridge;
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE %MODEL_MAP
     %MODID_MAP %PROCID_MAP/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::MIBS,
diff --git a/Info/Layer3/BlueCoatSG.pm b/Info/Layer3/BlueCoatSG.pm
index b1b6280e..369ca2b2 100644
--- a/Info/Layer3/BlueCoatSG.pm
+++ b/Info/Layer3/BlueCoatSG.pm
@@ -36,7 +36,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS, %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/C3550.pm b/Info/Layer3/C3550.pm
index 7cc00017..ea3b998f 100644
--- a/Info/Layer3/C3550.pm
+++ b/Info/Layer3/C3550.pm
@@ -47,7 +47,7 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
 @SNMP::Info::Layer3::C3550::EXPORT_OK = qw//;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 # NOTE: Order creates precedence
 #       Example: v_name exists in Bridge.pm and CiscoVTP.pm
diff --git a/Info/Layer3/C4000.pm b/Info/Layer3/C4000.pm
index 25ba5125..beb67ace 100644
--- a/Info/Layer3/C4000.pm
+++ b/Info/Layer3/C4000.pm
@@ -44,7 +44,7 @@ use SNMP::Info::MAU;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::MAU::MIBS,
diff --git a/Info/Layer3/C6500.pm b/Info/Layer3/C6500.pm
index b65abde6..4af37f73 100644
--- a/Info/Layer3/C6500.pm
+++ b/Info/Layer3/C6500.pm
@@ -51,7 +51,7 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 # NOTE: Order creates precedence
 #       Example: v_name exists in Bridge.pm and CiscoVTP.pm
diff --git a/Info/Layer3/Cisco.pm b/Info/Layer3/Cisco.pm
index 60768c70..f9cb4bbd 100644
--- a/Info/Layer3/Cisco.pm
+++ b/Info/Layer3/Cisco.pm
@@ -55,7 +55,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/CiscoASA.pm b/Info/Layer3/CiscoASA.pm
index 91258a6d..c89536c0 100644
--- a/Info/Layer3/CiscoASA.pm
+++ b/Info/Layer3/CiscoASA.pm
@@ -45,7 +45,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = ( %SNMP::Info::Layer3::MIBS, %SNMP::Info::CiscoStack::MIBS, );
 
diff --git a/Info/Layer3/CiscoFWSM.pm b/Info/Layer3/CiscoFWSM.pm
index 6d9506f9..8282bbad 100644
--- a/Info/Layer3/CiscoFWSM.pm
+++ b/Info/Layer3/CiscoFWSM.pm
@@ -43,7 +43,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = ( %SNMP::Info::Layer3::MIBS, %SNMP::Info::CiscoStack::MIBS, );
 
diff --git a/Info/Layer3/CiscoSwitch.pm b/Info/Layer3/CiscoSwitch.pm
index 140de8b3..4b477a3f 100644
--- a/Info/Layer3/CiscoSwitch.pm
+++ b/Info/Layer3/CiscoSwitch.pm
@@ -50,7 +50,7 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::Cisco::MIBS,
diff --git a/Info/Layer3/Contivity.pm b/Info/Layer3/Contivity.pm
index 9dee1871..2155e325 100644
--- a/Info/Layer3/Contivity.pm
+++ b/Info/Layer3/Contivity.pm
@@ -42,7 +42,7 @@ use SNMP::Info::Entity;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::MIBS, %SNMP::Info::Layer3::MIBS, %SNMP::Info::Entity::MIBS,
diff --git a/Info/Layer3/Dell.pm b/Info/Layer3/Dell.pm
index 648c3f4d..ebabc350 100644
--- a/Info/Layer3/Dell.pm
+++ b/Info/Layer3/Dell.pm
@@ -40,7 +40,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Enterasys.pm b/Info/Layer3/Enterasys.pm
index ab2353de..1b3cb6c1 100644
--- a/Info/Layer3/Enterasys.pm
+++ b/Info/Layer3/Enterasys.pm
@@ -44,7 +44,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION $DEBUG %GLOBALS %FUNCS $INIT %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS, %SNMP::Info::CDP::MIBS,
diff --git a/Info/Layer3/Extreme.pm b/Info/Layer3/Extreme.pm
index abedfe04..17a2e9ac 100644
--- a/Info/Layer3/Extreme.pm
+++ b/Info/Layer3/Extreme.pm
@@ -46,7 +46,7 @@ use SNMP::Info::EDP;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/F5.pm b/Info/Layer3/F5.pm
index 25090761..f6fb3d86 100644
--- a/Info/Layer3/F5.pm
+++ b/Info/Layer3/F5.pm
@@ -38,7 +38,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Force10.pm b/Info/Layer3/Force10.pm
index 7f9538b1..7ac7c4ab 100644
--- a/Info/Layer3/Force10.pm
+++ b/Info/Layer3/Force10.pm
@@ -43,7 +43,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Foundry.pm b/Info/Layer3/Foundry.pm
index 175cc0df..627c1f30 100644
--- a/Info/Layer3/Foundry.pm
+++ b/Info/Layer3/Foundry.pm
@@ -48,7 +48,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/H3C.pm b/Info/Layer3/H3C.pm
index 6dad129c..919806fa 100644
--- a/Info/Layer3/H3C.pm
+++ b/Info/Layer3/H3C.pm
@@ -47,7 +47,7 @@ use SNMP::Info::IEEE802dot3ad 'agg_ports_lag';
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/HP9300.pm b/Info/Layer3/HP9300.pm
index 31ff78e4..283cf8af 100644
--- a/Info/Layer3/HP9300.pm
+++ b/Info/Layer3/HP9300.pm
@@ -42,7 +42,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/IBMGbTor.pm b/Info/Layer3/IBMGbTor.pm
index b9842bb5..fe6d0b73 100644
--- a/Info/Layer3/IBMGbTor.pm
+++ b/Info/Layer3/IBMGbTor.pm
@@ -41,7 +41,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Juniper.pm b/Info/Layer3/Juniper.pm
index bbfe2868..c0d51f92 100644
--- a/Info/Layer3/Juniper.pm
+++ b/Info/Layer3/Juniper.pm
@@ -40,7 +40,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION $DEBUG %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Lantronix.pm b/Info/Layer3/Lantronix.pm
index c6fb7230..29373946 100644
--- a/Info/Layer3/Lantronix.pm
+++ b/Info/Layer3/Lantronix.pm
@@ -41,7 +41,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Microsoft.pm b/Info/Layer3/Microsoft.pm
index c15d6e0b..34ab30b2 100644
--- a/Info/Layer3/Microsoft.pm
+++ b/Info/Layer3/Microsoft.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = ( %SNMP::Info::Layer3::MIBS, );
 
diff --git a/Info/Layer3/Mikrotik.pm b/Info/Layer3/Mikrotik.pm
index 3f3b9046..d4467990 100644
--- a/Info/Layer3/Mikrotik.pm
+++ b/Info/Layer3/Mikrotik.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/N1600.pm b/Info/Layer3/N1600.pm
index 40d8e1b7..d1327ac7 100644
--- a/Info/Layer3/N1600.pm
+++ b/Info/Layer3/N1600.pm
@@ -41,7 +41,7 @@ use SNMP::Info::SONMP;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/NetSNMP.pm b/Info/Layer3/NetSNMP.pm
index 69dc321e..da8c30e9 100644
--- a/Info/Layer3/NetSNMP.pm
+++ b/Info/Layer3/NetSNMP.pm
@@ -40,7 +40,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Netscreen.pm b/Info/Layer3/Netscreen.pm
index 1241da3e..6186ad10 100644
--- a/Info/Layer3/Netscreen.pm
+++ b/Info/Layer3/Netscreen.pm
@@ -40,7 +40,7 @@ use SNMP::Info::IEEE802dot11;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Nexus.pm b/Info/Layer3/Nexus.pm
index 40f941a1..3ac79e4a 100644
--- a/Info/Layer3/Nexus.pm
+++ b/Info/Layer3/Nexus.pm
@@ -46,7 +46,7 @@ use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 # NOTE: Order creates precedence
 #       Example: v_name exists in Bridge.pm and CiscoVTP.pm
diff --git a/Info/Layer3/PacketFront.pm b/Info/Layer3/PacketFront.pm
index 5fea5033..26d0be3e 100644
--- a/Info/Layer3/PacketFront.pm
+++ b/Info/Layer3/PacketFront.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Passport.pm b/Info/Layer3/Passport.pm
index 18a3f8be..a06782bf 100644
--- a/Info/Layer3/Passport.pm
+++ b/Info/Layer3/Passport.pm
@@ -43,7 +43,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS, %SNMP::Info::RapidCity::MIBS,
diff --git a/Info/Layer3/Pf.pm b/Info/Layer3/Pf.pm
index c5ca1193..ea82a51a 100644
--- a/Info/Layer3/Pf.pm
+++ b/Info/Layer3/Pf.pm
@@ -41,7 +41,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Pica8.pm b/Info/Layer3/Pica8.pm
index 081edbcb..eebb5d1c 100644
--- a/Info/Layer3/Pica8.pm
+++ b/Info/Layer3/Pica8.pm
@@ -39,7 +39,7 @@ use SNMP::Info::LLDP;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/SonicWALL.pm b/Info/Layer3/SonicWALL.pm
index 53c96a66..009ebe39 100644
--- a/Info/Layer3/SonicWALL.pm
+++ b/Info/Layer3/SonicWALL.pm
@@ -36,7 +36,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer2::MIBS, %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Steelhead.pm b/Info/Layer3/Steelhead.pm
index a69d7a9e..7b2acb18 100644
--- a/Info/Layer3/Steelhead.pm
+++ b/Info/Layer3/Steelhead.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %FUNCS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Sun.pm b/Info/Layer3/Sun.pm
index eddaf4fd..e955291c 100644
--- a/Info/Layer3/Sun.pm
+++ b/Info/Layer3/Sun.pm
@@ -39,7 +39,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = ( %SNMP::Info::Layer3::MIBS, );
 
diff --git a/Info/Layer3/Tasman.pm b/Info/Layer3/Tasman.pm
index 02bb4a56..3d182c4e 100644
--- a/Info/Layer3/Tasman.pm
+++ b/Info/Layer3/Tasman.pm
@@ -41,7 +41,7 @@ use SNMP::Info::MAU;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer3::MIBS,
diff --git a/Info/Layer3/Timetra.pm b/Info/Layer3/Timetra.pm
index 6df9d20d..e081e734 100644
--- a/Info/Layer3/Timetra.pm
+++ b/Info/Layer3/Timetra.pm
@@ -40,7 +40,7 @@ use SNMP::Info::Layer3;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = ( %SNMP::Info::Layer3::MIBS, 'TIMETRA-GLOBAL-MIB' => 'timetraReg', );
 
diff --git a/Info/Layer7.pm b/Info/Layer7.pm
index fdcc11a3..c8c2d55b 100644
--- a/Info/Layer7.pm
+++ b/Info/Layer7.pm
@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::MIBS,
diff --git a/Info/Layer7/APC.pm b/Info/Layer7/APC.pm
index 5ae5c367..442e5ff7 100644
--- a/Info/Layer7/APC.pm
+++ b/Info/Layer7/APC.pm
@@ -40,7 +40,7 @@ use SNMP::Info::Layer7;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer7::MIBS,
diff --git a/Info/Layer7/Neoteris.pm b/Info/Layer7/Neoteris.pm
index 3cad731b..8520a758 100644
--- a/Info/Layer7/Neoteris.pm
+++ b/Info/Layer7/Neoteris.pm
@@ -38,7 +38,7 @@ use SNMP::Info::Layer7;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer7::MIBS,
diff --git a/Info/Layer7/Netscaler.pm b/Info/Layer7/Netscaler.pm
index 653407dd..710c46cf 100644
--- a/Info/Layer7/Netscaler.pm
+++ b/Info/Layer7/Netscaler.pm
@@ -38,7 +38,7 @@ use SNMP::Info::Layer7;
 
 use vars qw/$VERSION %GLOBALS %MIBS %FUNCS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     %SNMP::Info::Layer7::MIBS,
diff --git a/Info/MAU.pm b/Info/MAU.pm
index 7bc34e3a..2531aad2 100644
--- a/Info/MAU.pm
+++ b/Info/MAU.pm
@@ -41,7 +41,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = ( 'MAU-MIB' => 'mauMod', 'IANA-MAU-MIB' => 'dot3MauType' );
 
diff --git a/Info/NortelStack.pm b/Info/NortelStack.pm
index ba2a4e82..7a64175e 100644
--- a/Info/NortelStack.pm
+++ b/Info/NortelStack.pm
@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
 
diff --git a/Info/PowerEthernet.pm b/Info/PowerEthernet.pm
index e511e8c9..e475a4b4 100644
--- a/Info/PowerEthernet.pm
+++ b/Info/PowerEthernet.pm
@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %MIBS %FUNCS %GLOBALS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = ( 'POWER-ETHERNET-MIB' => 'pethPsePortDetectionStatus' );
 
diff --git a/Info/RapidCity.pm b/Info/RapidCity.pm
index a67063a9..ef05c0f4 100644
--- a/Info/RapidCity.pm
+++ b/Info/RapidCity.pm
@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = ( 'RAPID-CITY' => 'rapidCity', );
 
diff --git a/Info/SONMP.pm b/Info/SONMP.pm
index 0fb914b5..1e206ea4 100644
--- a/Info/SONMP.pm
+++ b/Info/SONMP.pm
@@ -39,7 +39,7 @@ use SNMP::Info;
 
 use vars qw/$VERSION %FUNCS %GLOBALS %MIBS %MUNGE/;
 
-$VERSION = '3.15';
+$VERSION = '3.16';
 
 %MIBS = (
     'SYNOPTICS-ROOT-MIB'           => 'synoptics',
diff --git a/MANIFEST b/MANIFEST
index a01f5034..9aec15a7 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -11,7 +11,6 @@ Info/Bridge.pm
 Info/CDP.pm
 Info/CiscoAgg.pm
 Info/CiscoConfig.pm
-Info/CiscoImage.pm
 Info/CiscoPortSecurity.pm
 Info/CiscoPower.pm
 Info/CiscoQOS.pm
@@ -70,6 +69,7 @@ Info/Layer3/C6500.pm
 Info/Layer3/Cisco.pm
 Info/Layer3/CiscoASA.pm
 Info/Layer3/CiscoFWSM.pm
+Info/Layer3/CiscoSwitch.pm
 Info/Layer3/Contivity.pm
 Info/Layer3/Dell.pm
 Info/Layer3/Enterasys.pm
@@ -103,6 +103,7 @@ Info/Layer7/Neoteris.pm
 Info/Layer7/Netscaler.pm
 Info/LLDP.pm
 Info/MAU.pm
+Info/MRO.pm
 Info/NortelStack.pm
 Info/PowerEthernet.pm
 Info/RapidCity.pm
diff --git a/README b/README
index bdb5efc3..ac9aed6d 100644
--- a/README
+++ b/README
@@ -4,7 +4,7 @@ NAME
 
 VERSION
 
-    SNMP::Info - Version 3.12
+    SNMP::Info - Version 3.16
 
 AUTHOR
 
@@ -240,12 +240,6 @@ SUBCLASSES
 
         See documentation in SNMP::Info::CiscoConfig for details.
 
-    SNMP::Info::CiscoImage
-        CISCO-IMAGE-MIB. A collection of OIDs providing IOS image
-        characteristics.
-
-        See documentation in SNMP::Info::CiscoImage for details.
-
     SNMP::Info::CiscoPortSecurity
         CISCO-PORT-SECURITY-MIB and CISCO-PAE-MIB.
 
@@ -469,8 +463,9 @@ SUBCLASSES
             See documentation in SNMP::Info::Layer2::Centillion for details.
 
         SNMP::Info::Layer2::Cisco
-            Generic Cisco subclass for layer2 devices that are not yet
-            supported in more specific subclasses.
+            Generic Cisco subclass for layer 2 devices that are not yet
+            supported in more specific subclassesand the base layer 2 Cisco
+            class for other device specific layer 2 Cisco classes.
 
             See documentation in SNMP::Info::Layer2::Cisco for details.
 
@@ -604,8 +599,9 @@ SUBCLASSES
             See documentation in SNMP::Info::Layer3::C6500 for details.
 
         SNMP::Info::Layer3::Cisco
-            This is a simple wrapper around Layer3 for IOS devices. It adds
-            on CiscoVTP.
+            This is a simple wrapper around layer 3 for IOS devices and the
+            base layer 3 Cisco class for other device specific layer 3 Cisco
+            classes.
 
             See documentation in SNMP::Info::Layer3::Cisco for details.
 
@@ -619,6 +615,10 @@ SUBCLASSES
 
             See documentation in SNMP::Info::Layer3::CiscoFWSM for details.
 
+        SNMP::Info::Layer3::CiscoSwitch
+            Base class for L3 Cisco switches. See documentation in
+            SNMP::Info::Layer3::CiscoSwitch for details.
+
         SNMP::Info::Layer3::Contivity
             Subclass for Avaya/Nortel Contivity/VPN Routers.
 
@@ -893,6 +893,19 @@ USAGE
 
             (default creates session automatically)
 
+        Offline
+            Causes SNMP::Info to avoid network activity and return data only
+            from its cache. If you ask for something not in the cache, an
+            error is thrown. See also the "cache()" and "offline()" methods.
+
+            (default 0, which means "online")
+
+        Cache
+            Pass in a HashRef to prime the cache of retrieved data. Useful
+            for creating an instance in "Offline" mode from a previously
+            dumped cache. See also the "cache()" method to retrieve a cache
+            after running actial queries.
+
         OTHER
             All other arguments are passed to SNMP::Session.
 
@@ -941,6 +954,9 @@ USAGE
     Run $info->clear_cache() to clear the cache to allow reload of both
     globals and table methods.
 
+    The cache can be retreved or set using the $info->cache() method. This
+    works together with the "Offline" option.
+
   Object Scalar Methods
 
     These are for package related data, not directly supplied from SNMP.
@@ -953,6 +969,17 @@ USAGE
         Returns current debug status, and optionally toggles debugging info
         for this object.
 
+    $info->offline([1|0])
+        Returns if offline mode is currently turned on for this object.
+
+        Optionally sets the Offline parameter.
+
+    $info->cache([new_cache])
+        Returns a HashRef of all cached data in this object. There will be a
+        "store" key for table data and then one key for each leaf.
+
+        Optionally sets the cache parameters if passed a HashRef.
+
     $info->bulkwalk([1|0])
         Returns if bulkwalk is currently turned on for this object.