Merge branch 'bmk/snmp/snmp424_integration/r16' into maint

37 files changed, 7552 insertions, 2920 deletions

diff --git a/lib/snmp/.gitignore b/lib/snmp/.gitignore
index b82d23e7bd..650c1d6865 100644
--- a/lib/snmp/.gitignore
+++ b/lib/snmp/.gitignore
@@ -1,4 +1,9 @@
 # Match at any level.
 
 *.BKP
+*.orig
+*.rej
+
+doc/index.html
+
 
diff --git a/lib/snmp/doc/src/files.mk b/lib/snmp/doc/src/files.mk
index 61c91c9729..494c550fff 100644
--- a/lib/snmp/doc/src/files.mk
+++ b/lib/snmp/doc/src/files.mk
@@ -41,6 +41,8 @@ XML_AGENT_REF3_FILES = \
 	snmpa_error_io.xml \
 	snmpa_error_logger.xml \
 	snmpa_local_db.xml \
+	snmpa_mib_data.xml \
+	snmpa_mib_storage.xml \
 	snmpa_mpd.xml \
 	snmpa_network_interface.xml \
 	snmpa_network_interface_filter.xml \
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 5222922848..80de9738f1 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -34,6 +34,88 @@
 
 
   <section>
+    <title>SNMP Development Toolkit 4.24</title>
+    <p>Version 4.24 supports code replacement in runtime from/to
+    version 4.23.1 and 4.23. </p>
+
+    <section>
+      <title>Improvements and new features</title>
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+          <p>[agent,manager] Updated to support the new crypto interface. </p>
+          <p>Own Id: OTP-11009</p>
+        </item>
+
+        <item>
+          <p>[agent] Introduced a documented behaviour for the mib-server 
+	  <seealso marker="snmpa_mib_data">mib-data backend</seealso>. 
+	  At present only the default module (<c>snmpa_mib_data_tttn</c>) is
+	  provided. </p>
+	  <p>A config option for the (agent) 
+	  <seealso marker="snmp_config#agent_mib_server">mib-servers</seealso> 
+	  mib-data backend module has been added to the agent config options, 
+	  <seealso marker="snmp_config#agent_ms_data_module">data_module</seealso>. </p>
+	  <p>Own Id: OTP-11101</p>
+        </item>
+
+        <item>
+          <p>[agent] Introduced a documented behaviour for the 
+	  <seealso marker="snmpa_mib_storage">mib storage</seealso>. 
+	  At present there are three simple modules 
+	  (<c>snmpa_mib_storage_ets</c>, <c>snmpa_mib_storage_dets</c> and 
+	  <c>snmpa_mib_storage_mnesia</c>) implement�ng this behaviour, 
+	  provided with the app. </p>
+	  <p>A config option for the (agent) 
+	  <seealso marker="snmp_config#agent_mib_storage">mib storage</seealso> 
+	  has been added to the agent config options. </p>
+	  <p>Own Id: OTP-11107</p>
+        </item>
+
+      </list>
+
+    </section>
+
+    <section>
+      <title>Fixed Bugs and Malfunctions</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>[agent,manager] Updated to support the new crypto interface. </p>
+          <p>Own Id: OTP-11009</p>
+        </item>
+
+      </list>
+-->
+
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+          <p>[manager] The old Addr-and-Port based API functions, previously
+	  long deprecated and marked for deletion in R16B, has now been
+	  removed. </p>
+          <p>Own Id: OTP-10027</p>
+        </item>
+
+      </list>
+-->
+    </section>
+
+  </section> <!-- 4.24 -->
+
+
+  <section>
     <title>SNMP Development Toolkit 4.23.1</title>
     <p>Version 4.23.1 supports code replacement in runtime from/to
     version 4.23. </p>
@@ -1017,135 +1099,6 @@
   </section> <!-- 4.20 -->
 
 
-  <section>
-    <title>SNMP Development Toolkit 4.19</title>
-    <p>Version 4.19 supports code replacement in runtime from/to
-      version 4.18.</p>
-
-    <section>
-      <title>Improvements and new features</title>
-<!--
-      <p>-</p>
--->
-      <list type="bulleted">
-        <item>
-          <p>[compiler] Added support for textual convention 
-	  <c>AGENT-CAPABILITIES</c> and "full" support for textual 
-          convention MODULE-COMPLIANCE, both defined by the SNMPv2-CONF 
-          mib.</p>
-          <p>The <c>reference</c> and <c>modules</c> part(s) are
-	  stored in the <c>assocList</c> of the mib-entry (<c>me</c>) 
-	  record. 
-	  Only handled <em>if</em> the option(s) <c>agent_capabilities</c>
-	  and <c>module_compliance</c> (respectively) are provided to the 
-	  compiler. </p>
-	  <p>See <seealso marker="snmpc#compile">compile/2</seealso> 
-	  for more info. </p>
-	  <p>For backward compatibillity, the MIBs provided with 
-	  this application are <em>not</em> compiled with these 
-	  options. </p>
-          <p>Own Id: OTP-8966</p>
-        </item>
-
-        <item>
-          <p>[agent] Added a "complete" set of (snmp) table and variable
-          print functions, for each mib handled by the SNMP (agent)
-          application. This will be usefull when debugging a running agent.</p>
-          <p>See
-          <seealso marker="snmpa#print_mib_info">print_mib_info/0</seealso>,
-          <seealso marker="snmpa#print_mib_tables">print_mib_tables/0</seealso>
-          and
-          <seealso marker="snmpa#print_mib_variables">print_mib_variables/0</seealso>
-          for more info. </p>
-          <p>Own Id: OTP-8977</p>
-        </item>
-
-        <item>
-          <p>[compiler] Added a MIB compiler (frontend) escript, 
-          <c>snmpc</c>. </p>
-          <p>Own Id: OTP-9004</p>
-        </item>
-
-      </list>
-    </section>
-
-    <section>
-      <title>Fixed Bugs and Malfunctions</title>
-<!--
-      <p>-</p> 
--->
-      <list type="bulleted">
-        <item>
-          <p>[agent] For the table vacmAccessTable,
-          when performing the is_set_ok and set operation(s),
-          all values of the vacmAccessSecurityModel column was
-          incorrectly translated to <c>any</c>. </p>
-<!--
-that is when calling:
-snmp_view_basec_acm_mib:vacmAccessTable(set, RowIndex, Cols).
--->
-          <p>Own Id: OTP-8980</p>
-        </item>
-
-        <item>
-          <p>[agent] When calling
-          <seealso marker="snmp_view_based_acm_mib#reconfigure">snmp_view_based_acm_mib:reconfigure/1</seealso>
-          on a running node, the table <c>vacmAccessTable</c> was not properly
-          cleaned.
-          This meant that if some entries in the vacm.conf file was removed
-          (compared to the <c>current</c> config),
-          while others where modified and/or added, the removed entrie(s)
-          would still exist in the <c>vacmAccessTable</c> table. </p>
-          <p>Own Id: OTP-8981</p>
-          <p>Aux Id: Seq 11750</p>
-        </item>
-
-      </list>
-    </section>
-
-
-    <section>
-      <title>Incompatibilities</title>
-      <p>-</p>
-    </section>
-
-  </section> <!-- 4.19 -->
-
-
-  <section>
-    <title>SNMP Development Toolkit 4.18</title>
-    <p>Version 4.18 supports code replacement in runtime from/to
-      version 4.17.1 and 4.17.</p>
-
-    <section>
-      <title>Improvements and new features</title>
-      <list type="bulleted">
-        <item>
-          <p>Prepared for R14B release.</p>
-        </item>
-      </list>
-    </section>
-
-    <section><title>Fixed Bugs and Malfunctions</title>
-      <p>-</p>
-<!--
-      <list type="bulleted">
-        <item>
-          <p>[agent] When the function FilterMod:accept_recv/2 returned false
-          the SNMP agent stopped collecting messages from UDP.</p>
-          <p>Own Id: OTP-8761</p>
-        </item>
-      </list>
--->
-    </section>
-
-    <section>
-      <title>Incompatibilities</title>
-      <p>-</p>
-    </section>
-  </section> <!-- 4.18 -->
-
-
   <!-- section>
     <title>Release notes history</title>
     <p>For information about older versions see
diff --git a/lib/snmp/doc/src/ref_man.xml b/lib/snmp/doc/src/ref_man.xml
index 92e8927f6d..628b30b11a 100644
--- a/lib/snmp/doc/src/ref_man.xml
+++ b/lib/snmp/doc/src/ref_man.xml
@@ -44,6 +44,8 @@
   <xi:include href="snmpa_error_io.xml"/>
   <xi:include href="snmpa_error_logger.xml"/>
   <xi:include href="snmpa_local_db.xml"/>
+  <xi:include href="snmpa_mib_data.xml"/>
+  <xi:include href="snmpa_mib_storage.xml"/>
   <xi:include href="snmpa_mpd.xml"/>
   <xi:include href="snmpa_network_interface.xml"/>
   <xi:include href="snmpa_network_interface_filter.xml"/>
diff --git a/lib/snmp/doc/src/snmp_app.xml b/lib/snmp/doc/src/snmp_app.xml
index 62dfa515d1..e5a05342c1 100644
--- a/lib/snmp/doc/src/snmp_app.xml
+++ b/lib/snmp/doc/src/snmp_app.xml
@@ -4,7 +4,7 @@
 <appref>
   <header>
     <copyright>
-      <year>1997</year><year>2012</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -311,36 +311,125 @@
         <p>Default is <c>[]</c>.</p>
       </item>
 
-      <marker id="agent_mib_storage"></marker>
-      <tag><c><![CDATA[mib_storage() = ets | {ets, Dir} | {ets, Dir, Action} | dets | {dets, Dir} | {dets, Dir, Action} | mnesia | {mnesia, Nodes} | {mnesia, Nodes, Action} <optional>]]></c></tag>
-      <item>
-        <p>Specifies how info retrieved from the mibs will be stored.</p>
-        <p>If <c>mib_storage</c> is <c>{ets, Dir}</c>, the table will also be 
-          stored on file. If <c>Dir</c> is <c>default</c>, then <c>db_dir</c> 
-          will be used.</p>
-        <p>If <c>mib_storage</c> is <c>dets</c> or if <c>Dir</c> is 
-          <c>default</c>, then <c>db_dir</c> will be used for <c>Dir</c>.</p>
-        <p>If <c>mib_storage</c> is <c>mnesia</c> then <c>erlang:nodes()</c>
-          will be used for <c>Nodes</c>.</p>
-        <p>Default is <c>ets</c>. </p>
-        <p><c>Dir = default | string()</c>. Dir is the directory where the 
-          files will be stored. If <c>default</c>, then <c>db_dir</c> will be 
-          used.</p>
-        <p><c>Nodes = visible | connected | [node()]</c>. 
-          <c>Nodes = visible</c> is translated to 
-          <c>erlang:nodes(visible)</c>. 
-          <c>Nodes = connected</c> is translated to 
-          <c>erlang:nodes(connected)</c>. 
-          If <c>Nodes = []</c> then the own node is assumed.</p>
-        <p><c>Action = clear | keep</c>. Default is <c>keep</c>.
-          <c>Action</c> is used to specify what shall be done if the 
-          mnesia/dets table already exist.</p>
+     <marker id="agent_mib_storage"></marker>
+      <tag><c><![CDATA[mib_storage() = [mib_storage_opt()] <optional>]]></c></tag>
+      <item>
+        <p><c>mib_storage_opt() = {module, mib_storage_module()} |  {options, mib_storage_options()}</c></p>
+        <p>This option specifies how basic mib data is stored. 
+	This option is used by two parts of the snmp agent: 
+	The mib-server and the symbolic-store. </p>
+        <p>Default is <c>[{module, snmpa_mib_storage_ets}]</c>. </p>
+      </item>
+
+       <marker id="agent_mst_module"></marker>
+      <tag><c><![CDATA[mib_storage_module() = snmpa_mib_data_ets | snmpa_mib_data_dets | snmpa_mib_data_mnesia | module()]]></c></tag>
+      <item>
+        <p>Defines the mib storage module of the SNMP agent as defined by the 
+	<seealso marker="snmpa_mib_storage">snmpa_mib_storage</seealso> 
+	behaviour. </p>
+	<p>Several entities (<c>mib-server</c> via the its data module and 
+	the <c>symbolic-store</c>) of the snmp agent uses this for storage 
+	of miscelaneous mib related data retrieved while loading a mib. </p>
+	<p>There are several implementations provided with the agent: 
+	<c>snmpa_mib_storage_ets</c>, <c>snmpa_mib_storage_dets</c> and 
+	<c>snmpa_mib_storage_mnesia</c>. </p>
+        <p>Default module is <c>snmpa_mib_storage_ets</c>. </p>
+      </item>
+
+       <marker id="agent_mst_options"></marker>
+      <tag><c><![CDATA[mib_storage_options() = list() <optional>]]></c></tag>
+      <item>
+        <p>This is implementattion depended. That is, it depends on the 
+	module. For each module a specific set of options are valid. 
+	For the module provided with the app, these options are supported: </p>
+        <list type="bulleted">
+          <item>
+	    <p><c>snmpa_mib_storage_ets</c>: <c>{dir, filename()} | {action, keep | clear}, {checksum, boolean()}</c></p>
+	    <list>
+	      <item>
+		<p><c>dir</c> - If present, points to a directory where a file 
+		to which all data in the ets table is "synced". </p>
+		<p>Also, when a table is opened this file is read, 
+		if it exists. </p>
+		<p>By default, this will <em>not</em> be used. </p> 
+	      </item>
+	      <item>
+		<p><c>action</c> - Specifies the behaviour when a non-empty 
+		file is found: Keep its content or clear it out. </p>
+		<p>Default is <c>keep</c>. </p> 
+	      </item>
+	      <item>
+		<p><c>checksum</c> - Defines if the file is checksummed 
+		or not. </p>
+		<p>Default is <c>false</c>. </p> 
+	      </item>
+	    </list>
+	  </item>
+          <item>
+	    <p><c>snmpa_mib_storage_dets</c>: <c>{dir, filename()} | {action, keep | clear}, {auto_save, default | pos_integer()} | {repair, force | boolean()}</c></p>
+	    <list>
+	      <item>
+		<p><c>dir</c> - This <em>mandatory</em> option points to a 
+		directory where to place the file of a dets table. </p>
+	      </item>
+	      <item>
+		<p><c>action</c> - Specifies the behaviour when a non-empty 
+		file is found: Keep its content or clear it out. </p>
+		<p>Default is <c>keep</c>. </p> 
+	      </item>
+	      <item>
+		<p><c>auto_save</c> - Defines the dets auto-save frequency. </p>
+		<p>Default is <c>default</c>. </p> 
+	      </item>
+	      <item>
+		<p><c>repair</c> - Defines the dets repair behaviour. </p>
+		<p>Default is <c>false</c>. </p> 
+	      </item>
+	    </list>
+	  </item>
+          <item>
+	    <p><c>snmpa_mib_storage_mnesia</c>: <c>{action, keep | clear}, {nodes, [node()]}</c></p>
+	    <list>
+	      <item>
+		<p><c>action</c> - Specifies the behaviour when a non-empty, 
+		already existing, table: Keep its content or clear it out. </p>
+		<p>Default is <c>keep</c>. </p>
+	      </item>
+	      <item>
+		<p><c>nodes</c> - A list of node names (or an atom 
+		describing a list of nodes) defining where to open the table. 
+		Its up to the user to ensure that mnesia is actually running 
+		on the specified nodes. </p>
+		<p>The following distinct values are recognised: </p>
+		<list>
+		  <item>
+		    <p><c>[]</c> - Translated into a list of the own node: <c>[node()]</c></p>
+		  </item>
+		  <item>
+		    <p><c>all</c> - <c>erlang:nodes()</c></p>
+		  </item>
+		  <item>
+		    <p><c>visible</c> - <c>erlang:nodes(visible)</c></p>
+		  </item>
+		  <item>
+		    <p><c>connected</c> - <c>erlang:nodes(connected)</c></p>
+		  </item>
+		  <item>
+		    <p><c>db_nodes</c> - <c>mnesia:system_info(db_nodes)</c></p>
+		  </item>
+		</list>
+		
+		<p>Default is the result of the call: <c>erlang:nodes()</c>. </p>
+	      </item>
+	    </list>
+	  </item>
+        </list>
       </item>
 
       <marker id="agent_mib_server"></marker>
       <tag><c><![CDATA[mib_server() = [mib_server_opt()] <optional>]]></c></tag>
       <item>
-        <p><c>mib_server_opt() = {mibentry_override, mibentry_override()} |  {trapentry_override, trapentry_override()} |  {verbosity, verbosity()} | {cache, mibs_cache()}</c></p>
+        <p><c>mib_server_opt() = {mibentry_override, mibentry_override()} |  {trapentry_override, trapentry_override()} |  {verbosity, verbosity()} | {cache, mibs_cache()} | {data_module, mib_server_data_module()}</c></p>
         <p>Defines options specific for the SNMP agent mib server. </p>
         <p>For defaults see the options in <c>mib_server_opt()</c>.</p>
       </item>
@@ -365,7 +454,28 @@
         <p>Default is <c>false</c>.</p>
       </item>
 
-      <marker id="agent_ms_cache"></marker>
+       <marker id="agent_ms_data_module"></marker>
+<!--
+      <tag><c><![CDATA[mib_server_data_module() = snmpa_mib_data_tttn | snmpa_mib_data_ttln | module() <optional>]]></c></tag>
+-->
+      <tag><c><![CDATA[mib_server_data_module() = snmpa_mib_data_tttn | module() <optional>]]></c></tag>
+      <item>
+        <p>Defines the backend data module of the SNMP agent mib-server as 
+	defined by the 
+	<seealso marker="snmpa_mib_data">snmpa_mib_data</seealso> 
+	behaviour. </p>
+	<p>At present only the default module is provided with the agent,  
+	<c>snmpa_mib_data_tttn</c>. </p>
+<!--
+	<p>Two modules is provided with the agent 
+	<c>snmpa_mib_data_tttn</c> (this is the old implementation) and 
+	<c>snmpa_mib_data_ttln</c> (for a mib tree with many holes, 
+	this algorithm can be more price efficient). </p>
+-->
+        <p>Default module is <c>snmpa_mib_data_tttn</c>. </p>
+      </item>
+
+     <marker id="agent_ms_cache"></marker>
       <tag><c><![CDATA[mibs_cache() = bool() | mibs_cache_opts() <optional>]]></c></tag>
       <item>
         <p>Shall the agent utilize the mib server lookup cache or not.</p>
@@ -385,30 +495,30 @@
       <tag><c><![CDATA[mibs_cache_autogc() = bool() <optional>]]></c></tag>
       <item>
         <p>Defines if the mib server shall perform cache gc automatically or 
-          leave it to the user (see 
-          <seealso marker="snmpa#gc_mibs_cache">gc_mibs_cache/0,1,2,3</seealso>). </p>
+	leave it to the user (see 
+	<seealso marker="snmpa#gc_mibs_cache">gc_mibs_cache/0,1,2,3</seealso>). </p>
         <p>Default is <c>true</c>.</p>
       </item>
 
       <marker id="agent_ms_cache_age"></marker>
       <tag><c><![CDATA[mibs_cache_age() = integer() > 0 <optional>]]></c></tag>
       <item>
-        <p>Defines how old the entries in the cache will be allowed before 
-          they are GC'ed (assuming GC is performed). Each entry in the 
-          cache is "touched" whenever it is accessed. </p>
-        <p>The age is defined in milliseconds. </p>
-        <p>Default is <c>10 timutes</c>.</p>
+        <p>Defines how old the entries in the cache will be allowed 
+	to become before they are GC'ed (assuming GC is performed). 
+	Each entry in the cache is "touched" whenever it is accessed. </p>
+	<p>The age is defined in milliseconds. </p>
+	<p>Default is <c>10 timutes</c>.</p>
       </item>
 
       <marker id="agent_ms_cache_gclimit"></marker>
       <tag><c><![CDATA[mibs_cache_gclimit() = integer() > 0 | infinity <optional>]]></c></tag>
       <item>
         <p>When performing a GC, this is the max number of cache entries 
-          that will be deleted from the cache. </p>
+	that will be deleted from the cache. </p>
         <p>The reason for having this limit is that if the cache is 
-          large, the GC can potentially take a long time, during which 
-          the agent is locked. </p>
-        <p>Default is <c>100</c>.</p>
+	large, the GC can potentially take a long time, during which 
+	the agent is locked. </p>
+	<p>Default is <c>100</c>.</p>
       </item>
 
       <marker id="agent_error_report_mod"></marker>
diff --git a/lib/snmp/doc/src/snmp_config.xml b/lib/snmp/doc/src/snmp_config.xml
index eec53162a1..61ee7f00ee 100644
--- a/lib/snmp/doc/src/snmp_config.xml
+++ b/lib/snmp/doc/src/snmp_config.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2012</year>
+      <year>1997</year><year>2013</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -308,6 +308,126 @@
         <p>Default is <c>[]</c>.</p>
       </item>
 
+     <marker id="agent_mib_storage"></marker>
+      <tag><c><![CDATA[mib_storage() = [mib_storage_opt()] <optional>]]></c></tag>
+      <item>
+        <p><c>mib_storage_opt() = {module, mib_storage_module()} |  {options, mib_storage_options()}</c></p>
+        <p>This option specifies how basic mib data is stored. 
+	This option is used by two parts of the snmp agent: 
+	The mib-server and the symbolic-store. </p>
+        <p>Default is <c>[{module, snmpa_mib_storage_ets}]</c>. </p>
+      </item>
+
+       <marker id="agent_mst_module"></marker>
+      <tag><c><![CDATA[mib_storage_module() = snmpa_mib_data_ets | snmpa_mib_data_dets | snmpa_mib_data_mnesia | module()]]></c></tag>
+      <item>
+        <p>Defines the mib storage module of the SNMP agent as defined by the 
+	<seealso marker="snmpa_mib_storage">snmpa_mib_storage</seealso> 
+	behaviour. </p>
+	<p>Several entities (<c>mib-server</c> via the its data module and 
+	the <c>symbolic-store</c>) of the snmp agent uses this for storage 
+	of miscelaneous mib related data dataretrieved while loading a mib. </p>
+	<p>There are several implementations provided with the agent: 
+	<c>snmpa_mib_storage_ets</c>, <c>snmpa_mib_storage_dets</c> and 
+	<c>snmpa_mib_storage_mnesia</c>. </p>
+        <p>Default module is <c>snmpa_mib_storage_ets</c>. </p>
+      </item>
+
+       <marker id="agent_mst_options"></marker>
+      <tag><c><![CDATA[mib_storage_options() = list() <optional>]]></c></tag>
+      <item>
+        <p>This is implementattion depended. That is, it depends on the 
+	module. For each module a specific set of options are valid. 
+	For the module provided with the app, these options are supported: </p>
+        <list type="bulleted">
+          <item>
+	    <p><c>snmpa_mib_storage_ets</c>: <c>{dir, filename()} | {action, keep | clear}, {checksum, boolean()}</c></p>
+	    <list>
+	      <item>
+		<p><c>dir</c> - If present, points to a directory where a file 
+		to which all data in the ets table is "synced". </p>
+		<p>Also, when a table is opened this file is read, 
+		if it exists. </p>
+		<p>By default, this will <em>not</em> be used. </p> 
+	      </item>
+	      <item>
+		<p><c>action</c> - Specifies the behaviour when a non-empty 
+		file is found: Keep its content or clear it out. </p>
+		<p>Default is <c>keep</c>. </p> 
+	      </item>
+	      <item>
+		<p><c>checksum</c> - Defines if the file is checksummed 
+		or not. </p>
+		<p>Default is <c>false</c>. </p> 
+	      </item>
+	    </list>
+	  </item>
+          <item>
+	    <p><c>snmpa_mib_storage_dets</c>: <c>{dir, filename()} | {action, keep | clear}, {auto_save, default | pos_integer()} | {repair, force | boolean()}</c></p>
+	    <list>
+	      <item>
+		<p><c>dir</c> - This <em>mandatory</em> option points to a 
+		directory where to place the file of a dets table. </p>
+	      </item>
+	      <item>
+		<p><c>action</c> - Specifies the behaviour when a non-empty 
+		file is found: Keep its content or clear it out. </p>
+		<p>Default is <c>keep</c>. </p> 
+	      </item>
+	      <item>
+		<p><c>auto_save</c> - Defines the dets auto-save frequency. </p>
+		<p>Default is <c>default</c>. </p> 
+	      </item>
+	      <item>
+		<p><c>repair</c> - Defines the dets repair behaviour. </p>
+		<p>Default is <c>false</c>. </p> 
+	      </item>
+	    </list>
+	  </item>
+          <item>
+	    <p><c>snmpa_mib_storage_mnesia</c>: <c>{action, keep | clear}, {nodes, [node()]}</c></p>
+	    <list>
+	      <item>
+		<p><c>action</c> - Specifies the behaviour when a non-empty, 
+		already existing, table: Keep its content or clear it out. </p>
+		<p>Default is <c>keep</c>. </p>
+	      </item>
+	      <item>
+		<p><c>nodes</c> - A list of node names (or an atom 
+		describing a list of nodes) defining where to open the table. 
+		Its up to the user to ensure that mnesia is actually running 
+		on the specified nodes. </p>
+		<p>The following distinct values are recognised: </p>
+		<list>
+		  <item>
+		    <p><c>[]</c> - Translated into a list of the own node: <c>[node()]</c></p>
+		  </item>
+		  <item>
+		    <p><c>all</c> - <c>erlang:nodes()</c></p>
+		  </item>
+		  <item>
+		    <p><c>visible</c> - <c>erlang:nodes(visible)</c></p>
+		  </item>
+		  <item>
+		    <p><c>connected</c> - <c>erlang:nodes(connected)</c></p>
+		  </item>
+		  <item>
+		    <p><c>db_nodes</c> - <c>mnesia:system_info(db_nodes)</c></p>
+		  </item>
+		</list>
+		
+		<p>Default is the result of the call: <c>erlang:nodes()</c>. </p>
+	      </item>
+	    </list>
+	  </item>
+        </list>
+      </item>
+
+<!--
+
+This is the old format which is "supported", but not documented, 
+in so far as it will be converted to the new format if found. 
+
       <marker id="agent_mib_storage"></marker>
       <tag><c><![CDATA[mib_storage() = ets | {ets, Dir} | {ets, Dir, Action} | dets | {dets, Dir} | {dets, Dir, Action} | mnesia | {mnesia, Nodes} | {mnesia, Nodes, Action} <optional>]]></c></tag>
       <item>
@@ -333,11 +453,12 @@
           <c>Action</c> is used to specify what shall be done if the 
           mnesia/dets table already exist.</p>
       </item>
+-->
 
       <marker id="agent_mib_server"></marker>
       <tag><c><![CDATA[mib_server() = [mib_server_opt()] <optional>]]></c></tag>
       <item>
-        <p><c>mib_server_opt() = {mibentry_override, mibentry_override()} |  {trapentry_override, trapentry_override()} |  {verbosity, verbosity()} | {cache, mibs_cache()}</c></p>
+        <p><c>mib_server_opt() = {mibentry_override, mibentry_override()} |  {trapentry_override, trapentry_override()} |  {verbosity, verbosity()} | {cache, mibs_cache()} | {data_module, mib_server_data_module()}</c></p>
         <p>Defines options specific for the SNMP agent mib server. </p>
         <p>For defaults see the options in <c>mib_server_opt()</c>.</p>
       </item>
@@ -362,6 +483,27 @@
         <p>Default is <c>false</c>.</p>
       </item>
 
+      <marker id="agent_ms_data_module"></marker>
+<!--
+      <tag><c><![CDATA[mib_server_data_module() = snmpa_mib_data_tttn | snmpa_mib_data_ttln | module() <optional>]]></c></tag>
+-->
+      <tag><c><![CDATA[mib_server_data_module() = snmpa_mib_data_tttn | module() <optional>]]></c></tag>
+      <item>
+        <p>Defines the backend data module of the SNMP agent mib-server as 
+	defined by the 
+	<seealso marker="snmpa_mib_data">snmpa_mib_data</seealso> 
+	behaviour. </p>
+	<p>At present only the default module is provided with the agent,  
+	<c>snmpa_mib_data_tttn</c>. </p>
+<!--
+	<p>Two modules is provided with the agent 
+	<c>snmpa_mib_data_tttn</c> (this is the old implementation) and 
+	<c>snmpa_mib_data_ttln</c> (for a mib tree with many holes, 
+	this algorithm can be more price efficient). </p>
+-->
+        <p>Default module is <c>snmpa_mib_data_tttn</c>. </p>
+      </item>
+
       <marker id="agent_ms_cache"></marker>
       <tag><c><![CDATA[mibs_cache() = bool() | mibs_cache_opts() <optional>]]></c></tag>
       <item>
@@ -382,18 +524,18 @@
       <tag><c><![CDATA[mibs_cache_autogc() = bool() <optional>]]></c></tag>
       <item>
         <p>Defines if the mib server shall perform cache gc automatically or 
-          leave it to the user (see 
-          <seealso marker="snmpa#gc_mibs_cache">gc_mibs_cache/0,1,2,3</seealso>). </p>
-        <p>Default is <c>true</c>.</p>
+	leave it to the user (see 
+	<seealso marker="snmpa#gc_mibs_cache">gc_mibs_cache/0,1,2,3</seealso>). </p>
+	<p>Default is <c>true</c>.</p>
       </item>
 
       <marker id="agent_ms_cache_age"></marker>
       <tag><c><![CDATA[mibs_cache_age() = integer() > 0 <optional>]]></c></tag>
       <item>
-        <p>Defines how old the entries in the cache will be allowed before 
-          they are GC'ed (assuming GC is performed). Each entry in the 
-          cache is "touched" whenever it is accessed. </p>
-        <p>The age is defined in milliseconds. </p>
+        <p>Defines how old the entries in the cache will be allowed 
+	to become before they are GC'ed (assuming GC is performed). 
+	Each entry in the cache is "touched" whenever it is accessed. </p>
+	<p>The age is defined in milliseconds. </p>
         <p>Default is <c>10 timutes</c>.</p>
       </item>
 
@@ -401,11 +543,11 @@
       <tag><c><![CDATA[mibs_cache_gclimit() = integer() > 0 | infinity <optional>]]></c></tag>
       <item>
         <p>When performing a GC, this is the max number of cache entries 
-          that will be deleted from the cache. </p>
-        <p>The reason for having this limit is that if the cache is 
-          large, the GC can potentially take a long time, during which 
-          the agent is locked. </p>
-        <p>Default is <c>100</c>.</p>
+	that will be deleted from the cache. </p>
+	<p>The reason for having this limit is that if the cache is 
+	large, the GC can potentially take a long time, during which 
+	the agent is locked. </p>
+	<p>Default is <c>100</c>.</p>
       </item>
 
       <marker id="agent_error_report_mod"></marker>
diff --git a/lib/snmp/doc/src/snmpa_mib_data.xml b/lib/snmp/doc/src/snmpa_mib_data.xml
new file mode 100644
index 0000000000..ff07a03b98
--- /dev/null
+++ b/lib/snmp/doc/src/snmpa_mib_data.xml
@@ -0,0 +1,392 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2013</year><year>2013</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      The contents of this file are subject to the Erlang Public License,
+      Version 1.1, (the "License"); you may not use this file except in
+      compliance with the License. You should have received a copy of the
+      Erlang Public License along with this software. If not, it can be
+      retrieved online at http://www.erlang.org/.
+    
+      Software distributed under the License is distributed on an "AS IS"
+      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+      the License for the specific language governing rights and limitations
+      under the License.
+    
+    </legalnotice>
+
+    <title>snmpa_mib_data</title>
+    <prepared></prepared>
+    <docno></docno>
+    <date></date>
+    <rev></rev>
+    <file>snmpa_mib_data.xml</file>
+  </header>
+
+  <module>snmpa_mib_data</module>
+  <modulesummary>Behaviour module for the SNMP agent mib-server 
+  data module.</modulesummary>
+  <description>
+    <p>This module defines the behaviour of the SNMP agent mib-server 
+    data module. A <c>snmpa_mib_data</c> compliant module 
+    must export the following functions: </p>
+    <list type="bulleted">
+      <item>
+	<seealso marker="#new">new/1</seealso>
+      </item>
+      <item>
+	<seealso marker="#close">close/1</seealso>
+      </item>
+      <item>
+	<seealso marker="#sync">sync/1</seealso>
+      </item>
+      <item>
+	<seealso marker="#load_mib">load_mib/4</seealso>
+      </item>
+      <item>
+	<seealso marker="#unload_mib">unload_mib/4</seealso>
+      </item>
+      <item>
+	<seealso marker="#lookup">lookup/2</seealso>
+      </item>
+      <item>
+	<seealso marker="#next">next/3</seealso>
+      </item>
+      <item>
+	<seealso marker="#register_subagent">register_subagent/3</seealso>
+      </item>
+      <item>
+	<seealso marker="#unregister_subagent">unregister_subagent/2</seealso>
+      </item>
+      <item>
+	<seealso marker="#which_mib">which_mib/2</seealso>
+      </item>
+      <item>
+	<seealso marker="#which_mibs">which_mibs/1</seealso>
+      </item>
+      <item>
+	<seealso marker="#whereis_mib">whereis_mib/2</seealso>
+      </item>
+      <item>
+	<seealso marker="#dump">dump/2</seealso>
+      </item>
+      <item>
+	<seealso marker="#info">info/1</seealso>
+      </item>
+      <item>
+	<seealso marker="#backup">backup/2</seealso>
+      </item>
+      <item>
+	<seealso marker="#code_change">code_change/4</seealso>
+      </item>
+    </list>
+
+    <p>The semantics of them and their exact signatures are 
+    explained below. </p>
+
+    <p>Note that the data extracted from the imported (loaded) 
+    mibs are stored partly by the mib-server and partly by the 
+    symbolic-store server. See the default mib-server data 
+    module, <c>snmpa_mib_data_tttn</c> for details. </p>
+
+  </description>
+
+  <section>
+    <title>CALLBACK FUNCTIONS</title>
+    <p>The following functions must be exported from a 
+    <c>mib-server</c> data callback module: </p>
+
+    <marker id="new"></marker>
+  </section>
+
+  <funcs>
+    <func>
+      <name>Module:new(Storage) -> State</name>
+      <fsummary>Create new (mib-server) data instance</fsummary>
+      <type>
+        <v>Storage = mib_storage()</v>
+        <v>State = term()</v>
+      </type>
+      <desc>
+        <p>Create a new mib-server data instance. </p>
+
+        <marker id="close"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:close(State) -> void()</name>
+      <fsummary>Close the mib-server data instance</fsummary>
+      <type>
+        <v>State = term()</v>
+      </type>
+      <desc>
+        <p>Close the mib-storage.</p>
+
+        <marker id="sync"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:sync(State) -> void()</name>
+      <fsummary>Synchronize to disc</fsummary>
+      <type>
+        <v>State = term()</v>
+      </type>
+      <desc>
+        <p>Synchronize (write to disc, if possible) the mib-server data. 
+	This depends on the <c>mib_storage</c> option, and will only have 
+	an effect if the mib-storage option has an actual disc component 
+	(such as dets, or ets with a file). </p>
+
+        <marker id="load_mib"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:load_mib(State, Filename, MeOverride, TeOverride) -> {ok, NewState} | {error, Reason}</name>
+      <fsummary>Load a mib into the mib-server</fsummary>
+      <type>
+        <v>State = NewState = term()</v>
+        <v>Filename = filename()</v>
+        <v>MeOverride = boolean()</v>
+        <v>TeOverride = boolean()</v>
+        <v>Reason = already_loaded | term()</v>
+      </type>
+      <desc>
+        <p>Load the mib specified by the <c>Filename</c> argument 
+	into the mib-server. 
+	The <c>MeOverride</c> and <c>TeOverride</c> arguments 
+	specifies how the mib-server shall handle duplicate mib- and trap-
+	entries. </p>
+
+        <marker id="unload_mib"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:unload_mib(State, Filename) -> {ok, NewState} | {error, Reason}</name>
+      <fsummary>Unload mib from the mib-server</fsummary>
+      <type>
+        <v>State = NewState = term()</v>
+        <v>Filename = filename()</v>
+        <v>Reason = not_loaded | term()</v>
+      </type>
+      <desc>
+        <p>Unload the mib specified by the <c>Filename</c> argument 
+	from the mib-server. </p>
+
+        <marker id="lookup"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:lookup(State, Oid) -> Reply</name>
+      <fsummary>Find the mib-entry corresponding to the Oid</fsummary>
+      <type>
+        <v>State = term()</v>
+        <v>Reply = {variable, ME} | {table_column, ME, TEOid} | {subagent, SAPid, SAOid} | {false, Reason}</v>
+        <v>Oid = TEOid = SAOid = oid()</v>
+        <v>SAPid = pid()</v>
+        <v>ME = me()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>Find the mib-entry corresponding to the <c>Oid</c>. 
+	If it is a variable, the <c>Oid</c> must be 
+	&lt;Oid for var&gt;.0 
+	and if it is a table, <c>Oid</c> must be 
+	&lt;table&gt;.&lt;entry&gt;.&lt;col&gt;.&lt;any&gt;.</p>
+
+        <marker id="next"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:next(State, Oid, MibView) -> Reply</name>
+      <fsummary>Finds the lexicographically next oid</fsummary>
+      <type>
+        <v>State = term()</v>
+        <v>Reply = false | endOfTable | {subagent, SAPid, SAOid} | {variable, ME, VarOid} | {table, TableOid, TableRestOid, ME}</v>
+        <v>Oid = SAOid = VarOid = TableOid = TableRestOid = oid()</v>
+        <v>SAPid = pid()</v>
+        <v>ME = me()</v>
+      </type>
+      <desc>
+        <p>Finds the lexicographically next oid. </p>
+
+        <marker id="register_subagent"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:register_subagent(State, Oid, Pid) -> Reply</name>
+      <fsummary>Register the subagent</fsummary>
+      <type>
+        <v>State = NewState = term()</v>
+        <v>Reply = {ok, NewState} | {error, Reason}</v>
+        <v>Oid = oid()</v>
+        <v>Pid = pid()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>Register the subagent, process, 
+	handling part of the mib-tree. </p>
+
+        <marker id="unregister_subagent"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:unregister_subagent(State, PidOrOid) -> Reply</name>
+      <fsummary>Unregister the subagent</fsummary>
+      <type>
+        <v>State = NewState = term()</v>
+        <v>Reply = {ok, NewState} | {ok, NewState, Pid} | {error, Reason}</v>
+        <v>PidOrOid = pid() | oid()</v>
+        <v>Pid = pid()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>Unregister the subagent, handling part of the mib-tree, 
+	as specified by the <c>oid()</c> or <c>pid()</c> 
+	(<c>PidOrOid</c>). </p>
+        <p>When unregister the subagent using an <c>oid()</c>, the <c>pid()</c> 
+	of the process handling the sub-tree is also returned. </p>
+
+        <marker id="dump"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:dump(State, Destination) -> Reply</name>
+      <fsummary>Unregister the subagent</fsummary>
+      <type>
+        <v>State = term()</v>
+        <v>Reply = ok | {error, Reason}</v>
+        <v>Destination = io | filename()</v>
+        <v>Pid = pid()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>Dump the mib-server data to <c>stdio</c> (Destination = <c>io</c>) or
+	the specified file. </p>
+
+        <marker id="which_mib"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:which_mib(State, Oid) -> Reply</name>
+      <fsummary>Retrieve the mib file for an oid()</fsummary>
+      <type>
+        <v>State = term()</v>
+        <v>Reply = {ok, MibFile} | {error, Reason}</v>
+        <v>Oid = oid()</v>
+        <v>MibFile = string()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>Retrieve the mib-file to which an given <c>oid()</c> belongs. </p>
+
+        <marker id="which_mibs"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:which_mibs(State) -> Reply</name>
+      <fsummary>Retrieve all loaded mib files</fsummary>
+      <type>
+        <v>State = term()</v>
+        <v>Reply = [{MibName, Filename}]</v>
+        <v>MibName = atom()</v>
+        <v>Filename = string()</v>
+      </type>
+      <desc>
+        <p>Retrieve all loaded mib-files. </p>
+
+        <marker id="whereis_mib"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:whereis_mib(State, MibName) -> Reply</name>
+      <fsummary>Retrieve the mib file for the mib</fsummary>
+      <type>
+        <v>State = term()</v>
+        <v>MibName = atom()</v>
+        <v>Reply = {ok, Filename} | {error, Reason}</v>
+        <v>Filename = string()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>Retrieve the mib file for the mib. </p>
+
+        <marker id="info"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:info(State) -> Reply</name>
+      <fsummary>Retrieve misc info for the mib data</fsummary>
+      <type>
+        <v>State = term()</v>
+        <v>Reply = {ok, Filename} | {error, Reason}</v>
+        <v>Filename = string()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>Retrieve misc info for the mib data. </p>
+        <p>This is a utility function used to inspect, for instance, 
+	memory usage, in a simple way. </p>
+
+        <marker id="backup"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:backup(State, BackupDir) -> Reply</name>
+      <fsummary>Perform a backup of the mib-server data</fsummary>
+      <type>
+        <v>State = term()</v>
+        <v>Reply = ok | {error, Reason}</v>
+        <v>BackupDir = string()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>Perform a backup of the mib-server data. </p>
+        <p>Note that its implementation dependant (and also 
+	dependent on mib-storage is used) if a backup is possible. </p>
+
+        <marker id="code_change"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:code_change(Destination, Vsn, Extra, State) -> NewState</name>
+      <fsummary>Perform a code-change</fsummary>
+      <type>
+        <v>Destination = up | down</v>
+        <v>Vsn = term()</v>
+        <v>Extra = term()</v>
+        <v>State = NewState = term()</v>
+      </type>
+      <desc>
+        <p>Perform a code-change (upgrade or downgrade). </p>
+        <p>See 
+	<seealso marker="gen_server">gen_server</seealso>
+	for more info regarding the <c>Vsn</c> and <c>Extra</c> arguments. </p>
+
+      </desc>
+    </func>
+
+  </funcs>
+  
+</erlref>
+
diff --git a/lib/snmp/doc/src/snmpa_mib_storage.xml b/lib/snmp/doc/src/snmpa_mib_storage.xml
new file mode 100644
index 0000000000..a857ce79e8
--- /dev/null
+++ b/lib/snmp/doc/src/snmpa_mib_storage.xml
@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<!DOCTYPE erlref SYSTEM "erlref.dtd">
+
+<erlref>
+  <header>
+    <copyright>
+      <year>2013</year><year>2013</year>
+      <holder>Ericsson AB. All Rights Reserved.</holder>
+    </copyright>
+    <legalnotice>
+      The contents of this file are subject to the Erlang Public License,
+      Version 1.1, (the "License"); you may not use this file except in
+      compliance with the License. You should have received a copy of the
+      Erlang Public License along with this software. If not, it can be
+      retrieved online at http://www.erlang.org/.
+    
+      Software distributed under the License is distributed on an "AS IS"
+      basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+      the License for the specific language governing rights and limitations
+      under the License.
+    
+    </legalnotice>
+
+    <title>snmpa_mib_storage</title>
+    <prepared></prepared>
+    <docno></docno>
+    <date></date>
+    <rev></rev>
+    <file>snmpa_mib_storage.xml</file>
+  </header>
+
+  <module>snmpa_mib_storage</module>
+  <modulesummary>
+    Behaviour module for the SNMP agent mib storage. 
+  </modulesummary>
+  <description>
+    <p>This module defines the behaviour of the SNMP agent mib storage. </p>
+    <p>The mib storage is used by the agent to store internal mib-
+    related information. The mib storage module is used by several entities, 
+    not just the mib-server. </p>
+
+    <p>A <c>snmpa_mib_storage</c> compliant module 
+    must export the following functions: </p>
+    <list type="bulleted">
+      <item>
+	<seealso marker="#open">open/5</seealso>
+      </item>
+      <item>
+	<seealso marker="#close">close/1</seealso>
+      </item>
+      <item>
+	<seealso marker="#read">read/2</seealso>
+      </item>
+      <item>
+	<seealso marker="#write">write/2</seealso>
+      </item>
+      <item>
+	<seealso marker="#delete1">delete/1</seealso>
+      </item>
+      <item>
+	<seealso marker="#delete2">delete/2</seealso>
+      </item>
+      <item>
+	<seealso marker="#match_object">match_object/2</seealso>
+      </item>
+      <item>
+	<seealso marker="#match_delete">match_delete/2</seealso>
+      </item>
+      <item>
+	<seealso marker="#tab2list">tab2list/1</seealso>
+      </item>
+      <item>
+	<seealso marker="#info">info/1</seealso>
+      </item>
+      <item>
+	<seealso marker="#sync">sync/1</seealso>
+      </item>
+      <item>
+	<seealso marker="#backup">backup/2</seealso>
+      </item>
+    </list>
+
+    <p>The semantics of them and their exact signatures are 
+    explained below. </p>
+
+  </description>
+
+  <section>
+    <title>CALLBACK FUNCTIONS</title>
+    <p>The following functions must be exported from a 
+    <c>mib-server</c> data callback module: </p>
+
+    <marker id="open"></marker>
+  </section>
+
+  <funcs>
+    <func>
+      <name>Module:open(Name, RecordName, Fields, Type, Options) -> {ok, TabId} | {error, Reason}</name>
+      <fsummary>Create new (mib-server) data instance</fsummary>
+      <type>
+        <v>Name = atom()</v>
+        <v>RecordName = atom()</v>
+        <v>Fields = [atom()]</v>
+        <v>Type = set | bag()</v>
+        <v>Options = list()</v>
+        <v>TabId = term()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>Create or open a mib storage table. </p>
+	<p>Note that the <c>RecordName</c> and <c>Fields</c> arguments 
+	my not be used in all implementations (they are actually only 
+	needed for mnesia-based implementations). </p>
+
+	<p>Note also that the <c>Options</c> argument comes from
+	the <c>options</c> config option of the mib-storage config option, 
+	and is passed on as is. </p>
+
+        <marker id="close"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:close(TabId) -> void()</name>
+      <fsummary>Close the mib-storage table</fsummary>
+      <type>
+        <v>State = term()</v>
+      </type>
+      <desc>
+        <p>Close the mib-storage table.</p>
+
+        <marker id="read"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:read(TabId, Key) -> false | {value, Record}</name>
+      <fsummary>Read a record from the mib-storage table</fsummary>
+      <type>
+        <v>TabId = term()</v>
+        <v>Key = term()</v>
+        <v>Record = tuple()</v>
+      </type>
+      <desc>
+        <p>Read a record from the mib-storage table. </p>
+
+        <marker id="write"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:write(TabId, Record) -> ok | {error, Reason}</name>
+      <fsummary>Write a record to the mib-storage table</fsummary>
+      <type>
+        <v>TabId = term()</v>
+        <v>Record = tuple()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>Write a record to the mib-storage table. </p>
+
+        <marker id="delete1"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:delete(TabId) -> void()</name>
+      <fsummary>Delete an entire mib-storage table</fsummary>
+      <type>
+        <v>TabId = term()</v>
+      </type>
+      <desc>
+        <p>Delete an entire mib-storage table. </p>
+
+        <marker id="delete2"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:delete(TabId, Key) -> ok | {error, Reason}</name>
+      <fsummary>Delete a record from the mib-storage table</fsummary>
+      <type>
+        <v>TabId = term()</v>
+        <v>Key = term()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>Delete a record from the mib-storage table. </p>
+
+        <marker id="match_object"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:match_object(TabId, Pattern) -> {ok, Recs} | {error, Reason}</name>
+      <fsummary>Search the mib-storage table for record matching pattern</fsummary>
+      <type>
+        <v>TabId = term()</v>
+        <v>Pattern = match_pattern()</v>
+        <v>Recs = [tuple()]</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>Search the mib-storage table for record that match the
+	specified pattern. </p>
+
+        <marker id="match_delete"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:match_delete(TabId, Pattern) -> {ok, Recs} | {error, Reason}</name>
+      <fsummary>Delete records in the mib-storage table matching pattern</fsummary>
+      <type>
+        <v>TabId = term()</v>
+        <v>Pattern = match_pattern()</v>
+        <v>Recs = [tuple()]</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>Search the mib-storage table for record that match the
+	specified pattern and then delete them. The records deleted are
+	also returned. </p>
+
+        <marker id="tab2list"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:tab2list(TabId) -> Recs</name>
+      <fsummary>Return all records of the mib-storage table</fsummary>
+      <type>
+        <v>TabId = term()</v>
+        <v>Recs = [tuple()]</v>
+      </type>
+      <desc>
+        <p>Return all records in the mib-storage table in the form 
+	of a list. </p>
+
+        <marker id="info"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:info(TabId) -> {ok, Info} | {error, Reason}</name>
+      <fsummary>Returns information about the mib-storage table. </fsummary>
+      <type>
+        <v>TabId = term()</v>
+        <v>Info = term()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>Retrieve implementation dependent mib-storage table 
+	information. </p>
+
+        <marker id="sync"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:sync(TabId) -> void()</name>
+      <fsummary>Synchronize mib-storage table</fsummary>
+      <type>
+        <v>TabId = term()</v>
+      </type>
+      <desc>
+        <p>Synchronize the mib-storage table. </p>
+	<p>What this means, if anything, is implementation dependent. </p>
+
+        <marker id="backup"></marker>
+      </desc>
+    </func>
+
+    <func>
+      <name>Module:backup(TabId, BackupDir) -> ok | {error, Reason}</name>
+      <fsummary>Perform a backup of the mib-storage table</fsummary>
+      <type>
+        <v>TabId = term()</v>
+        <v>BackupDir = string()</v>
+        <v>Reason = term()</v>
+      </type>
+      <desc>
+        <p>Perform a backup of the mib-storage table. </p>
+        <p>What this means, if anything, is implementation dependent. </p>
+
+      </desc>
+    </func>
+
+  </funcs>
+  
+</erlref>
+
diff --git a/lib/snmp/src/agent/depend.mk b/lib/snmp/src/agent/depend.mk
index ea9261e266..4b12b66e3b 100644
--- a/lib/snmp/src/agent/depend.mk
+++ b/lib/snmp/src/agent/depend.mk
@@ -77,10 +77,6 @@ $(EBIN)/snmpa_error_logger.$(EMULATOR): \
 	snmpa_error_report.erl \
 	snmpa_error_logger.erl
 
-$(EBIN)/snmpa_general_db.$(EMULATOR): \
-	snmpa_general_db.erl \
-	../misc/snmp_verbosity.hrl
-
 $(EBIN)/snmpa_local_db.$(EMULATOR): \
 	snmpa_local_db.erl \
 	../misc/snmp_debug.hrl \
@@ -88,6 +84,18 @@ $(EBIN)/snmpa_local_db.$(EMULATOR): \
 	../../include/snmp_types.hrl \
 	../../include/STANDARD-MIB.hrl
 
+$(EBIN)/snmpa_mib_storage.$(EMULATOR): \
+	snmpa_mib_storage.erl
+
+$(EBIN)/snmpa_mib_storage_ets.$(EMULATOR): \
+	snmpa_mib_storage_ets.erl
+
+$(EBIN)/snmpa_mib_storage_dets.$(EMULATOR): \
+	snmpa_mib_storage_dets.erl
+
+$(EBIN)/snmpa_mib_storage_mnesia.$(EMULATOR): \
+	snmpa_mib_storage_mnesia.erl
+
 $(EBIN)/snmpa_mib.$(EMULATOR): \
 	snmpa_mib.erl \
 	../misc/snmp_debug.hrl \
@@ -96,6 +104,10 @@ $(EBIN)/snmpa_mib.$(EMULATOR): \
 
 $(EBIN)/snmpa_mib_data.$(EMULATOR): \
 	snmpa_mib_data.erl \
+	../../include/snmp_types.hrl
+
+$(EBIN)/snmpa_mib_data_tttn.$(EMULATOR): \
+	snmpa_mib_data_tttn.erl \
 	../misc/snmp_debug.hrl \
 	../misc/snmp_verbosity.hrl \
 	../../include/snmp_types.hrl
diff --git a/lib/snmp/src/agent/modules.mk b/lib/snmp/src/agent/modules.mk
index 33ab41b434..34765475b9 100644
--- a/lib/snmp/src/agent/modules.mk
+++ b/lib/snmp/src/agent/modules.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2004-2009. All Rights Reserved.
+# Copyright Ericsson AB 2004-2013. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -21,15 +21,21 @@ BEHAVIOUR_MODULES = \
 	snmpa_authentication_service \
 	snmpa_discovery_handler \
 	snmpa_error_report \
+	snmpa_mib_storage \
+	snmpa_mib_data \
 	snmpa_network_interface \
 	snmpa_network_interface_filter \
 	snmpa_notification_delivery_info_receiver \
 	snmpa_notification_filter \
 	snmpa_set_mechanism
 
+# snmpa is "plain" interface module but also defines some agent specific types
+# and therefor must be compiled before the modules that use them, including
+# the behaviour modules...
+# snmpa_mib_data_ttln
 MODULES = \
-	$(BEHAVIOUR_MODULES) \
 	snmpa \
+	$(BEHAVIOUR_MODULES) \
 	snmpa_acm \
 	snmpa_agent \
 	snmpa_agent_sup \
@@ -39,10 +45,12 @@ MODULES = \
 	snmpa_error \
 	snmpa_error_io \
 	snmpa_error_logger \
-	snmpa_general_db \
 	snmpa_local_db \
+	snmpa_mib_storage_ets \
+	snmpa_mib_storage_dets \
+	snmpa_mib_storage_mnesia \
 	snmpa_mib \
-	snmpa_mib_data \
+	snmpa_mib_data_tttn \
 	snmpa_mib_lib \
 	snmpa_misc_sup \
 	snmpa_mpd \
diff --git a/lib/snmp/src/agent/snmp_user_based_sm_mib.erl b/lib/snmp/src/agent/snmp_user_based_sm_mib.erl
index e675cf1b83..223d3f7218 100644
--- a/lib/snmp/src/agent/snmp_user_based_sm_mib.erl
+++ b/lib/snmp/src/agent/snmp_user_based_sm_mib.erl
@@ -1219,16 +1219,10 @@ split(N, [H | T], FirstRev) when N > 0 ->
     split(N-1, T, [H | FirstRev]).
 
 
-is_crypto_supported(Algo) ->
-    %% The 'catch' handles the case when 'crypto' is
-    %% not present in the system (or not started).
-    Supported = crypto:supports(),
-    Hashs = proplists:get_value(hashs, Supported),
-    Ciphers = proplists:get_value(ciphers, Supported),
-    case catch lists:member(Algo, Hashs ++ Ciphers) of
-	true -> true;
-	_ -> false
-    end.
+-compile({inline, [{is_crypto_supported,1}]}).
+is_crypto_supported(Func) ->
+    snmp_misc:is_crypto_supported(Func). 
+
 
 inconsistentValue(V) -> throw({inconsistentValue, V}).
 inconsistentName(N)  -> throw({inconsistentName,  N}).
diff --git a/lib/snmp/src/agent/snmpa.erl b/lib/snmp/src/agent/snmpa.erl
index b45a47ec6b..14b93439df 100644
--- a/lib/snmp/src/agent/snmpa.erl
+++ b/lib/snmp/src/agent/snmpa.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -111,13 +111,44 @@
 
 -export([print_mib_info/0, print_mib_tables/0, print_mib_variables/0]).
 
+-export_type([
+              me/0, 
+
+	      %% Agent config types
+	      mib_storage/0, 
+	      mib_storage_opt/0, 
+	      mib_storage_module/0, 
+	      mib_storage_options/0
+             ]).
+
+-deprecated([{old_info_format, 1, next_major_release}]).
+
+
 -include("snmpa_atl.hrl").
 -include("snmpa_internal.hrl").
+-include_lib("snmp/include/snmp_types.hrl"). % type of me needed. 
 
 -define(DISCO_EXTRA_INFO, undefined).
 
 
 %%-----------------------------------------------------------------
+%% Types
+%%-----------------------------------------------------------------
+
+-type me() :: #me{}.
+
+%% Agent config types
+-type mib_storage() :: [mib_storage_opt()].
+-type mib_storage_opt() :: {module,  mib_storage_module()} | 
+                           {options, mib_storage_options()}.
+
+%% Module implementing the snmpa_mib_storage behaviour
+-type mib_storage_module()  :: atom(). 
+%% Options specific to the above module
+-type mib_storage_options() :: list().
+
+
+%%-----------------------------------------------------------------
 %% This utility function is used to convert an old SNMP application
 %% config (prior to snmp-4.0) to a SNMP agent config (as of 
 %% snmp-4.0).
diff --git a/lib/snmp/src/agent/snmpa_agent.erl b/lib/snmp/src/agent/snmpa_agent.erl
index 57846db13b..c267ce5a70 100644
--- a/lib/snmp/src/agent/snmpa_agent.erl
+++ b/lib/snmp/src/agent/snmpa_agent.erl
@@ -159,12 +159,15 @@
 %% it is sent to the worker, and the worker is marked as busy.
 %% If a request is received when the worker is busy, a new temporary
 %% worker is spawned.
+%% 
 %% Code change
 %% ===========
 %% Note that the worker(s) execute the same module as the master
 %% agent. For code change we have two options - ignore the workers,
 %% or send them a code change message.
+%% 
 %%-----------------------------------------------------------------
+
 -record(state, {type, 
 		parent, 
 		worker, 
@@ -219,22 +222,19 @@
 %%-----------------------------------------------------------------
 start_link(Prio, Parent, Ref, Options) ->
     ?d("start_link -> entry with"
-	"~n   Prio:    ~p"
-	"~n   Parent:  ~p"
-	"~n   Ref:     ~p"
-	"~n   Options: ~p", [Prio, Parent, Ref, Options]),
-    %% gen_server:start_link(?MODULE, [Prio, Parent, Ref, Options], []).
+       "~n   Prio:    ~p"
+       "~n   Parent:  ~p"
+       "~n   Ref:     ~p"
+       "~n   Options: ~p", [Prio, Parent, Ref, Options]),
     ?GS_START_LINK3(Prio, Parent, Ref, Options).
 
 start_link(Prio, Name, Parent, Ref, Options) ->
     ?d("start_link -> entry with"
-	"~n   Prio:    ~p"
-	"~n   Name:    ~p"
-	"~n   Parent:  ~p"
-	"~n   Ref:     ~p"
-	"~n   Options: ~p", [Prio, Name, Parent, Ref, Options]),
-%     gen_server:start_link({local, Name}, ?MODULE, 
-% 			  [Prio, Parent, Ref, Options], []).
+       "~n   Prio:    ~p"
+       "~n   Name:    ~p"
+       "~n   Parent:  ~p"
+       "~n   Ref:     ~p"
+       "~n   Options: ~p", [Prio, Name, Parent, Ref, Options]),
     ?GS_START_LINK4(Prio, Name, Parent, Ref, Options).
 
 stop(Agent) -> call(Agent, stop).
@@ -335,10 +335,10 @@ increment_counter(Counter, Initial, Max) ->
 
 init([Prio, Parent, Ref, Options]) ->
     ?d("init -> entry with"
-	"~n   Prio:    ~p"
-	"~n   Parent:  ~p"
-	"~n   Ref:     ~p"
-	"~n   Options: ~p", [Prio, Parent, Ref, Options]),
+       "~n   Prio:    ~p"
+       "~n   Parent:  ~p"
+       "~n   Ref:     ~p"
+       "~n   Options: ~p", [Prio, Parent, Ref, Options]),
     case (catch do_init(Prio, Parent, Ref, Options)) of
 	{ok, State} ->
 	    ?vdebug("started",[]),
@@ -1457,80 +1457,80 @@ handle_mibs_cache_request(MibServer, Req) ->
 
 %% Downgrade
 %%
-code_change({down, _Vsn}, S1, downgrade_to_pre_4_17_3) ->
-    #state{type               = Type, 
-	   parent             = Parent, 
-	   worker             = Worker, 
-	   worker_state       = WorkerState,
-	   set_worker         = SetWorker, 
-	   multi_threaded     = MT, 
-	   ref                = Ref, 
-	   vsns               = Vsns,
-	   nfilters           = NF,
-	   note_store         = NoteStore,
-	   mib_server         = MS, 
-	   net_if             = NetIf, 
-	   net_if_mod         = NetIfMod, 
-	   backup             = Backup,
-	   disco              = Disco,
-	   mibs_cache_request = MCR} = S1, 
-    S2 = {state, 
-	  type               = Type, 
-	  parent             = Parent, 
-	  worker             = Worker, 
-	  worker_state       = WorkerState,
-	  set_worker         = SetWorker, 
-	  multi_threaded     = MT, 
-	  ref                = Ref, 
-	  vsns               = Vsns,
-	  nfilters           = NF,
-	  note_store         = NoteStore,
-	  mib_server         = MS, 
-	  net_if             = NetIf, 
-	  net_if_mod         = NetIfMod, 
-	  backup             = Backup,
-	  disco              = Disco,
-	  mibs_cache_request = MCR}, 
-    {ok, S2};
-
-%% Upgrade
-%%
-code_change(_Vsn, S1, upgrade_from_pre_4_17_3) ->
-    {state, 
-     type               = Type, 
-     parent             = Parent, 
-     worker             = Worker, 
-     worker_state       = WorkerState,
-     set_worker         = SetWorker, 
-     multi_threaded     = MT, 
-     ref                = Ref, 
-     vsns               = Vsns,
-     nfilters           = NF,
-     note_store         = NoteStore,
-     mib_server         = MS, 
-     net_if             = NetIf, 
-     net_if_mod         = NetIfMod, 
-     backup             = Backup,
-     disco              = Disco,
-     mibs_cache_request = MCR} = S1,
-    S2 = #state{type               = Type, 
-		parent             = Parent, 
-		worker             = Worker, 
-		worker_state       = WorkerState,
-		set_worker         = SetWorker, 
-		multi_threaded     = MT, 
-		ref                = Ref, 
-		vsns               = Vsns,
-		nfilters           = NF,
-		note_store         = NoteStore,
-		mib_server         = MS, 
-		net_if             = NetIf, 
-		net_if_mod         = NetIfMod, 
-		backup             = Backup,
-		disco              = Disco,
-		mibs_cache_request = MCR,
-		gb_max_vbs         = ?DEFAULT_GB_MAX_VBS}, 
-    {ok, S2};
+%% code_change({down, _Vsn}, S1, downgrade_to_pre_4_17_3) ->
+%%     #state{type               = Type, 
+%% 	   parent             = Parent, 
+%% 	   worker             = Worker, 
+%% 	   worker_state       = WorkerState,
+%% 	   set_worker         = SetWorker, 
+%% 	   multi_threaded     = MT, 
+%% 	   ref                = Ref, 
+%% 	   vsns               = Vsns,
+%% 	   nfilters           = NF,
+%% 	   note_store         = NoteStore,
+%% 	   mib_server         = MS, 
+%% 	   net_if             = NetIf, 
+%% 	   net_if_mod         = NetIfMod, 
+%% 	   backup             = Backup,
+%% 	   disco              = Disco,
+%% 	   mibs_cache_request = MCR} = S1, 
+%%     S2 = {state, 
+%% 	  type               = Type, 
+%% 	  parent             = Parent, 
+%% 	  worker             = Worker, 
+%% 	  worker_state       = WorkerState,
+%% 	  set_worker         = SetWorker, 
+%% 	  multi_threaded     = MT, 
+%% 	  ref                = Ref, 
+%% 	  vsns               = Vsns,
+%% 	  nfilters           = NF,
+%% 	  note_store         = NoteStore,
+%% 	  mib_server         = MS, 
+%% 	  net_if             = NetIf, 
+%% 	  net_if_mod         = NetIfMod, 
+%% 	  backup             = Backup,
+%% 	  disco              = Disco,
+%% 	  mibs_cache_request = MCR}, 
+%%     {ok, S2};
+
+%% %% Upgrade
+%% %%
+%% code_change(_Vsn, S1, upgrade_from_pre_4_17_3) ->
+%%     {state, 
+%%      type               = Type, 
+%%      parent             = Parent, 
+%%      worker             = Worker, 
+%%      worker_state       = WorkerState,
+%%      set_worker         = SetWorker, 
+%%      multi_threaded     = MT, 
+%%      ref                = Ref, 
+%%      vsns               = Vsns,
+%%      nfilters           = NF,
+%%      note_store         = NoteStore,
+%%      mib_server         = MS, 
+%%      net_if             = NetIf, 
+%%      net_if_mod         = NetIfMod, 
+%%      backup             = Backup,
+%%      disco              = Disco,
+%%      mibs_cache_request = MCR} = S1,
+%%     S2 = #state{type               = Type, 
+%% 		parent             = Parent, 
+%% 		worker             = Worker, 
+%% 		worker_state       = WorkerState,
+%% 		set_worker         = SetWorker, 
+%% 		multi_threaded     = MT, 
+%% 		ref                = Ref, 
+%% 		vsns               = Vsns,
+%% 		nfilters           = NF,
+%% 		note_store         = NoteStore,
+%% 		mib_server         = MS, 
+%% 		net_if             = NetIf, 
+%% 		net_if_mod         = NetIfMod, 
+%% 		backup             = Backup,
+%% 		disco              = Disco,
+%% 		mibs_cache_request = MCR,
+%% 		gb_max_vbs         = ?DEFAULT_GB_MAX_VBS}, 
+%%     {ok, S2};
 
 code_change(_Vsn, S, _Extra) ->
     {ok, S}.
@@ -4411,7 +4411,7 @@ get_mibs(Opts) ->
     get_option(mibs, Opts, []).
 
 get_mib_storage(Opts) ->
-    get_option(mib_storage, Opts, ets).
+    get_option(mib_storage, Opts).
 
 get_set_mechanism(Opts) ->
     get_option(set_mechanism, Opts, snmpa_set).
@@ -4450,6 +4450,9 @@ net_if_verbosity(_Pid,_Verbosity) ->
     ok.
 
 
+get_option(Key, Opts) ->
+    snmp_misc:get_option(Key, Opts).
+
 get_option(Key, Opts, Default) ->
     snmp_misc:get_option(Key, Opts, Default).
 
diff --git a/lib/snmp/src/agent/snmpa_agent_sup.erl b/lib/snmp/src/agent/snmpa_agent_sup.erl
index 9b8c4d12a6..2805e2dc0d 100644
--- a/lib/snmp/src/agent/snmpa_agent_sup.erl
+++ b/lib/snmp/src/agent/snmpa_agent_sup.erl
@@ -29,10 +29,12 @@
 -export([init/1]).
 
 -define(SERVER, ?MODULE).
+%% Always use plain ets for sub-agents
 -ifdef(snmp_debug).
--define(DEFAULT_OPTS, [{verbosity, trace}]).
+-define(DEFAULT_SA_OPTS, [{mib_storage, [{module, snmpa_mib_storage_ets}]}, 
+			  {verbosity, trace}]).
 -else.
--define(DEFAULT_OPTS, []).
+-define(DEFAULT_SA_OPTS, [{mib_storage, [{module, snmpa_mib_storage_ets}]}]).
 -endif.
 
 
@@ -63,8 +65,8 @@ start_subagent(ParentAgent, Subtree, Mibs) ->
     Ref = make_ref(),
     ?d("start_subagent -> Ref: ~p", [Ref]),
     Options = [{priority, Prio}, 
-	       {mibs, Mibs}, 
-	       {misc_sup, snmpa_misc_sup} | ?DEFAULT_OPTS],
+	       {mibs,     Mibs}, 
+	       {misc_sup, snmpa_misc_sup} | ?DEFAULT_SA_OPTS],
     Agent = {{sub_agent, Max},
 	     {snmpa_agent, start_link,
 	      [Prio, ParentAgent, Ref, Options]},
diff --git a/lib/snmp/src/agent/snmpa_mib.erl b/lib/snmp/src/agent/snmpa_mib.erl
index 575a018c0c..031309b990 100644
--- a/lib/snmp/src/agent/snmpa_mib.erl
+++ b/lib/snmp/src/agent/snmpa_mib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -18,7 +18,6 @@
 %%
 -module(snmpa_mib).
 
-%% c(snmpa_mib).
 
 %%%-----------------------------------------------------------------
 %%% This module implements a MIB server.
@@ -75,12 +74,14 @@
 %% Internal Data structures
 %%
 %%   State
-%%       data - is the MIB data (defined in snmpa_mib_data)
+%%       data - is the MIB data (defined in mib_data module)
 %%       meo  - mib entry override
 %%       teo  - trap (notification) entry override
 %%-----------------------------------------------------------------
--record(state, {data, meo, teo, backup, 
-		cache, cache_tmr, cache_autogc, cache_gclimit, cache_age}).
+-record(state, 
+	{data, meo, teo, backup, 
+	 cache, cache_tmr, cache_autogc, cache_gclimit, cache_age, 
+	 data_mod}).
 
 
 
@@ -224,9 +225,9 @@ info(MibServer, Type) ->
     call(MibServer, {info, Type}).
 
 dump(MibServer) ->
-    call(MibServer, dump).
+    dump(MibServer, io).
 
-dump(MibServer, File) when is_list(File) ->
+dump(MibServer, File) when (File =:= io) orelse is_list(File) ->
     call(MibServer, {dump, File}).
 
 backup(MibServer, BackupDir) when is_list(BackupDir) ->
@@ -256,7 +257,7 @@ init([Prio, Mibs, Opts]) ->
 do_init(Prio, Mibs, Opts) ->
     process_flag(priority, Prio),
     process_flag(trap_exit, true),
-    put(sname,ms),
+    put(sname, ms),
     put(verbosity, ?vvalidate(get_verbosity(Opts))),
     ?vlog("starting",[]),
 
@@ -289,13 +290,19 @@ do_init(Prio, Mibs, Opts) ->
     MeOverride = get_me_override(Opts),
     TeOverride = get_te_override(Opts),
     MibStorage = get_mib_storage(Opts),
-    Data       = snmpa_mib_data:new(MibStorage),
-    ?vtrace("init -> mib data created",[]),
-    case (catch mib_operations(load_mib, Mibs, Data, 
+    MibDataMod = get_data_mod(Opts), 
+    ?vtrace("init -> try create mib data with"
+	    "~n   MeOverride: ~p"
+	    "~n   TeOverride: ~p"
+	    "~n   MibStorage: ~p", [MeOverride, TeOverride, MibStorage]),
+    Data       = MibDataMod:new(MibStorage),
+    ?vdebug("init -> mib data created", []),
+    case (catch mib_operations(MibDataMod, 
+			       load_mib, Mibs, Data, 
 			       MeOverride, TeOverride, true)) of
 	{ok, Data2} ->
 	    ?vdebug("started",[]),
-	    snmpa_mib_data:sync(Data2),
+	    MibDataMod:sync(Data2),
 	    ?vdebug("mib data synced",[]),
 	    {ok, #state{data          = Data2, 
 			teo           = TeOverride, 
@@ -304,7 +311,8 @@ do_init(Prio, Mibs, Opts) ->
 			cache_tmr     = CacheGcTimer, 
 			cache_autogc  = CacheAutoGC,
 			cache_gclimit = CacheGcLimit,
-			cache_age     = CacheAge}};
+			cache_age     = CacheAge, 
+			data_mod      = MibDataMod}};
 	{'aborted at', Mib, _NewData, Reason} ->
 	    ?vinfo("failed loading mib ~p: ~p",[Mib,Reason]),
 	    {error, {Mib, Reason}}
@@ -315,32 +323,34 @@ do_init(Prio, Mibs, Opts) ->
 %% Returns: {ok, NewMibData} | {'aborted at', Mib, NewData, Reason}
 %% Args: Operation is load_mib | unload_mib.
 %%----------------------------------------------------------------------
-mib_operations(Operation, Mibs, Data, MeOverride, TeOverride) ->
-    mib_operations(Operation, Mibs, Data, MeOverride, TeOverride, false). 
+mib_operations(Mod, Operation, Mibs, Data, MeOverride, TeOverride) ->
+    mib_operations(Mod, Operation, Mibs, Data, MeOverride, TeOverride, false). 
 
 
-mib_operations(_Operation, [], Data, _MeOverride, _TeOverride, _Force) ->
+mib_operations(_Mod, _Operation, [], Data, _MeOverride, _TeOverride, _Force) ->
     {ok, Data};
-mib_operations(Operation, [Mib|Mibs], Data0, MeOverride, TeOverride, Force) ->
+mib_operations(Mod, Operation, [Mib|Mibs], Data0, MeOverride, TeOverride, Force) ->
     ?vtrace("mib operations ~p on"
-	"~n   Mibs: ~p"
-	"~n   with "
-	"~n   MeOverride: ~p"
-	"~n   TeOverride: ~p"
-	"~n   Force:      ~p", [Operation,Mibs,MeOverride,TeOverride,Force]),
-    Data = mib_operation(Operation, Mib, Data0, MeOverride, TeOverride, Force),
-    mib_operations(Operation, Mibs, Data, MeOverride, TeOverride, Force).
-
-mib_operation(Operation, Mib, Data0, MeOverride, TeOverride, Force) 
+	    "~n   Mibs: ~p"
+	    "~n   with "
+	    "~n   MeOverride: ~p"
+	    "~n   TeOverride: ~p"
+	    "~n   Force:      ~p", 
+	    [Operation, Mibs, MeOverride, TeOverride, Force]),
+    Data = mib_operation(Mod, 
+			 Operation, Mib, Data0, MeOverride, TeOverride, Force),
+    mib_operations(Mod, Operation, Mibs, Data, MeOverride, TeOverride, Force).
+
+mib_operation(Mod, Operation, Mib, Data0, MeOverride, TeOverride, Force) 
   when is_list(Mib) ->
     ?vtrace("mib operation on mib ~p", [Mib]),
-    case apply(snmpa_mib_data, Operation, [Data0,Mib,MeOverride,TeOverride]) of
-	{error, 'already loaded'} when (Operation =:= load_mib) andalso  
+    case apply(Mod, Operation, [Data0, Mib, MeOverride, TeOverride]) of
+	{error, already_loaded} when (Operation =:= load_mib) andalso  
 				       (Force =:= true) ->
 	    ?vlog("ignore mib ~p -> already loaded", [Mib]),
 	    Data0;
-	{error, 'not loaded'} when (Operation =:= unload_mib) andalso 
-				   (Force =:= true) ->
+	{error, not_loaded} when (Operation =:= unload_mib) andalso 
+				 (Force =:= true) ->
 	    ?vlog("ignore mib ~p -> not loaded", [Mib]),
 	    Data0;
 	{error, Reason} ->
@@ -350,7 +360,7 @@ mib_operation(Operation, Mib, Data0, MeOverride, TeOverride, Force)
 	{ok, Data} ->
 	    Data
     end;
-mib_operation(_Op, Mib, Data, _MeOverride, _TeOverride, _Force) ->
+mib_operation(_Mod, _Op, Mib, Data, _MeOverride, _TeOverride, _Force) ->
     throw({'aborted at', Mib, Data, bad_mibname}).
 
 
@@ -395,15 +405,15 @@ handle_call({update_cache_opts, Key, Value}, _From, State) ->
     {reply, Result, NewState};
 
 handle_call({lookup, Oid}, _From, 
-	    #state{data = Data, cache = Cache} = State) ->
+	    #state{data = Data, cache = Cache, data_mod = Mod} = State) ->
     ?vlog("lookup ~p", [Oid]), 
     Key = {lookup, Oid}, 
     {Reply, NewState} = 
 	case maybe_cache_lookup(Cache, Key) of
 	    ?NO_CACHE ->
-		{snmpa_mib_data:lookup(Data, Oid), State};
+		{Mod:lookup(Data, Oid), State};
 	    [] ->
-		Rep = snmpa_mib_data:lookup(Data, Oid),
+		Rep = Mod:lookup(Data, Oid),
 		ets:insert(Cache, {Key, Rep, timestamp()}),
 		{Rep, maybe_start_cache_gc_timer(State)};
 	    [{Key, Rep, _}] ->
@@ -414,22 +424,23 @@ handle_call({lookup, Oid}, _From,
     ?vdebug("lookup -> Reply: ~p", [Reply]), 
     {reply, Reply, NewState};
 
-handle_call({which_mib, Oid}, _From, #state{data = Data} = State) ->
+handle_call({which_mib, Oid}, _From, 
+	    #state{data = Data, data_mod = Mod} = State) ->
     ?vlog("which_mib ~p",[Oid]),    
-    Reply = snmpa_mib_data:which_mib(Data, Oid),
+    Reply = Mod:which_mib(Data, Oid),
     ?vdebug("which_mib: ~p",[Reply]),    
     {reply, Reply, State};
 
 handle_call({next, Oid, MibView}, _From, 
-	    #state{data = Data, cache = Cache} = State) ->
+	    #state{data = Data, cache = Cache, data_mod = Mod} = State) ->
     ?vlog("next ~p [~p]", [Oid, MibView]), 
     Key = {next, Oid, MibView},
     {Reply, NewState} = 
 	case maybe_cache_lookup(Cache, Key) of
 	    ?NO_CACHE ->
-		{snmpa_mib_data:next(Data, Oid, MibView), State};
+		{Mod:next(Data, Oid, MibView), State};
 	    [] ->    
-		Rep = snmpa_mib_data:next(Data, Oid, MibView),
+		Rep = Mod:next(Data, Oid, MibView),
 		ets:insert(Cache, {Key, Rep, timestamp()}),
 		{Rep, maybe_start_cache_gc_timer(State)};
 	    [{Key, Rep, _}] ->
@@ -441,89 +452,99 @@ handle_call({next, Oid, MibView}, _From,
     {reply, Reply, NewState};
 
 handle_call({load_mibs, Mibs}, _From, 
-	    #state{data  = Data, 
-		   teo   = TeOverride, 
-		   meo   = MeOverride,
-		   cache = Cache} = State) ->
+	    #state{data         = Data, 
+		   teo          = TeOverride, 
+		   meo          = MeOverride,
+		   cache        = Cache, 
+		   data_mod     = Mod} = State) ->
     ?vlog("load mibs ~p",[Mibs]),    
     %% Invalidate cache
     NewCache = maybe_invalidate_cache(Cache),
-    {NData,Reply} = 
-	case (catch mib_operations(load_mib, Mibs, Data,
+    {NData, Reply} = 
+	case (catch mib_operations(Mod, load_mib, Mibs, Data,
 				   MeOverride, TeOverride)) of
 	    {'aborted at', Mib, NewData, Reason} ->
 		?vlog("aborted at ~p for reason ~p",[Mib,Reason]),    
-		{NewData,{error, {'load aborted at', Mib, Reason}}};
+		{NewData, {error, {'load aborted at', Mib, Reason}}};
 	    {ok, NewData} ->
-		{NewData,ok}
+		{NewData, ok}
 	end,
-    snmpa_mib_data:sync(NData),
+    Mod:sync(NData),
     {reply, Reply, State#state{data = NData, cache = NewCache}};
 
 handle_call({unload_mibs, Mibs}, _From, 
-	    #state{data  = Data, 
-		   teo   = TeOverride, 
-		   meo   = MeOverride,
-		   cache = Cache} = State) ->
+	    #state{data         = Data, 
+		   teo          = TeOverride, 
+		   meo          = MeOverride,
+		   cache        = Cache, 
+		   data_mod     = Mod} = State) ->
     ?vlog("unload mibs ~p",[Mibs]),    
     %% Invalidate cache
     NewCache = maybe_invalidate_cache(Cache),
     %% Unload mib(s)
-    {NData,Reply} = 
-	case (catch mib_operations(unload_mib, Mibs, Data,
+    {NData, Reply} = 
+	case (catch mib_operations(Mod, unload_mib, Mibs, Data,
 				   MeOverride, TeOverride)) of
 	    {'aborted at', Mib, NewData, Reason} ->
-		?vlog("aborted at ~p for reason ~p",[Mib,Reason]),    
+		?vlog("aborted at ~p for reason ~p", [Mib,Reason]),    
 		{NewData, {error, {'unload aborted at', Mib, Reason}}};
 	    {ok, NewData} ->
-		{NewData,ok}
+		{NewData, ok}
 	end,
-    snmpa_mib_data:sync(NData),
+    Mod:sync(NData),
     {reply, Reply, State#state{data = NData, cache = NewCache}};
 
-handle_call(which_mibs, _From, #state{data = Data} = State) ->
+handle_call(which_mibs, _From, #state{data = Data, data_mod = Mod} = State) ->
     ?vlog("which mibs",[]),    
-    Reply = snmpa_mib_data:which_mibs(Data),
+    Reply = Mod:which_mibs(Data),
     {reply, Reply, State};
 
-handle_call({whereis_mib, Mib}, _From, #state{data = Data} = State) ->
+handle_call({whereis_mib, Mib}, _From, 
+	    #state{data         = Data, 
+		   data_mod     = Mod} = State) ->
     ?vlog("whereis mib: ~p",[Mib]),    
-    Reply = snmpa_mib_data:whereis_mib(Data, Mib),
+    Reply = Mod:whereis_mib(Data, Mib),
     {reply, Reply, State};
 
 handle_call({register_subagent, Oid, Pid}, _From, 
-	    #state{data = Data, cache = Cache} = State) ->
+	    #state{data      = Data, 
+		   cache     = Cache, 
+		   data_mod  = Mod} = State) ->
     ?vlog("register subagent ~p, ~p",[Oid,Pid]),
     %% Invalidate cache
     NewCache = maybe_invalidate_cache(Cache),
-    case snmpa_mib_data:register_subagent(Data, Oid, Pid) of
+    case Mod:register_subagent(Data, Oid, Pid) of
 	{error, Reason} ->
 	    ?vlog("registration failed: ~p",[Reason]),    
 	    {reply, {error, Reason}, State#state{cache = NewCache}};
-	NewData ->
+	{ok, NewData} ->
 	    {reply, ok, State#state{data = NewData, cache = NewCache}}
     end;
 
 handle_call({unregister_subagent, OidOrPid}, _From, 
-	    #state{data = Data, cache = Cache} = State) ->
+	    #state{data     = Data, 
+		   cache    = Cache, 
+		   data_mod = Mod} = State) ->
     ?vlog("unregister subagent ~p",[OidOrPid]),    
     %% Invalidate cache
     NewCache = maybe_invalidate_cache(Cache),
-    case snmpa_mib_data:unregister_subagent(Data, OidOrPid) of
+    case Mod:unregister_subagent(Data, OidOrPid) of
+	{ok, NewData} ->
+	    {reply, ok, State#state{data = NewData, cache = NewCache}};
 	{ok, NewData, DeletedSubagentPid} ->
 	    {reply, {ok, DeletedSubagentPid}, State#state{data  = NewData, 
 							  cache = NewCache}};
 	{error, Reason} ->
 	    ?vlog("unregistration failed: ~p",[Reason]),    
-	    {reply, {error, Reason}, State#state{cache = NewCache}};
-	NewData ->
-	    {reply, ok, State#state{data = NewData, cache = NewCache}}
+	    {reply, {error, Reason}, State#state{cache = NewCache}}
     end;
 
-handle_call(info, _From, #state{data = Data, cache = Cache} = State) ->
+handle_call(info, _From, #state{data     = Data, 
+				cache    = Cache, 
+				data_mod = Mod} = State) ->
     ?vlog("info",[]),    
     Reply = 
-	case (catch snmpa_mib_data:info(Data)) of
+	case (catch Mod:info(Data)) of
 	    Info when is_list(Info) ->
 		[{cache, size_cache(Cache)} | Info];
 	    E ->
@@ -531,10 +552,12 @@ handle_call(info, _From, #state{data = Data, cache = Cache} = State) ->
 	    end,
     {reply, Reply, State};
 
-handle_call({info, Type}, _From, #state{data = Data} = State) ->
+handle_call({info, Type}, _From, 
+	    #state{data     = Data, 
+		   data_mod = Mod} = State) ->
     ?vlog("info ~p",[Type]),    
     Reply = 
-	case (catch snmpa_mib_data:info(Data, Type)) of
+	case (catch Mod:info(Data, Type)) of
 	    Info when is_list(Info) ->
 		Info;
 	    E ->
@@ -542,21 +565,19 @@ handle_call({info, Type}, _From, #state{data = Data} = State) ->
 	end,
     {reply, Reply, State};
 
-handle_call(dump, _From, State) ->
-    ?vlog("dump",[]),    
-    Reply = snmpa_mib_data:dump(State#state.data),
-    {reply, Reply, State};
-    
-handle_call({dump, File}, _From, #state{data = Data} = State) ->
+handle_call({dump, File}, _From, 
+	    #state{data = Data, data_mod = Mod} = State) ->
     ?vlog("dump on ~s",[File]),    
-    Reply = snmpa_mib_data:dump(Data, File),
+    Reply = Mod:dump(Data, File),
     {reply, Reply, State};
     
 %% This check (that there is no backup already in progress) is also 
 %% done in the master agent process, but just in case a user issues 
 %% a backup call to this process directly, we add a similar check here. 
 handle_call({backup, BackupDir}, From, 
-	    #state{backup = undefined, data = Data} = State) ->
+	    #state{backup   = undefined, 
+		   data     = Data, 
+		   data_mod = Mod} = State) ->
     ?vlog("backup to ~s", [BackupDir]),
     Pid = self(),
     V   = get(verbosity),
@@ -568,7 +589,7 @@ handle_call({backup, BackupDir}, From,
 			  put(sname, ambs),
 			  put(verbosity, V),
 			  Dir   = filename:join([BackupDir]),
-			  Reply = snmpa_mib_data:backup(Data, Dir),
+			  Reply = Mod:backup(Data, Dir),
 			  Pid ! {backup_done, Reply},
 			  unlink(Pid)
 		  end),	
@@ -637,8 +658,8 @@ handle_info(Info, State) ->
     warning_msg("received unknown info: ~n~p", [Info]),
     {noreply, State}.
 
-terminate(_Reason, #state{data = Data}) ->
-    catch snmpa_mib_data:close(Data),
+terminate(_Reason, #state{data = Data, data_mod = Mod}) ->
+    catch Mod:close(Data),
     ok.
 
 
@@ -655,6 +676,11 @@ terminate(_Reason, #state{data = Data}) ->
 %%     S2 = {state, Data, MEO, TEO, B},
 %%     {ok, S2};
 
+code_change({down, Vsn}, #state{data = Data0, data_mod = Mod} = State, Extra) ->
+    Data = Mod:code_change(down, Vsn, Extra, Data0), 
+    {ok, State#state{data = Data}};
+
+
 %% %% upgrade
 %% %% 
 %% code_change(_Vsn, S1, upgrade_from_pre_4_12) ->
@@ -663,8 +689,9 @@ terminate(_Reason, #state{data = Data}) ->
 %%     S2 = #state{data = Data, meo = MEO, teo = TEO, backup = B, cache = Cache},
 %%     {ok, S2};
 
-code_change(_Vsn, State, _Extra) ->
-    {ok, State}.
+code_change(Vsn, #state{data = Data0, data_mod = Mod} = State, Extra) ->
+    Data = Mod:code_change(up, Vsn, Extra, Data0), 
+    {ok, State#state{data = Data}}.
 
 
 %%-----------------------------------------------------------------
@@ -681,7 +708,10 @@ get_te_override(Options) ->
     get_opt(trapentry_override, Options, false).
 
 get_mib_storage(Options) ->
-    get_opt(mib_storage, Options, ets).
+    get_opt(mib_storage, Options).
+
+get_data_mod(Options) ->
+    get_opt(data_module, Options, snmpa_mib_data_tttn).
 
 get_cacheopt_autogc(Cache, CacheOpts) ->
     IsValid = fun(AutoGC) when ((AutoGC =:= true) orelse 
@@ -868,6 +898,9 @@ timestamp() ->
 
 %% ----------------------------------------------------------------
 
+get_opt(Key, Options) ->
+    snmp_misc:get_option(Key, Options).
+
 get_opt(Key, Options, Default) ->
     snmp_misc:get_option(Key, Options, Default).
 
diff --git a/lib/snmp/src/agent/snmpa_mib_data.erl b/lib/snmp/src/agent/snmpa_mib_data.erl
index b80d85d2ee..4d8a12b6c6 100644
--- a/lib/snmp/src/agent/snmpa_mib_data.erl
+++ b/lib/snmp/src/agent/snmpa_mib_data.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -18,1338 +18,92 @@
 %%
 -module(snmpa_mib_data).
 
-%%%-----------------------------------------------------------------
-%%% This module implements the MIB internal data structures.
-%%% An MIB Data Structure consists of three items; an ets-table,
-%%% a tree and a list of registered subagents.
-%%% The subagent information is consequently duplicated. It resides
-%%% both in the tree and in the list.
-%%% The ets-table contains all data associated with each variable,
-%%% table, tableentry and tablecolumn in the MIB.
-%%% The tree contains information of the Oids in the MIB.
-%%%
-%%% When a mib is loaded, the tree is built from the plain list
-%%% in the binary file.
-%%%-----------------------------------------------------------------
--include("snmp_types.hrl").
--include("snmp_debug.hrl").
-
--define(VMODULE,"MDATA").
--include("snmp_verbosity.hrl").
-
--define(MIB_DATA,snmpa_mib_data).
--define(MIB_NODE,snmpa_mib_node).
--define(MIB_TREE,snmpa_mib_tree).
--define(DUMMY_TREE_GENERATION,1).
--define(DEFAULT_TREE,{tree,{undefined_node},internal}).
-%%-define(DUMMY_TREE_DB,dummy_tree_db).
-%%-define(DUMMY_TREE_DB_INIT,{?DUMMY_TREE_DB,?DEFAULT_TREE}).
-
+-include_lib("snmp/include/snmp_types.hrl").
 
 %%%-----------------------------------------------------------------
-%%% Table of contents
-%%% =================
-%%% 1. Interface
-%%% 2. Implementation of tree access
-%%% 3. Tree building functions
-%%% 4. Tree merging
-%%% 5. Tree deletion routines
-%%% 6. Functions for subagent handling
-%%% 7. Misc functions
+%%% This is the behaviour for the MIB server backend internal 
+%%% data storage. 
 %%%-----------------------------------------------------------------
 
+%% These types should really be defined elsewhere...
+-export_type([
+	      mib_view/0, 
+	      mib_view_elem/0, 
+	      mib_view_mask/0, 
+	      mib_view_inclusion/0
+	     ]).
 
-%%----------------------------------------------------------------------
-%% data_db is an database containing loaded mibs as:
-%%    {MibName = atom(), Symbolic = ?, FullFileName = string()}
-%%    it is either ets or mnesia
-%% tree_db is a database containing _one_ record with the tree!
-%% (the reason for this is part to get replication and part out of convenience)
-%% ref_tree is the root node, without any subagent.
-%% tree is the root node (same as ref_tree but with the subagents added).
-%% subagents is a list of {SAPid, Oid}
-%%----------------------------------------------------------------------
--record(mib_data, {mib_db,  % table of #mib_info
-		   node_db, % table of #node_info
-		   tree_db, % table of #tree
-		   tree,    % The actual tree
-		   subagents = []}).
-
--record(mib_info,  {name, symbolic, file_name}).
--record(node_info, {oid, mib_name, me}).
-
-
-%% API
--export([new/0, new/1, sync/1, close/1, 
-	 load_mib/4, unload_mib/4, which_mibs/1, whereis_mib/2, 
-	 info/1, info/2,
-	 dump/1, dump/2, 
-	 backup/2, 
-	 lookup/2, next/3, which_mib/2, 
-	 register_subagent/3, unregister_subagent/2]).
-
-%% Internal exports
--export([code_change/2]).
-
-
-%%-----------------------------------------------------------------
-%% A tree is represented as a N-tuple, where each element is a
-%% node. A node is:
-%% 1) {tree, Tree, Info} where Info can be {table, Id}, {table_entry, Id}
-%%                                        or perhaps 'internal'
-%% 2) undefined_node  (memory optimization (instead of {node, undefined}))
-%% 3) {node, Info} where Info can be {subagent, Pid}, {variable, Id}, 
-%%                                   {table_column, Id}
-%% Id is {MibName, MibEntry}
-%% The over all root is represented as {tree, Tree, internal}.
-%%
-%% tree() = {tree, nodes(), tree_info()}
-%% nodes() = {tree() | node() | undefined_node, ...}
-%% node() = {node, node_info()}
-%% tree_info() = {table, Id} | {table_entry, Id} | internal
-%% node_info() = {subagent, Pid} | {variable, Id} | {table_colum, Id}
-%%-----------------------------------------------------------------
-
-%% This record is what is stored in the database. The 'tree' part
-%% is described above...
--record(tree,{generation = ?DUMMY_TREE_GENERATION, root = ?DEFAULT_TREE}).
-
-
-%%%======================================================================
-%%% 1. Interface
-%%%======================================================================
-
-%%-----------------------------------------------------------------
-%% Func: new/0, new/1
-%% Returns: A representation of mib data.
-%%-----------------------------------------------------------------
-new() ->
-    new(ets).
-
-%% Where -> A list of nodes where the tables will be created
-new(Storage) ->
-    %% First we must check if there is already something to read
-    %% If a database already exists, then the tree structure has to be read
-    ?vtrace("open (mib) database",[]),
-    MibDb = snmpa_general_db:open(Storage, ?MIB_DATA,
-				  mib_info,
-				  record_info(fields,mib_info), set),
-    ?vtrace("open (mib) node database",[]),
-    NodeDb = snmpa_general_db:open(Storage, ?MIB_NODE,
-				   node_info,
-				   record_info(fields,node_info), set),
-    ?vtrace("open (mib) tree database",[]),
-    TreeDb = snmpa_general_db:open(Storage, ?MIB_TREE,
-				   tree,
-				   record_info(fields,tree), set),
-    Tree = 
-	case snmpa_general_db:read(TreeDb, ?DUMMY_TREE_GENERATION) of
-	    false ->
-		T = #tree{},
-		snmpa_general_db:write(TreeDb, T),
-		T;
-	    {value, T} ->
-		T
-	end,
-    install_mibs(MibDb, NodeDb),
-    #mib_data{mib_db  = MibDb, 
-	      node_db = NodeDb,
-	      tree_db = TreeDb, 
-	      tree    = Tree}.
-
-
-%%----------------------------------------------------------------------
-%% Returns: new mib data | {error, Reason}
-%%----------------------------------------------------------------------
-load_mib(MibData,FileName,MeOverride,TeOverride) 
-  when is_record(MibData,mib_data) andalso is_list(FileName) -> 
-    ?vlog("load mib file: ~p",[FileName]),
-    ActualFileName = filename:rootname(FileName, ".bin") ++ ".bin",
-    MibName = list_to_atom(filename:basename(FileName, ".bin")),
-    (catch do_load_mib(MibData, ActualFileName, MibName, 
-                       MeOverride, TeOverride)).
-
-do_load_mib(MibData, ActualFileName, MibName, MeOverride, TeOverride) ->
-    ?vtrace("do_load_mib -> entry with"
-        "~n  ActualFileName: ~s"
-        "~n  MibName:        ~p",[ActualFileName, MibName]),
-    #mib_data{mib_db  = MibDb, 
-	      node_db = NodeDb, 
-	      %% tree_db = TreeDb,
-	      tree    = Tree} = MibData,
-    verify_not_loaded(MibDb, MibName),
-    ?vtrace("do_load_mib -> already loaded mibs:"
-	"~n   ~p",[loaded(MibDb)]),
-    Mib = do_read_mib(ActualFileName),
-    ?vtrace("do_load_mib -> read mib ~s",[Mib#mib.name]),
-    NonInternalMes = 
-        lists:filter(fun(ME) -> maybe_drop_me(ME) end, Mib#mib.mes),
-    OldRoot = Tree#tree.root,
-    T = build_tree(NonInternalMes, MibName),
-    ?d("load_mib -> "
-	"~n   OldRoot: ~p"
-	"~n   T:       ~p", [OldRoot, T]),
-    case (catch merge_nodes(T, OldRoot)) of
-	{error_merge_nodes, Node1, Node2} ->
-	    ?vlog("error merging nodes:"
-		"~n~p~nand~n~p", [Node1,Node2]),
-	    {error, oid_conflict};
-	NewRoot when is_tuple(NewRoot) andalso (element(1,NewRoot) =:= tree) ->
- 	    ?d("load_mib -> "
- 		"~n   NewRoot: ~p", [NewRoot]),
-	    Symbolic = not lists:member(no_symbolic_info, Mib#mib.misc),
-	    case (catch check_notif_and_mes(TeOverride, MeOverride, Symbolic, 
-					    Mib#mib.traps, NonInternalMes)) of
-		true ->
-		    install_mes(NodeDb, MibName, NonInternalMes),
-		    install_mib(MibDb, Symbolic, Mib, 
-				MibName, ActualFileName, NonInternalMes),
-		    ?vtrace("installed mib ~s", [Mib#mib.name]),
-		    Tree2 = Tree#tree{root = NewRoot},
-		    %% snmpa_general_db:write(TreeDb, Tree2), %% Store later?
-		    {ok, MibData#mib_data{tree = Tree2}};
-		Else -> 
-		    Else
-	    end
-    end.
-
-
-verify_not_loaded(Db, Name) ->
-    case snmpa_general_db:read(Db, Name) of
-        {value, #mib_info{name = Name}} -> 
-            throw({error, 'already loaded'});
-        false ->
-            ok
-    end.
-
-do_read_mib(ActualFileName) ->
-    case snmp_misc:read_mib(ActualFileName) of
-        {error, Reason} -> 
-            ?vlog("Failed reading mib file ~p with reason: ~p",
-                [ActualFileName,Reason]),
-            throw({error, Reason});
-        {ok, Mib} ->
-            Mib
-    end.
-
-%% The Tree DB is handled in a special way since it can be very large.
-sync(#mib_data{mib_db  = M, 
-	       node_db = N, 
-	       tree_db = T, tree = Tree, subagents = []}) ->
-    snmpa_general_db:sync(M),
-    snmpa_general_db:sync(N),
-    snmpa_general_db:write(T, Tree),
-    snmpa_general_db:sync(T);
-sync(#mib_data{mib_db  = M, 
-	       node_db = N, 
-	       tree_db = T, tree = Tree, subagents = SAs}) ->
-
-    snmpa_general_db:sync(M),
-    snmpa_general_db:sync(N),
-
-    %% Ouch. Since the subagent info is dynamic we do not 
-    %% want to store the tree containing subagent info. So, we 
-    %% have to create a tmp tree without those and store it.
-
-    case delete_subagents(Tree, SAs) of
-	{ok, TreeWithoutSAs} ->
-	    snmpa_general_db:write(T, TreeWithoutSAs),
-	    snmpa_general_db:sync(T);
-	Error ->
-	    Error
-    end.
-
-delete_subagents(Tree, []) ->
-    {ok, Tree};
-delete_subagents(Tree0, [{_, Oid}|SAs]) ->
-    case (catch delete_subagent(Tree0, Oid)) of
-	{tree, _Tree, _Info} = Tree1 ->
-	    delete_subagents(Tree1, SAs);
-	_Error ->
-	    {error, {'invalid oid', Oid}} 
-    end.
-
-%%----------------------------------------------------------------------
-%% (OTP-3601)
-%%----------------------------------------------------------------------
-check_notif_and_mes(TeOverride,MeOverride,Symbolic,Traps,MEs) ->
-    ?vtrace("check notifications and mib entries",[]),
-    check_notifications(TeOverride,Symbolic,Traps),
-    check_mes(MeOverride,MEs).
-
-check_notifications(true, _Symbolic, _Traps) ->
-    ?vtrace("trapentry override = true => skip check",[]),
-    true;
-check_notifications(_, Symbolic, Traps) -> 
-    check_notifications(Symbolic, Traps).
-
-check_notifications(true, Traps) ->
-    check_notifications(Traps);
-check_notifications(_, _) -> true.
-
-check_notifications([]) -> true;
-check_notifications([#trap{trapname = Key} = Trap | Traps]) ->
-    ?vtrace("check notification [trap] with Key: ~p",[Key]),
-    case snmpa_symbolic_store:get_notification(Key) of
-	{value, Trap} -> check_notifications(Traps);
-	{value,    _} -> throw({error, {'trap already defined', Key}});
-	undefined     -> check_notifications(Traps)
-    end;
-check_notifications([#notification{trapname = Key} = Notif | Traps]) ->
-    ?vtrace("check notification [notification] with Key: ~p",[Key]),
-    case snmpa_symbolic_store:get_notification(Key) of
-	{value, Notif} -> 
-	    check_notifications(Traps);
-	{value,     _} -> 
-	    throw({error, {'notification already defined', Key}});
-	undefined      -> 
-	    check_notifications(Traps)
-    end;
-check_notifications([Crap | Traps]) ->
-    ?vlog("skipped check of: ~n~p",[Crap]),
-    check_notifications(Traps).
-
-check_mes(true,_) ->
-    ?vtrace("mibentry override = true => skip check",[]),
-    true; 
-check_mes(_,MEs) ->
-    check_mes(MEs).
-
-check_mes([]) -> true;
-check_mes([#me{aliasname = Name, oid = Oid1} | MEs]) ->
-    ?vtrace("check mib entries with aliasname: ~p",[Name]),
-    case snmpa_symbolic_store:aliasname_to_oid(Name) of
-	{value, Oid1} -> 
-	    check_mes(MEs);
-	{value, Oid2} -> 
-	    ?vinfo("~n   expecting '~p'~n   but found '~p'",[Oid1, Oid2]),
-	    throw({error, {'mibentry already defined', Name}});
-	false -> 
-	    check_mes(MEs)
-    end;
-check_mes([Crap | MEs]) ->
-    ?vlog("skipped check of: ~n~p",[Crap]),
-    check_mes(MEs).
-    
-
-
-%%----------------------------------------------------------------------
-%% Returns: new mib data | {error, Reason}
-%%----------------------------------------------------------------------
-unload_mib(MibData, FileName, _, _) when is_list(FileName) -> 
-    MibName = list_to_atom(filename:basename(FileName, ".bin")),
-    (catch do_unload_mib(MibData, MibName)).
-
-do_unload_mib(MibData, MibName) ->
-    ?vtrace("do_unload_mib -> entry with"
-	"~n   MibName: ~p", [MibName]),
-    #mib_data{mib_db  = MibDb, 
-	      node_db = NodeDb, 
-	      %% tree_db = TreeDb, 
-	      tree    = Tree} = MibData,
-    #mib_info{symbolic = Symbolic} = verify_loaded(MibDb, MibName),
-    NewRoot = delete_mib_from_tree(MibName, Tree#tree.root),
-    MEs = uninstall_mes(NodeDb, MibName),
-    uninstall_mib(MibDb, Symbolic, MibName, MEs),
-    NewMibData = MibData#mib_data{tree = Tree#tree{root = NewRoot}},
-    {ok, NewMibData}.
-
-verify_loaded(Db, Name) ->
-    case snmpa_general_db:read(Db, Name) of
-        {value, MibInfo} ->
-            MibInfo;
-        false ->
-            throw({error, 'not loaded'})
-    end.
-    
-    
-close(#mib_data{mib_db = MibDb, node_db = NodeDb, tree_db = TreeDb}) ->
-    snmpa_general_db:close(MibDb),
-    snmpa_general_db:close(NodeDb),
-    snmpa_general_db:close(TreeDb),
-    ok.
-
-register_subagent(#mib_data{tree = T} = MibData, Oid, Pid) ->
-    case insert_subagent(Oid, T#tree.root) of
-	{error, Reason} -> 
-	    {error, Reason};
-	NewRootTree ->
-	    SAs = [{Pid, Oid} | MibData#mib_data.subagents],
-	    T2 = T#tree{root = NewRootTree},
-	    MibData#mib_data{tree = T2, subagents = SAs}
-    end.
-
-
-%%----------------------------------------------------------------------
-%% Purpose: Get a list of all loaded mibs
-%% Returns: [{Name, File}]
-%%----------------------------------------------------------------------
-
-which_mibs(#mib_data{mib_db = Db}) ->
-    Mibs = snmpa_general_db:tab2list(Db),
-    [{Name, File} || #mib_info{name = Name, file_name = File} <- Mibs].
-
-
-%%----------------------------------------------------------------------
-%% Purpose: Get a list of all loaded mibs
-%% Returns: [{Name, File}]
-%%----------------------------------------------------------------------
-
-whereis_mib(#mib_data{mib_db = Db}, Name) ->
-    case snmpa_general_db:read(Db, Name) of
-        {value, #mib_info{file_name = File}} ->
-	    {ok, File};
-	false ->
-	    {error, not_found}
-    end.
-
-
-%%----------------------------------------------------------------------
-%% Purpose: Deletes SA with Pid from all subtrees it handles.
-%% Returns: NewMibData.
-%%----------------------------------------------------------------------
-unregister_subagent(MibData, Pid) when is_pid(Pid) ->
-    SAs = MibData#mib_data.subagents,
-    case lists:keysearch(Pid, 1, SAs) of
-	false -> MibData;
-	{value, {Pid, Oid}} ->
-	    % we should never get an error since Oid is found in MibData.
-	    {ok, NewMibData, _DeletedSA} = unregister_subagent(MibData, Oid),
-	    % continue if the same Pid handles other mib subtrees.
-	    unregister_subagent(NewMibData, Pid)
-    end;
-
-%%----------------------------------------------------------------------
-%% Purpose: Deletes one unique subagent. 
-%% Returns: {error, Reason} | {ok, NewMibData, DeletedSubagentPid}
-%%----------------------------------------------------------------------
-unregister_subagent(#mib_data{tree = T} = MibData, Oid) when is_list(Oid) ->
-    case catch delete_subagent(T#tree.root, Oid) of
-	{tree, Tree, Info} ->
-	    OldSAs = MibData#mib_data.subagents,
-	    {value, {Pid, _Oid}} = lists:keysearch(Oid, 2, OldSAs),
-	    SAs = lists:keydelete(Oid, 2, OldSAs),
-	    T2 = T#tree{root = {tree, Tree, Info}},
-	    {ok, 
-	     MibData#mib_data{tree = T2, subagents = SAs},
-	     Pid};
-	_ ->
-	    {error, {'invalid oid', Oid}}
-    end.
-
-%%----------------------------------------------------------------------
-%% Purpose: To inpect memory usage, loaded mibs, registered subagents
-%%----------------------------------------------------------------------
-info(MibData) ->
-    ?vtrace("retrieve info",[]),
-    #mib_data{mib_db = MibDb, node_db = NodeDb, tree_db = TreeDb, 
-	      tree = Tree, subagents = SAs} = MibData,
-    LoadedMibs = old_format(snmpa_general_db:tab2list(MibDb)),
-    TreeSize = snmp_misc:mem_size(Tree),
-    {memory, ProcSize} = erlang:process_info(self(),memory),
-    MibDbSize  = snmpa_general_db:info(MibDb,  memory),
-    NodeDbSize = snmpa_general_db:info(NodeDb, memory),
-    TreeDbSize = snmpa_general_db:info(TreeDb, memory),
-    [{loaded_mibs, LoadedMibs}, {subagents, SAs}, {tree_size_bytes, TreeSize},
-     {process_memory, ProcSize}, 
-     {db_memory, [{mib,MibDbSize},{node,NodeDbSize},{tree,TreeDbSize}]}].
-
-info(#mib_data{mib_db = MibDb}, loaded_mibs) ->
-    Mibs = snmpa_general_db:tab2list(MibDb),
-    [filename:rootname(FN, ".bin") || #mib_info{file_name = FN} <- Mibs];
-info(#mib_data{tree = Tree}, tree_size_bytes) ->
-    snmp_misc:mem_size(Tree);
-info(_, process_memory) ->
-    {memory, ProcSize} = erlang:process_info(self(),memory),
-    ProcSize;
-info(#mib_data{mib_db = MibDb, node_db = NodeDb, tree_db = TreeDb}, 
-     db_memory) ->
-    MibDbSize  = snmpa_general_db:info(MibDb,  memory),
-    NodeDbSize = snmpa_general_db:info(NodeDb, memory),
-    TreeDbSize = snmpa_general_db:info(TreeDb, memory),
-    [{mib,MibDbSize},{node,NodeDbSize},{tree,TreeDbSize}];
-info(#mib_data{subagents = SAs}, subagents) ->
-    SAs.
-
-old_format(LoadedMibs) ->
-    ?vtrace("convert mib info to old format",[]),
-    [{N,S,F} || #mib_info{name=N,symbolic=S,file_name=F} <- LoadedMibs].
-
-    
-%%----------------------------------------------------------------------
-%% A total dump for debugging.
-%%----------------------------------------------------------------------
-dump(#mib_data{mib_db = MibDb, node_db = NodeDb, tree = Tree}) ->
-    (catch io:format("MIB-tables:~n~p~n~n", 
-		     [snmpa_general_db:tab2list(MibDb)])),
-    (catch io:format("MIB-entries:~n~p~n~n", 
-		     [snmpa_general_db:tab2list(NodeDb)])),
-    (catch io:format("Tree:~n~p~n", [Tree])), % good luck reading it!
-    ok.
-
-dump(#mib_data{mib_db = MibDb, node_db = NodeDb, tree = Tree}, File) ->
-    case file:open(File,[write]) of
-	{ok, Fd} ->
-	    io:format(Fd,"~s~n", 
-		      [snmp:date_and_time_to_string(snmp:date_and_time())]),
-	    (catch io:format(Fd,"MIB-tables:~n~p~n~n",
-			     [snmpa_general_db:tab2list(MibDb)])),
-	    (catch io:format(Fd, "MIB-entries:~n~p~n~n", 
-			     [snmpa_general_db:tab2list(NodeDb)])),
-	    io:format(Fd,"Tree:~n~p~n", [Tree]), % good luck reading it!
-	    file:close(Fd),
-	    ok;
-	{error,Reason} ->
-	    ?vinfo("~n   Failed opening file '~s' for reason ~p",
-		   [File,Reason]),
-	    {error,Reason}
-    end.
-
-
-backup(#mib_data{mib_db = M, node_db = N, tree_db = T}, BackupDir) ->
-    MRes = snmpa_general_db:backup(M, BackupDir),
-    NRes = snmpa_general_db:backup(N, BackupDir),
-    TRes = snmpa_general_db:backup(T, BackupDir),
-    handle_backup_res([{mib_db, MRes}, {node_db, NRes}, {tree_db, TRes}]).
-
-handle_backup_res(Res) ->
-    handle_backup_res(Res, []).
-
-handle_backup_res([], []) ->
-    ok;
-handle_backup_res([], Err) ->
-    {error, lists:reverse(Err)};
-handle_backup_res([{_, ok}|Res], Err) ->
-    handle_backup_res(Res, Err);
-handle_backup_res([{Tag, {error, Reason}}|Res], Err) ->
-    handle_backup_res(Res, [{Tag, Reason}|Err]);
-handle_backup_res([{Tag, Error}|Res], Err) ->
-    handle_backup_res(Res, [{Tag, Error}|Err]).
-
-
-%%%======================================================================
-%%% 2. Implementation of tree access
-%%%    lookup and next.
-%%%======================================================================
-
-
-which_mib(#mib_data{tree = T} = D, Oid) ->
-    ?vtrace("which_mib -> entry with"
-	    "~n   Oid: ~p",[Oid]),	    
-    case (catch find_node(D, T#tree.root, Oid, [])) of
-	{variable, _ME, Mib} ->
-	    ?vtrace("which_mib -> variable:"
-		"~n   Mib: ~p", [Mib]),	    
-	    {ok, Mib};
-	{table, _EntryME, _, Mib} ->
-	    ?vtrace("which_mib -> table:"
-		"~n   Mib: ~p", [Mib]),	    
-	    {ok, Mib};
-	{subagent, SubAgentPid, _SANextOid} ->
-	    ?vtrace("which_mib -> subagent:"
-		"~n   SubAgentPid: ~p", [SubAgentPid]),	    
-	    {error, {subagent, SubAgentPid}};
-	{false, ErrorCode} -> 
-	    ?vtrace("which_mib -> false:"
-		"~n   ErrorCode: ~p",[ErrorCode]),	    
-	    {error, ErrorCode};
-	false -> 
-	    ?vtrace("which_mib -> false",[]),	    
-	    {error, noSuchObject};
-	{'EXIT', R} -> 
-	    ?vtrace("which_mib -> exit:"
-		"~n   R:  ~p",[R]),	    
-	    {error, noSuchObject}
-    end.
-
-
-%%-----------------------------------------------------------------
-%% Func: lookup/2
-%% Purpose: Finds the mib entry corresponding to the Oid. If it is a
-%%          variable, the Oid must be <Oid for var>.0 and if it is
-%%          a table, Oid must be <table>.<entry>.<col>.<any>
-%% Returns: {variable, MibEntry} |
-%%          {table_column, MibEntry, TableEntryOid} |
-%%          {subagent, SubAgentPid, SAOid} |
-%%          {false, Reason}
-%%-----------------------------------------------------------------
-lookup(#mib_data{tree = T} = D, Oid) ->
-     ?vtrace("lookup -> entry with"
- 	"~n   Oid: ~p",[Oid]),	    
-    case (catch find_node(D, T#tree.root, Oid, [])) of
-	{variable, ME, _Mib} when is_record(ME, me) -> 
-	    ?vtrace("lookup -> variable:"
-		"~n   ME: ~p",[ME]),	    
-	    {variable, ME};
-	{table, EntryME, {ColME, TableEntryOid}, _Mib} ->
-	    ?vtrace("lookup -> table:"
-		"~n   EntryME:          ~p"
-		"~n   ColME:            ~p"
-		"~n   RevTableEntryOid: ~p",
-		[EntryME, ColME, TableEntryOid]),	    
-	    MFA = EntryME#me.mfa,
-	    RetME = ColME#me{mfa = MFA},
-	    {table_column, RetME, TableEntryOid};
-	{subagent, SubAgentPid, SANextOid} ->
-	    ?vtrace("lookup -> subagent:"
-		"~n   SubAgentPid: ~p"
-		"~n   SANextOid:   ~p", [SubAgentPid, SANextOid]),	    
-	    {subagent, SubAgentPid, SANextOid};
-	{false, ErrorCode} -> 
-	    ?vtrace("lookup -> false:"
-		"~n   ErrorCode: ~p",[ErrorCode]),	    
-	    {false, ErrorCode};
-	false -> 
-	    ?vtrace("lookup -> false",[]),	    
-	    {false, noSuchObject};
-	{'EXIT', R} -> 
-	    ?vtrace("lookup -> exit:"
-		"~n   R:  ~p",[R]),	    
-	    {false, noSuchObject}
-    end.
-
-
-find_node(D, {tree, Tree, {table, _}}, RestOfOid, RevOid) ->
-     ?vtrace("find_node(tree,table) -> entry with"
- 	"~n   RestOfOid: ~p"
- 	"~n   RevOid:    ~p",[RestOfOid, RevOid]),
-    find_node(D, {tree, Tree, internal}, RestOfOid, RevOid);
-find_node(D, {tree, Tree, {table_entry, _}}, RestOfOid, RevOid) ->
-     ?vtrace("find_node(tree,table_entry) -> entry with"
- 	"~n   RestOfOid: ~p"
- 	"~n   RevOid:    ~p",[RestOfOid, RevOid]),
-    #mib_data{node_db = Db} = D,
-    Oid = lists:reverse(RevOid),
-    case snmpa_general_db:read(Db, Oid) of
-	{value, #node_info{me = ME, mib_name = Mib}} ->
-	    case find_node(D, {tree, Tree, internal}, RestOfOid, RevOid) of
-		{false, ErrorCode} -> {false, ErrorCode};
-		Val -> {table, ME, Val, Mib}
-	    end;
-	false ->
-	    ?vinfo("find_node -> could not find table_entry ME with"
-		"~n   RevOid:    ~p"
-		"~n   when"
-		"~n   RestOfOid: ~p", 
-		[RevOid, RestOfOid]),
-	    false
-    end;
-find_node(D, {tree, Tree, _Internal}, [Int | RestOfOid], RevOid) ->
-    ?vtrace("find_node(tree) -> entry with"
-	"~n   Int:       ~p"
-	"~n   RestOfOid: ~p"
-	"~n   RevOid:    ~p",[Int, RestOfOid, RevOid]),
-    find_node(D, element(Int+1, Tree), RestOfOid, [Int | RevOid]);
-find_node(D, {node, {table_column, _}}, RestOfOid, [ColInt | RevOid]) ->
-     ?vtrace("find_node(tree,table_column) -> entry with"
- 	"~n   RestOfOid: ~p"
- 	"~n   ColInt:    ~p"
- 	"~n   RevOid:    ~p",[RestOfOid, ColInt, RevOid]),
-    #mib_data{node_db = Db} = D,
-    Oid = lists:reverse([ColInt | RevOid]),
-    case snmpa_general_db:read(Db, Oid) of
-	{value, #node_info{me = ME}} ->
-	    {ME, lists:reverse(RevOid)}; 
-	false ->
-	    X = snmpa_general_db:read(Db, lists:reverse([ColInt | RevOid])),
-	    ?vinfo("find_node -> could not find table_column ME with"
-		"~n   RevOid: ~p"
-		"~n   trying  [~p|~p]"
-		"~n   X:      ~p", 
-		[RevOid, [ColInt | RevOid], X]),
-	    false
-    end;
-find_node(D, {node, {variable, _MibName}}, [0], RevOid) ->
-     ?vtrace("find_node(tree,variable,[0]) -> entry with"
- 	"~n   RevOid:    ~p",[RevOid]),
-    #mib_data{node_db = Db} = D,
-    Oid = lists:reverse(RevOid),
-    %% {value, #node_info{me = ME}} = snmpa_general_db:read(Db, Oid),
-    case snmpa_general_db:read(Db, Oid) of
-	{value, #node_info{me = ME, mib_name = Mib}} ->
-	    {variable, ME, Mib};
-	false ->
-	    ?vinfo("find_node -> could not find variable ME with"
-		"~n   RevOid: ~p", [RevOid]),
-	    false
-    end;
-find_node(_D, {node, {variable, _MibName}}, [], _RevOid) ->
-    ?vtrace("find_node(tree,variable,[]) -> entry",[]),
-    {false, noSuchObject};
-find_node(_D, {node, {variable, _MibName}}, _, _RevOid) ->
-    ?vtrace("find_node(tree,variable) -> entry",[]),
-    {false, noSuchInstance};
-find_node(D, {node, subagent}, _RestOfOid, SARevOid) ->
-    ?vtrace("find_node(tree,subagent) -> entry with"
- 	"~n   SARevOid:    ~p",[SARevOid]),
-    #mib_data{subagents = SAs} = D,
-    SAOid = lists:reverse(SARevOid),
-    case lists:keysearch(SAOid, 2, SAs) of
-	{value, {SubAgentPid, SAOid}} ->
-	    {subagent, SubAgentPid, SAOid};
-	false ->
-	    ?vinfo("find_node -> could not find subagent with"
-		"~n   SAOid: ~p"
-		"~n   SAs:   ~p", [SAOid, SAs]),
-	    false
-    end;    
-find_node(_D, Node, _RestOfOid, _RevOid) ->
-    ?vtrace("find_node -> failed:~n~p",[Node]),
-    {false, noSuchObject}.
-
-
-%%-----------------------------------------------------------------
-%% Func: next/3
-%% Purpose: Finds the lexicographically next oid.
-%% Returns: endOfMibView |
-%%          {subagent, SubAgentPid, SAOid} |
-%%          {variable, MibEntry, VarOid} |
-%%          {table, TableOid, TableRestOid, MibEntry}
-%% If a variable is returnes, it is in the MibView.
-%% If a table or subagent is returned, it *may* be in the MibView.
-%%-----------------------------------------------------------------
-next(#mib_data{tree = T} = D, Oid, MibView) ->
-    case catch next_node(D, T#tree.root, Oid, [], MibView) of
-	false -> endOfMibView;
-	Else -> Else
-    end.
-
-%%-----------------------------------------------------------------
-%% This function is used as long as we have any Oid left. Take
-%% one integer at a time from the Oid, and traverse the tree
-%% accordingly. When the Oid is empty, call find_next.
-%% Returns: {subagent, SubAgentPid, SAOid} |
-%%          false |
-%%          {variable, MibEntry, VarOid} |
-%%          {table, TableOid, TableRestOid, MibEntry}
-%%-----------------------------------------------------------------
-next_node(_D, undefined_node, _Oid, _RevOidSoFar, _MibView) ->
-    ?vtrace("next_node(undefined_node) -> entry", []),
-    false;
-
-next_node(_D, {tree, Tree, {table_entry, _Id}}, [Int | _Oid], 
-	  _RevOidSoFar, _MibView)
-  when Int+1 > size(Tree) ->
-    ?vtrace("next_node(tree,table_entry) -> entry when not found whith"
-	"~n   Int:        ~p"
-	"~n   size(Tree): ~p", [Int, size(Tree)]),
-    false;
-next_node(D, {tree, Tree, {table_entry, _MibName}},
-	  Oid, RevOidSoFar, MibView) ->
-    ?vtrace("next_node(tree,table_entry) -> entry when"
-	"~n   size(Tree):  ~p"
-	"~n   Oid:         ~p"
-	"~n   RevOidSoFar: ~p"
-	"~n   MibView:     ~p", [size(Tree), Oid, RevOidSoFar, MibView]),
-    OidSoFar = lists:reverse(RevOidSoFar),
-    case snmpa_acm:is_definitely_not_in_mib_view(OidSoFar, MibView) of
-	true -> 
-	    ?vdebug("next_node(tree,table_entry) -> not in mib view",[]),
-	    false;
-	_ -> 
-	    #mib_data{node_db = Db} = D,
-	    case snmpa_general_db:read(Db, OidSoFar) of
-		false ->
-		    ?vinfo("next_node -> could not find table_entry with"
-			"~n   OidSoFar: ~p", [OidSoFar]),
-		    false;
-		{value, #node_info{me = ME}} ->
-		    ?vtrace("next_node(tree,table_entry) -> found: ~n   ~p",
-			[ME]),
-		    {table, OidSoFar, Oid, ME}
-	    end
-    end;
-
-next_node(D, {tree, Tree, _Info}, [Int | RestOfOid], RevOidSoFar, MibView) 
-  when (Int < size(Tree)) andalso (Int >= 0) ->
-    ?vtrace("next_node(tree) -> entry when"
-	"~n   size(Tree):  ~p"
-	"~n   Int:         ~p"
-	"~n   RestOfOid:   ~p"
-	"~n   RevOidSoFar: ~p"
-	"~n   MibView:     ~p", 
-	[size(Tree), Int, RestOfOid, RevOidSoFar, MibView]),
-    case next_node(D, element(Int+1,Tree), 
-		   RestOfOid, [Int|RevOidSoFar], MibView) of
-	false -> 
-	    find_next(D, {tree, Tree, _Info}, Int+1, RevOidSoFar, MibView);
-	Else -> 
-	    Else
-    end;
-%% no solution
-next_node(D, {tree, Tree, _Info}, [], RevOidSoFar, MibView) ->
-    ?vtrace("next_node(tree,[]) -> entry when"
-	"~n   size(Tree):  ~p"
-	"~n   RevOidSoFar: ~p"
-	"~n   MibView:     ~p", 
-	[size(Tree), RevOidSoFar, MibView]),
-    find_next(D, {tree, Tree, _Info}, 0, RevOidSoFar, MibView);
-next_node(_D, {tree, Tree, _Info}, _RestOfOid, _RevOidSoFar, _MibView) ->
-    ?vtrace("next_node(tree) -> entry when"
-	"~n   size(Tree):  ~p", [size(Tree)]),
-    false;
-
-next_node(D, {node, subagent}, Oid, RevOidSoFar, MibView) ->
-    ?vtrace("next_node(node,subagent) -> entry when"
-	"~n   Oid:         ~p"
-	"~n   RevOidSoFar: ~p"
-	"~n   MibView:     ~p", 
-	[Oid, RevOidSoFar, MibView]),
-    OidSoFar = lists:reverse(RevOidSoFar),
-    case snmpa_acm:is_definitely_not_in_mib_view(OidSoFar, MibView) of
-	true -> 
-	    false;
-	_ -> 
-	    #mib_data{subagents = SAs} = D,
-	    case lists:keysearch(OidSoFar, 2, SAs) of
-		{value, {SubAgentPid, OidSoFar}} ->
-		    {subagent, SubAgentPid, OidSoFar};
-		_ ->
-		    ?vinfo("next_node -> could not find subagent with"
-			"~n   OidSoFar: ~p"
-			"~n   SAs:      ~p", [OidSoFar, SAs]),
-		    false
-	    end
-    end;
-    
-next_node(D, {node, {variable, _MibName}}, [], RevOidSoFar, MibView) ->
-    ?vtrace("next_node(node,variable,[]) -> entry when"
-	"~n   RevOidSoFar: ~p"
-	"~n   MibView:     ~p", 
-	[RevOidSoFar, MibView]),
-    OidSoFar = lists:reverse([0 | RevOidSoFar]),
-    case snmpa_acm:validate_mib_view(OidSoFar, MibView) of
-	true ->
-	    #mib_data{node_db = Db} = D,
-	    case snmpa_general_db:read(Db, lists:reverse(RevOidSoFar)) of
-		false ->
-		    ?vinfo("next_node -> could not find variable with"
-			"~n   RevOidSoFar: ~p", [RevOidSoFar]),
-		    false;
-		{value, #node_info{me = ME}} ->
-		    {variable, ME, OidSoFar}
-	    end;
-	_ -> 
-	    false
-    end;
-
-next_node(_D, {node, {variable, _MibName}}, _Oid, _RevOidSoFar, _MibView) ->
-    ?vtrace("next_node(node,variable) -> entry", []),
-    false.
-
-%%-----------------------------------------------------------------
-%% This function is used to find the first leaf from where we
-%% are.
-%% Returns: {subagent, SubAgentPid, SAOid} |
-%%          false |
-%%          {variable, MibEntry, VarOid} |
-%%          {table, TableOid, TableRestOid, MibEntry}
-%% PRE: This function must always be called with a {internal, Tree}
-%%      node.
-%%-----------------------------------------------------------------
-find_next(D, {tree, Tree, internal}, Idx, RevOidSoFar, MibView) 
-  when Idx < size(Tree) ->
-    case find_next(D, element(Idx+1, Tree), 0, [Idx| RevOidSoFar], MibView) of
-	false -> 
-	    find_next(D, {tree, Tree, internal}, Idx+1, RevOidSoFar, MibView);
-	Other -> 
-	    Other
-    end;
-find_next(_D, {tree, _Tree, internal}, _Idx, _RevOidSoFar, _MibView) ->
-    false;
-find_next(_D, undefined_node, _Idx, _RevOidSoFar, _MibView) ->
-    false;
-find_next(D, {tree, Tree, {table, _MibName}}, Idx, RevOidSoFar, MibView) ->
-    find_next(D, {tree, Tree, internal}, Idx, RevOidSoFar, MibView);
-find_next(D, {tree, _Tree, {table_entry, _MibName}}, _Index,
-	  RevOidSoFar, MibView) ->
-    OidSoFar = lists:reverse(RevOidSoFar),
-    case snmpa_acm:is_definitely_not_in_mib_view(OidSoFar, MibView) of
-	true -> 
-	    false;
-	_ -> 
-	    #mib_data{node_db = Db} = D,
-	    case snmpa_general_db:read(Db, OidSoFar) of
-		false ->
-		    ?vinfo("find_next -> could not find table_entry ME with"
-			"~n   OidSoFar: ~p", [OidSoFar]),
-		    false;
-		{value, #node_info{me = ME}} ->
-		    {table, OidSoFar, [], ME}
-	    end
-    end;
-find_next(D, {node, {variable, _MibName}}, _Idx, RevOidSoFar, MibView) ->
-    OidSoFar = lists:reverse([0 | RevOidSoFar]),
-    case snmpa_acm:validate_mib_view(OidSoFar, MibView) of
-	true -> 
-	    #mib_data{node_db = Db} = D,
-	    case snmpa_general_db:read(Db, lists:reverse(RevOidSoFar)) of
-		false ->
-		    ?vinfo("find_next -> could not find variable with"
-			"~n   RevOidSoFar: ~p", [RevOidSoFar]),
-		    false;
-		{value, #node_info{me = ME}} ->
-		    {variable, ME, OidSoFar}
-	    end;
-	_ -> 
-	    false
-    end;
-find_next(D, {node, subagent}, _Idx, RevOidSoFar, MibView) ->
-    OidSoFar = lists:reverse(RevOidSoFar),
-    case snmpa_acm:is_definitely_not_in_mib_view(OidSoFar, MibView) of
-	true -> 
-	    false;
-	_ -> 
-	    #mib_data{subagents = SAs} = D,
-	    case lists:keysearch(OidSoFar, 2, SAs) of
-		{value, {SubAgentPid, OidSoFar}} ->
-		    {subagent, SubAgentPid, OidSoFar};
-		false ->
-		    ?vinfo("find_node -> could not find subagent with"
-			"~n   OidSoFar: ~p"
-			"~n   SAs:      ~p", [OidSoFar, SAs]),
-		    false
-	    end
-    end.
-
-%%%======================================================================
-%%% 3. Tree building functions
-%%%    Used when loading mibs.
-%%%======================================================================
-
-build_tree(Mes, MibName) ->
-    ?d("build_tree -> "
-	"~n   Mes: ~p", [Mes]),
-    {ListTree, []}  = build_subtree([], Mes, MibName),
-    {tree, convert_tree(ListTree), internal}.
-
-%%----------------------------------------------------------------------
-%% Purpose: Builds the tree where all oids have prefix equal to LevelPrefix.
-%% Returns: {Tree, RestMes}
-%% RestMes are Mes that should not be in this subtree.
-%% The Tree is a temporary and simplified data structure that is easy to
-%% convert to the final tuple tree used by the MIB process.
-%% A Node is represented as in the final tree.
-%% The tree is not represented as a N-tuple, but as an Index-list.
-%% Example: Temporary: [{1, Node1}, {3, Node3}]
-%%          Final:     {Node1, undefined_node, Node3}
-%% Pre: Mes are sorted on oid.
-%%----------------------------------------------------------------------
-build_subtree(LevelPrefix, [Me | Mes], MibName) ->
-    ?vtrace("build subtree -> ~n"
-	   "   oid:         ~p~n"
-	   "   LevelPrefix: ~p~n"
-	   "   MibName:     ~p", [Me#me.oid, LevelPrefix, MibName]),
-    EType = Me#me.entrytype,
-    ?vtrace("build subtree -> EType = ~p",[EType]),
-    case in_subtree(LevelPrefix, Me) of
-	above ->
-	    ?vtrace("build subtree -> above",[]),
-	    {[], [Me|Mes]};
-	{node, Index} ->
-	    ?vtrace("build subtree -> node at ~p",[Index]),
-	    {Tree, RestMes} = build_subtree(LevelPrefix, Mes, MibName),
-	    {[{Index, {node, {EType, MibName}}} | Tree], RestMes};
-	{subtree, Index, NewLevelPrefix} ->
-	    ?vtrace("build subtree -> subtree at"
-		    "~n   ~w with ~w",
-		   [Index, NewLevelPrefix]),
-	    {BelowTree, RestMes} = 
-		build_subtree(NewLevelPrefix, Mes, MibName),
-	    {CurTree, RestMes2} = 
-		build_subtree(LevelPrefix, RestMes, MibName),
-	    {[{Index, {tree, BelowTree, {EType,MibName}}}| CurTree], RestMes2};
-	{internal_subtree, Index, NewLevelPrefix} ->
-	    ?vtrace("build subtree -> internal_subtree at"
-		    "~n   ~w with ~w",
-		   [Index,NewLevelPrefix]),
-	    {BelowTree, RestMes} =
-		build_subtree(NewLevelPrefix, [Me | Mes], MibName),
-	    {CurTree, RestMes2} =
-		build_subtree(LevelPrefix, RestMes, MibName),
-	    {[{Index, {tree, BelowTree, internal}} | CurTree], RestMes2}
-    end;
-
-build_subtree(_LevelPrefix, [], _MibName) -> 
-    ?vtrace("build subtree -> done", []),
-    {[], []}.
-
-%%--------------------------------------------------
-%% Purpose: Determine how/if/where Me should be inserted in subtree
-%%          with LevelPrefix. This function does not build any tree, only 
-%%          determinses what should be done (by build subtree).
-%% Returns:
-%% above - Indicating that this ME should _not_ be in this subtree.
-%% {node, Index} - yes, construct a node with index Index on this level
-%% {internal_subtree, Index, NewLevelPrefix} - yes, there should be an
-%%   internal subtree at this index.
-%% {subtree, Index, NewLevelPrefix} - yes, construct a subtree with 
-%%   NewLevelPrefix and insert this on current level in position Index.
-%%--------------------------------------------------
-in_subtree(LevelPrefix, Me) ->
-    case lists:prefix(LevelPrefix, Me#me.oid) of
-	true when length(Me#me.oid) > length(LevelPrefix) ->
-	    classify_how_in_subtree(LevelPrefix, Me);
-	_ ->
-	    above
-    end.
-
-%%--------------------------------------------------
-%% See comment about in_subtree/2.  This function takes care of all cases
-%% where the ME really should be in _this_ subtree (not above).
-%%--------------------------------------------------
-classify_how_in_subtree(LevelPrefix, Me) 
-  when (length(Me#me.oid) =:= (length(LevelPrefix) + 1)) ->
-    Oid = Me#me.oid,
-    case node_or_subtree(Me#me.entrytype) of
-	subtree ->
-	    {subtree, lists:last(Oid), Oid};
-	node ->
-	    {node, lists:last(Oid)}
-    end;
-
-classify_how_in_subtree(LevelPrefix, Me) 
-  when (length(Me#me.oid) > (length(LevelPrefix) + 1)) ->
-    L1 = length(LevelPrefix) + 1,
-    Oid = Me#me.oid,
-    {internal_subtree, lists:nth(L1, Oid), lists:sublist(Oid, 1, L1)}.
-
-%%--------------------------------------------------
-%% Determines how to treat different kinds om MEs in the tree building process.
-%% Pre: all internal nodes have been removed.
-%%--------------------------------------------------
-node_or_subtree(table) -> subtree;
-node_or_subtree(table_entry) -> subtree;
-node_or_subtree(variable) -> node;
-node_or_subtree(table_column) -> node.
-
-%%--------------------------------------------------
-%% Purpose: (Recursively) Converts a temporary tree (see above) to a final tree.
-%% If input is a ListTree, output is a TupleTree.
-%% If input is a Node, output is the same Node.
-%% Pre: All Indexes are >= 0.
-%%--------------------------------------------------
-convert_tree({Index, {tree, Tree, Info}}) when Index >= 0 ->
-    L = lists:map(fun convert_tree/1, Tree),
-    {Index, {tree, dict_list_to_tuple(L), Info}};
-convert_tree({Index, {node, Info}}) when Index >= 0 ->
-    {Index, {node, Info}};
-convert_tree(Tree) when is_list(Tree) ->
-    L = lists:map(fun convert_tree/1, Tree),
-    dict_list_to_tuple(L).
-
-%%----------------------------------------------------------------------
-%% Purpose: Converts a single level (that is non-recursively) from
-%%          the temporary indexlist to the N-tuple.
-%% Input: A list of {Index, Data}.
-%% Output: A tuple where element Index is Data.
-%%----------------------------------------------------------------------
-dict_list_to_tuple(L) ->
-    L2 = lists:keysort(1, L),
-    list_to_tuple(integrate_indexes(0, L2)).
-
-%%----------------------------------------------------------------------
-%% Purpose: Helper function for dict_list_to_tuple/1.
-%%          Converts an indexlist to a N-list.
-%% Input: A list of {Index, Data}.
-%% Output: A (usually longer, never shorter) list where element Index is Data.
-%% Example: [{1,hej}, {3, sven}] will give output 
-%% [undefined_node, hej, undefined_node, sven].
-%% Initially CurIndex should be 0.
-%%----------------------------------------------------------------------
-integrate_indexes(CurIndex, [{CurIndex, Data} | T]) ->
-    [Data | integrate_indexes(CurIndex + 1, T)];
-integrate_indexes(_Index, []) ->
-    [];
-integrate_indexes(CurIndex, L) ->
-    [undefined_node | integrate_indexes(CurIndex + 1, L)].
-
-%%%======================================================================
-%%% 4. Tree merging
-%%%    Used by: load mib, insert subagent.
-%%%======================================================================
-
-%%----------------------------------------------------------------------
-%% Arg: Two root nodes (that is to be merged).
-%% Returns: A new root node where the nodes have been merger to one.
-%%----------------------------------------------------------------------
-merge_nodes(Same, Same) -> 
-    Same;
-merge_nodes(Node, undefined_node) -> 
-    Node;
-merge_nodes(undefined_node, Node) -> 
-    Node;
-merge_nodes({tree, Tree1, internal}, {tree, Tree2, internal}) ->
-    {tree, merge_levels(tuple_to_list(Tree1),tuple_to_list(Tree2)), internal};
-merge_nodes(Node1, Node2) ->
-    throw({error_merge_nodes, Node1, Node2}).
-
-%%----------------------------------------------------------------------
-%% Arg: Two levels to be merged.
-%%      Here, a level is represented as a list of nodes. A list is easier
-%%      to extend than a tuple.
-%% Returns: The resulting, merged level tuple.
-%%----------------------------------------------------------------------
-merge_levels(Level1, Level2) when length(Level1) =:= length(Level2) ->
-    MergeNodes = fun(N1, N2) -> merge_nodes(N1, N2) end,
-    list_to_tuple(snmp_misc:multi_map(MergeNodes, [Level1, Level2]));
-merge_levels(Level1, Level2) when length(Level1) > length(Level2) ->
-    merge_levels(Level1, Level2 ++ 
-		 undefined_nodes_list(length(Level1) - length(Level2)));
-merge_levels(Level1, Level2) when length(Level1) < length(Level2) ->
-    merge_levels(Level2, Level1).
-
-undefined_nodes_list(N) -> lists:duplicate(N, undefined_node).
-
-
-%%%======================================================================
-%%% 5. Tree deletion routines
-%%%    (for unload mib)
-%%%======================================================================
-
-%%----------------------------------------------------------------------
-%% Purpose:  Actually kicks of the tree reconstruction.
-%% Returns: {list of removed MEs, NewTree}
-%%----------------------------------------------------------------------
-delete_mib_from_tree(MibName, {tree, Tree, internal}) ->
-    case delete_tree(Tree, MibName) of
-	[] -> 
-	    {tree, {undefined_node}, internal}; % reduce
-	LevelList -> 
-	    {tree, list_to_tuple(LevelList), internal}
-    end.
-
-%%----------------------------------------------------------------------
-%% Purpose: Deletes all nodes associated to MibName from this level and
-%%          all levels below.
-%%          If the new level does not contain information (that is, no 
-%%          other mibs use it) anymore the empty list is returned.
-%% Returns: {MEs, The new level represented as a list}
-%%----------------------------------------------------------------------
-delete_tree(Tree, MibName) when is_tuple(Tree) ->
-    NewLevel = delete_nodes(tuple_to_list(Tree), MibName, []),
-    case lists:filter(fun drop_undefined_nodes/1,NewLevel) of
-	[] -> [];
-	_A_perhaps_shorted_list ->
-	    NewLevel  % some other mib needs this level
-    end.
-    
-%%----------------------------------------------------------------------
-%% Purpose: Nodes belonging to MibName are removed from the tree.
-%%          Recursively deletes sub trees to this node.
-%% Returns: {MEs, NewNodesList}
-%%----------------------------------------------------------------------
-delete_nodes([], _MibName, AccNodes) ->
-    lists:reverse(AccNodes);
-
-delete_nodes([{node, {variable, MibName}}|T], MibName, AccNodes) ->
-    delete_nodes(T, MibName, [undefined_node | AccNodes]);
-
-delete_nodes([{node, {table_column, MibName}}|T], MibName, AccNodes) ->
-    delete_nodes(T, MibName, [undefined_node | AccNodes]);
-
-delete_nodes([{tree, _Tree, {table, MibName}}|T], MibName, AccNodes) ->
-    delete_nodes(T, MibName, [undefined_node | AccNodes]);
-
-delete_nodes([{tree, _Tree, {table_entry, MibName}}|T], MibName, AccNodes) ->
-    delete_nodes(T, MibName, [undefined_node | AccNodes]);
-
-delete_nodes([{tree, Tree, Info}|T], MibName, AccNodes) ->
-    case delete_tree(Tree, MibName) of
-	[] -> % tree completely deleted
-	    delete_nodes(T, MibName, [undefined_node | AccNodes]);
-	LevelList ->
-	    delete_nodes(T, MibName, 
-			 [{tree, list_to_tuple(LevelList), Info} | AccNodes])
-    end;
-
-delete_nodes([NodeToKeep|T], MibName, AccNodes) ->
-    delete_nodes(T, MibName, [NodeToKeep | AccNodes]).
-
-drop_undefined_nodes(undefined_node) -> false;
-drop_undefined_nodes(_) -> true.
-
-
-%%%======================================================================
-%%% 6. Functions for subagent handling
-%%%======================================================================
-
-%%----------------------------------------------------------------------
-%% Returns: A new Root|{error, reason}
-%%----------------------------------------------------------------------
-insert_subagent(Oid, OldRoot) ->
-    ListTree = build_tree_for_subagent(Oid),
-    case catch convert_tree(ListTree) of
-	{'EXIT', _Reason} ->
-	    {error, 'cannot construct tree from oid'};
-	Level when is_tuple(Level) ->
-	    T = {tree, Level, internal},
-	    case catch merge_nodes(T, OldRoot) of
-		{error_merge_nodes, _Node1, _Node2} ->
-		    {error, oid_conflict};
-		NewRoot when is_tuple(NewRoot) andalso 
-			     (element(1, NewRoot) =:= tree) ->
-		    NewRoot
-	    end
-    end.
-
-build_tree_for_subagent([Index]) ->
-    [{Index, {node, subagent}}];
-
-build_tree_for_subagent([Index | T]) ->
-    [{Index, {tree, build_tree_for_subagent(T), internal}}].
+-type mib_view()           :: [mib_view_elem()].
+-type mib_view_elem()      :: {SubTree :: snmp:oid(), 
+			       Mask :: [non_neg_integer()], 
+			       Inclusion :: mib_view_inclusion()}.
+-type mib_view_mask()      :: [non_neg_integer()]. 
+-type mib_view_inclusion() :: 1 | 2. % 1 = included, 2 = excluded
 
-%%----------------------------------------------------------------------
-%% Returns: A new tree where the subagent at Oid (2nd arg) has been deleted.
-%%----------------------------------------------------------------------
-delete_subagent({tree, Tree, Info}, [Index]) ->
-    {node, subagent} = element(Index+1, Tree),
-    {tree, setelement(Index+1, Tree, undefined_node), Info};
-delete_subagent({tree, Tree, Info}, [Index | TI]) ->
-    {tree, setelement(Index+1, Tree,
-		      delete_subagent(element(Index+1, Tree), TI)), Info}.
+-type filename() :: file:filename().
 
-%%%======================================================================
-%%% 7. Misc functions
-%%%======================================================================
 
-%%----------------------------------------------------------------------
-%% Installs the mibs found in the database when starting the agent.
-%% Basically calls the instrumentation functions for all non-internal
-%% mib-entries
-%%----------------------------------------------------------------------
-install_mibs(MibDb, NodeDb) ->
-    MibNames = loaded(MibDb),
-    ?vtrace("install_mibs -> found following mibs in database: ~n"
-	"~p", [MibNames]),
-    install_mibs2(NodeDb, MibNames).
+-callback new(MibStorage :: snmpa:mib_storage()) -> State :: term().
 
-install_mibs2(_, []) ->
-    ok;
-install_mibs2(NodeDb, [MibName|MibNames]) ->
-    Pattern = #node_info{oid = '_', mib_name = MibName, me = '_'},
-    Nodes = snmpa_general_db:match_object(NodeDb, Pattern),
-    MEs = [ME || #node_info{me = ME} <- Nodes],
-    ?vtrace("install_mibs2 -> installing ~p MEs for mib ~p", 
-	[length(MEs),MibName]),
-    NewF = fun(ME) -> call_instrumentation(ME, new) end,
-    lists:foreach(NewF, MEs),
-    install_mibs2(NodeDb, MibNames).
-    
-    
-%%----------------------------------------------------------------------
-%% Does all side effect stuff during load_mib.
-%%----------------------------------------------------------------------
-install_mib(Db, Symbolic, Mib, MibName, FileName, NonInternalMes) ->
-    ?vdebug("install_mib -> entry with"
-	    "~n   Symbolic: ~p"
-	    "~n   MibName:  ~p"
-	    "~n   FileName: ~p", [Symbolic, MibName, FileName]),
-    Rec = #mib_info{name = MibName, symbolic = Symbolic, file_name = FileName},
-    snmpa_general_db:write(Db, Rec),
-    install_mib2(Symbolic, MibName, Mib),
-    NewF = fun(ME) -> call_instrumentation(ME, new) end,
-    lists:foreach(NewF, NonInternalMes).
+-callback close(State :: term()) -> ok.
 
-install_mib2(true, MibName, Mib) ->
-    #mib{table_infos    = TabInfos,
-	 variable_infos = VarInfos,
-	 mes            = MEs,
-	 asn1_types     = ASN1Types,
-	 traps          = Traps} = Mib,
-    snmpa_symbolic_store:add_table_infos(MibName, TabInfos),
-    snmpa_symbolic_store:add_variable_infos(MibName, VarInfos),
-    snmpa_symbolic_store:add_aliasnames(MibName, MEs),
-    snmpa_symbolic_store:add_types(MibName, ASN1Types),
-    SetF = fun(Trap) -> 
-		   snmpa_symbolic_store:set_notification(Trap, MibName)
-	   end,
-    lists:foreach(SetF, Traps);
-install_mib2(_, _, _) ->
-    ok.
+-callback sync(State :: term()) -> ok.
 
-install_mes(_Db, _MibName, []) ->
-    ok;
-install_mes(Db, MibName, [ME|MEs]) ->
-    Node = #node_info{oid = ME#me.oid, mib_name = MibName, me = ME},
-    snmpa_general_db:write(Db, Node),
-    install_mes(Db, MibName, MEs).
+-callback load_mib(State :: term(), FileName :: string(), 
+		   MeOverride :: boolean(), 
+		   TeOverride :: boolean()) -> 
+    {ok, NewState :: term()} | {error, Reason :: already_loaded | term()}.
 
+-callback unload_mib(State :: term(), FileName :: string(), 
+		   MeOverride :: boolean(), 
+		   TeOverride :: boolean()) -> 
+    {ok, NewState :: term()} | {error, Reason :: not_loaded | term()}.
 
-%%----------------------------------------------------------------------
-%% Does all side effect stuff during unload_mib.
-%%----------------------------------------------------------------------
-uninstall_mib(Db, Symbolic, MibName, MEs) ->
-    ?vtrace("uninstall_mib -> entry with"
-	"~n   Db:       ~p"
-	"~n   Symbolic: ~p"
-	"~n   MibName:  ~p", [Db, Symbolic, MibName]),
-    Res = snmpa_general_db:delete(Db, MibName),
-    ?vtrace("uninstall_mib -> (mib) db delete result: ~p", [Res]),
-    uninstall_mib2(Symbolic, MibName),
-    DelF = fun(ME) -> call_instrumentation(ME, delete) end,
-    lists:foreach(DelF, MEs).
+-callback lookup(State :: term(), Oid :: snmp:oid()) -> 
+    {false, Reason :: term()} | 
+    {variable, MibEntry :: snmpa:me()} |
+    {table_column, MibEntry :: snmpa:me(), TableEntryOid :: snmp:oid()} |
+    {subagent, SubAgentPid :: pid(), SAOid :: snmp:oid()}.
 
-uninstall_mib2(true, MibName) ->
-    snmpa_symbolic_store:delete_table_infos(MibName),
-    snmpa_symbolic_store:delete_variable_infos(MibName),
-    snmpa_symbolic_store:delete_aliasnames(MibName),
-    snmpa_symbolic_store:delete_types(MibName),
-    snmpa_symbolic_store:delete_notifications(MibName);
-uninstall_mib2(_, _) ->
-    ok.
+-callback next(State :: term(), Oid :: snmp:oid(), MibView :: mib_view()) -> 
+    endOfView | false | 
+    {subagent, SubAgentPid :: pid(), SAOid :: snmp:oid()} |
+    {variable, MibEntry :: snmpa:me(), VarOid :: snmp:oid()} |
+    {table, TableOid :: snmp:oid(), TableRestOid :: snmp:oid(), MibEntry :: snmpa:me()}.
 
-uninstall_mes(Db, MibName) ->
-    Pattern = #node_info{oid = '_', mib_name = MibName, me = '_'},
-    snmpa_general_db:match_delete(Db, Pattern).
+-callback register_subagent(State :: term(), 
+			    Oid   :: snmp:oid(), 
+			    Pid   :: pid()) -> 
+    {ok, NewState :: term()} | {error, Reason :: term()}.
 
+-callback unregister_subagent(State :: term(), 
+			      PidOrOid :: pid() | snmp:oid()) -> 
+    {ok, NewState :: term()}               | % When second arg was a pid()
+    {ok, NewState :: term(), Pid :: pid()} | % When second arg was a oid()
+    {error, Reason :: term()}.
 
-%%----------------------------------------------------------------------
-%% Create a list of the names of all the loaded mibs
-%%----------------------------------------------------------------------
-loaded(Db) ->
-    [N || #mib_info{name = N} <- snmpa_general_db:tab2list(Db)].
-    
+-callback dump(State :: term(), Destination :: io | filename()) -> 
+    ok | {error, Reason :: term()}.
 
-%%----------------------------------------------------------------------
-%% Calls MFA-instrumentation with 'new' or 'delete' operation.
-%%----------------------------------------------------------------------
-call_instrumentation(#me{entrytype = variable, mfa={M,F,A}}, Operation) ->
-    ?vtrace("call instrumentation with"
-	    "~n   entrytype: variable"
-	    "~n   MFA:       {~p,~p,~p}"
-	    "~n   Operation: ~p",
-	    [M,F,A,Operation]),
-    catch apply(M, F, [Operation | A]);
-call_instrumentation(#me{entrytype = table_entry, mfa={M,F,A}}, Operation) ->
-    ?vtrace("call instrumentation with"
-	    "~n   entrytype: table_entry"
-	    "~n   MFA:       {~p,~p,~p}"
-	    "~n   Operation: ~p",
-	    [M,F,A,Operation]),
-    catch apply(M, F, [Operation | A]);
-call_instrumentation(_ShitME, _Operation) ->
-    done.
+-callback which_mib(State :: term(), Oid :: snmp:oid()) -> 
+    {ok, Mib :: string()} | {error, Reason :: term()}.
 
+-callback which_mibs(State :: term()) -> 
+    [{MibName :: atom(), Filename :: string()}].
 
-maybe_drop_me(#me{entrytype = internal}) -> false;
-maybe_drop_me(#me{entrytype = group}) -> false;
-maybe_drop_me(#me{imported = true}) -> false;
-maybe_drop_me(_) -> true.
+-callback whereis_mib(State :: term(), MibName :: atom()) -> 
+    {ok, Filename :: string()} | {error, Reason :: term()}.
 
+-callback info(State :: term()) -> list().
 
-%%----------------------------------------------------------------------
-%% Code change functions
-%%----------------------------------------------------------------------
+-callback backup(State :: term(), BackupDir :: string()) -> 
+    ok |  {error, Reason :: term()}.
 
-code_change(down, State) ->
-    ?d("code_change(down) -> entry",[]),
-    State;
+-callback code_change(Direction :: up | down, 
+		      Vsn :: term(), 
+		      Extra :: term(), 
+		      State :: term()) -> 
+    NewState :: term().
 
-code_change(up, State) ->
-    ?d("code_change(up)",[]),
-    State;
 
-code_change(_Vsn, State) ->
-    State.
 
diff --git a/lib/snmp/src/agent/snmpa_mib_data_ttln.erl b/lib/snmp/src/agent/snmpa_mib_data_ttln.erl
new file mode 100644
index 0000000000..d367e8f13f
--- /dev/null
+++ b/lib/snmp/src/agent/snmpa_mib_data_ttln.erl
@@ -0,0 +1,1402 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2013-2013. All Rights Reserved.
+%% 
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%% 
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%% 
+%% %CopyrightEnd%
+%%
+
+-module(snmpa_mib_data_ttln).
+
+%%%-----------------------------------------------------------------
+%%% 
+%%%           THIS FILE IS JUST A PLACE HOLDER - IGNORE
+%%% 
+%%%-----------------------------------------------------------------
+
+
+%%%-----------------------------------------------------------------
+%%% 
+%%%        TTLN - TupleTreeListNodes
+%%% 
+%%% This module implements the MIB internal data structures.
+%%% An MIB Data Structure consists of three items; an ets-table,
+%%% a tree and a list of registered subagents.
+%%% The subagent information is consequently duplicated. It resides
+%%% both in the tree and in the list.
+%%% The ets-table contains all data associated with each variable,
+%%% table, tableentry and tablecolumn in the MIB.
+%%% The tree contains information of the Oids in the MIB.
+%%%
+%%% When a mib is loaded, the tree is built from the plain list
+%%% in the binary file.
+%%% 
+%%%-----------------------------------------------------------------
+
+-include("snmp_types.hrl").
+-include("snmp_debug.hrl").
+
+-define(VMODULE,"MDATA_TTLN").
+-include("snmp_verbosity.hrl").
+
+-behaviour(snmpa_mib_data).
+
+-define(MIB_DATA, snmpa_mib_data).
+-define(MIB_NODE, snmpa_mib_node).
+-define(MIB_TREE, snmpa_mib_tree).
+-define(DUMMY_TREE_GENERATION, 1).
+-define(DEFAULT_TREE, {tree,{undefined_node},internal}).
+
+
+%%%-----------------------------------------------------------------
+%%% Table of contents
+%%% =================
+%%% 1. Interface
+%%% 2. Implementation of tree access
+%%% 3. Tree building functions
+%%% 4. Tree merging
+%%% 5. Tree deletion routines
+%%% 6. Functions for subagent handling
+%%% 7. Misc functions
+%%%-----------------------------------------------------------------
+
+
+%%----------------------------------------------------------------------
+%% data_db is an database containing loaded mibs as:
+%%    {MibName = atom(), Symbolic = ?, FullFileName = string()}
+%%    it is either ets or mnesia
+%% tree_db is a database containing _one_ record with the tree!
+%% (the reason for this is part to get replication and part out of convenience)
+%% ref_tree is the root node, without any subagent.
+%% tree is the root node (same as ref_tree but with the subagents added).
+%% subagents is a list of {SAPid, Oid}
+%%----------------------------------------------------------------------
+-record(mib_data, {mib_db,  % table of #mib_info
+		   node_db, % table of #node_info
+		   tree_db, % table of #tree
+		   tree,    % The actual tree
+		   subagents = []}).
+
+-record(mib_info,  {name, symbolic, file_name}).
+-record(node_info, {oid, mib_name, me}).
+
+
+%% API
+-export([new/0, new/1, sync/1, close/1, 
+	 load_mib/4, unload_mib/4, which_mibs/1, whereis_mib/2, 
+	 info/1, info/2,
+	 dump/1, dump/2, 
+	 backup/2, 
+	 lookup/2, next/3, which_mib/2, 
+	 register_subagent/3, unregister_subagent/2]).
+
+%% Internal exports
+-export([code_change/2]).
+
+
+%%-----------------------------------------------------------------
+%% A tree is represented as a N-tuple, where each element is a
+%% node. A node is:
+%% 1) {tree, Tree, Info} where Info can be {table, Id}, {table_entry, Id}
+%%                                        or perhaps 'internal'
+%% 2) undefined_node  (memory optimization (instead of {node, undefined}))
+%% 3) {node, Info} where Info can be {subagent, Pid}, {variable, Id}, 
+%%                                   {table_column, Id}
+%% Id is {MibName, MibEntry}
+%% The over all root is represented as {tree, Tree, internal}.
+%%
+%% tree() = {tree, nodes(), tree_info()}
+%% nodes() = [tree() | node() | undefined_node]
+%% node() = {node, node_info()}
+%% tree_info() = {table, Id} | {table_entry, Id} | internal
+%% node_info() = {subagent, Pid} | {variable, Id} | {table_colum, Id}
+%%-----------------------------------------------------------------
+
+-type tree_generation() :: non_neg_integer().
+-type tree()            :: #tree{}.
+-type tree_nodes()      :: [tree_node()].
+-type tree_node()       :: tree() | 
+			   tree_node_elem() | 
+			   tree_node_empty().
+-type tree_node_elem()  :: {node, tree_node_info()}.
+-type tree_node_info()  :: {subagent,     Pid :: pid()} | 
+			   {variable,     Id  :: non_neg_integer()} | 
+			   {table_column, Id  :: non_neg_integer()}.
+-type tree_node_empty() :: {undefined_node, N :: pos_integer()}.
+-type tree_info()       :: {table,       Id :: non_neg_integer()} | 
+			   {table_entry, Id :: non_neg_integer()} | 
+			   internal.
+
+
+%% This record is what is stored in the database. The 'tree' part
+%% is described above...
+-record(mtree, 
+	{
+	  generation = ?DUMMY_TREE_GENERATION :: tree_generation(), 
+	  root       = ?DEFAULT_TREE          :: tree()
+	}).
+
+-record(tree, 
+	{
+	  %% The number of nodes is *not* actually the length of the
+	  %% nodes list. Since the undefined-node(s) can be collapsed
+	  %% into {undefined_node, N} we need to keep track of the 
+	  %% actual size some other way (so that we dont have the 
+	  %% traverse the nodes every time we want to check an index).
+	  num_nodes :: non_neg_integer(), 
+	  nodes     :: tree_nodes(), 
+	  tree_info :: tree_info()
+	}).
+
+
+
+
+%%%======================================================================
+%%% 1. Interface
+%%%======================================================================
+
+%%-----------------------------------------------------------------
+%% Func: new/0, new/1
+%% Returns: A representation of mib data.
+%%-----------------------------------------------------------------
+new() ->
+    new(ets).
+
+%% Where -> A list of nodes where the tables will be created
+new(Storage) ->
+    %% First we must check if there is already something to read
+    %% If a database already exists, then the tree structure has to be read
+    ?vtrace("open (mib) database",[]),
+    MibDb = snmpa_general_db:open(Storage, ?MIB_DATA,
+				  mib_info,
+				  record_info(fields, mib_info), set),
+    ?vtrace("open (mib) node database",[]),
+    NodeDb = snmpa_general_db:open(Storage, ?MIB_NODE,
+				   node_info,
+				   record_info(fields, node_info), set),
+    ?vtrace("open (mib) tree database",[]),
+    TreeDb = snmpa_general_db:open(Storage, ?MIB_TREE,
+				   tree,
+				   record_info(fields, mtree), set),
+    MTree = 
+	case snmpa_general_db:read(TreeDb, ?DUMMY_TREE_GENERATION) of
+	    false ->
+		T = #mtree{},
+		snmpa_general_db:write(TreeDb, T),
+		T;
+	    {value, T} ->
+		T
+	end,
+    install_mibs(MibDb, NodeDb),
+    #mib_data{mib_db   = MibDb, 
+	      node_db  = NodeDb,
+	      tree_db  = TreeDb, 
+	      mtree    = MTree}.
+
+
+%%----------------------------------------------------------------------
+%% Returns: new mib data | {error, Reason}
+%%----------------------------------------------------------------------
+load_mib(MibData,FileName,MeOverride,TeOverride) 
+  when is_record(MibData,mib_data) andalso is_list(FileName) -> 
+    ?vlog("load mib file: ~p",[FileName]),
+    ActualFileName = filename:rootname(FileName, ".bin") ++ ".bin",
+    MibName = list_to_atom(filename:basename(FileName, ".bin")),
+    (catch do_load_mib(MibData, ActualFileName, MibName, 
+                       MeOverride, TeOverride)).
+
+do_load_mib(MibData, ActualFileName, MibName, MeOverride, TeOverride) ->
+    ?vtrace("do_load_mib -> entry with"
+        "~n  ActualFileName: ~s"
+        "~n  MibName:        ~p",[ActualFileName, MibName]),
+    #mib_data{mib_db  = MibDb, 
+	      node_db = NodeDb, 
+	      %% tree_db = TreeDb,
+	      tree    = Tree} = MibData,
+    verify_not_loaded(MibDb, MibName),
+    ?vtrace("do_load_mib -> already loaded mibs:"
+	"~n   ~p",[loaded(MibDb)]),
+    Mib = do_read_mib(ActualFileName),
+    ?vtrace("do_load_mib -> read mib ~s",[Mib#mib.name]),
+    NonInternalMes = 
+        lists:filter(fun(ME) -> maybe_drop_me(ME) end, Mib#mib.mes),
+    OldRoot = Tree#tree.root,
+    T = build_tree(NonInternalMes, MibName),
+    ?d("load_mib -> "
+	"~n   OldRoot: ~p"
+	"~n   T:       ~p", [OldRoot, T]),
+    case (catch merge_nodes(T, OldRoot)) of
+	{error_merge_nodes, Node1, Node2} ->
+	    ?vlog("error merging nodes:"
+		"~n~p~nand~n~p", [Node1,Node2]),
+	    {error, oid_conflict};
+	NewRoot when is_tuple(NewRoot) andalso (element(1,NewRoot) =:= tree) ->
+ 	    ?d("load_mib -> "
+ 		"~n   NewRoot: ~p", [NewRoot]),
+	    Symbolic = not lists:member(no_symbolic_info, Mib#mib.misc),
+	    case (catch check_notif_and_mes(TeOverride, MeOverride, Symbolic, 
+					    Mib#mib.traps, NonInternalMes)) of
+		true ->
+		    install_mes(NodeDb, MibName, NonInternalMes),
+		    install_mib(MibDb, Symbolic, Mib, 
+				MibName, ActualFileName, NonInternalMes),
+		    ?vtrace("installed mib ~s", [Mib#mib.name]),
+		    Tree2 = Tree#tree{root = NewRoot},
+		    %% snmpa_general_db:write(TreeDb, Tree2), %% Store later?
+		    {ok, MibData#mib_data{tree = Tree2}};
+		Else -> 
+		    Else
+	    end
+    end.
+
+
+verify_not_loaded(Db, Name) ->
+    case snmpa_general_db:read(Db, Name) of
+        {value, #mib_info{name = Name}} -> 
+            throw({error, 'already loaded'});
+        false ->
+            ok
+    end.
+
+do_read_mib(ActualFileName) ->
+    case snmp_misc:read_mib(ActualFileName) of
+        {error, Reason} -> 
+            ?vlog("Failed reading mib file ~p with reason: ~p",
+                [ActualFileName,Reason]),
+            throw({error, Reason});
+        {ok, Mib} ->
+            Mib
+    end.
+
+%% The Tree DB is handled in a special way since it can be very large.
+sync(#mib_data{mib_db  = M, 
+	       node_db = N, 
+	       tree_db = T, tree = Tree, subagents = []}) ->
+    snmpa_general_db:sync(M),
+    snmpa_general_db:sync(N),
+    snmpa_general_db:write(T, Tree),
+    snmpa_general_db:sync(T);
+sync(#mib_data{mib_db  = M, 
+	       node_db = N, 
+	       tree_db = T, tree = Tree, subagents = SAs}) ->
+
+    snmpa_general_db:sync(M),
+    snmpa_general_db:sync(N),
+
+    %% Ouch. Since the subagent info is dynamic we do not 
+    %% want to store the tree containing subagent info. So, we 
+    %% have to create a tmp tree without those and store it.
+
+    case delete_subagents(Tree, SAs) of
+	{ok, TreeWithoutSAs} ->
+	    snmpa_general_db:write(T, TreeWithoutSAs),
+	    snmpa_general_db:sync(T);
+	Error ->
+	    Error
+    end.
+
+delete_subagents(Tree, []) ->
+    {ok, Tree};
+delete_subagents(Tree0, [{_, Oid}|SAs]) ->
+    case (catch delete_subagent(Tree0, Oid)) of
+	{tree, _Tree, _Info} = Tree1 ->
+	    delete_subagents(Tree1, SAs);
+	_Error ->
+	    {error, {'invalid oid', Oid}} 
+    end.
+
+%%----------------------------------------------------------------------
+%% (OTP-3601)
+%%----------------------------------------------------------------------
+check_notif_and_mes(TeOverride,MeOverride,Symbolic,Traps,MEs) ->
+    ?vtrace("check notifications and mib entries",[]),
+    check_notifications(TeOverride,Symbolic,Traps),
+    check_mes(MeOverride,MEs).
+
+check_notifications(true, _Symbolic, _Traps) ->
+    ?vtrace("trapentry override = true => skip check",[]),
+    true;
+check_notifications(_, Symbolic, Traps) -> 
+    check_notifications(Symbolic, Traps).
+
+check_notifications(true, Traps) ->
+    check_notifications(Traps);
+check_notifications(_, _) -> true.
+
+check_notifications([]) -> true;
+check_notifications([#trap{trapname = Key} = Trap | Traps]) ->
+    ?vtrace("check notification [trap] with Key: ~p",[Key]),
+    case snmpa_symbolic_store:get_notification(Key) of
+	{value, Trap} -> check_notifications(Traps);
+	{value,    _} -> throw({error, {'trap already defined', Key}});
+	undefined     -> check_notifications(Traps)
+    end;
+check_notifications([#notification{trapname = Key} = Notif | Traps]) ->
+    ?vtrace("check notification [notification] with Key: ~p",[Key]),
+    case snmpa_symbolic_store:get_notification(Key) of
+	{value, Notif} -> 
+	    check_notifications(Traps);
+	{value,     _} -> 
+	    throw({error, {'notification already defined', Key}});
+	undefined      -> 
+	    check_notifications(Traps)
+    end;
+check_notifications([Crap | Traps]) ->
+    ?vlog("skipped check of: ~n~p",[Crap]),
+    check_notifications(Traps).
+
+check_mes(true,_) ->
+    ?vtrace("mibentry override = true => skip check",[]),
+    true; 
+check_mes(_,MEs) ->
+    check_mes(MEs).
+
+check_mes([]) -> true;
+check_mes([#me{aliasname = Name, oid = Oid1} | MEs]) ->
+    ?vtrace("check mib entries with aliasname: ~p",[Name]),
+    case snmpa_symbolic_store:aliasname_to_oid(Name) of
+	{value, Oid1} -> 
+	    check_mes(MEs);
+	{value, Oid2} -> 
+	    ?vinfo("~n   expecting '~p'~n   but found '~p'",[Oid1, Oid2]),
+	    throw({error, {'mibentry already defined', Name}});
+	false -> 
+	    check_mes(MEs)
+    end;
+check_mes([Crap | MEs]) ->
+    ?vlog("skipped check of: ~n~p",[Crap]),
+    check_mes(MEs).
+    
+
+
+%%----------------------------------------------------------------------
+%% Returns: new mib data | {error, Reason}
+%%----------------------------------------------------------------------
+unload_mib(MibData, FileName, _, _) when is_list(FileName) -> 
+    MibName = list_to_atom(filename:basename(FileName, ".bin")),
+    (catch do_unload_mib(MibData, MibName)).
+
+do_unload_mib(MibData, MibName) ->
+    ?vtrace("do_unload_mib -> entry with"
+	"~n   MibName: ~p", [MibName]),
+    #mib_data{mib_db  = MibDb, 
+	      node_db = NodeDb, 
+	      %% tree_db = TreeDb, 
+	      tree    = Tree} = MibData,
+    #mib_info{symbolic = Symbolic} = verify_loaded(MibDb, MibName),
+    NewRoot = delete_mib_from_tree(MibName, Tree#tree.root),
+    MEs = uninstall_mes(NodeDb, MibName),
+    uninstall_mib(MibDb, Symbolic, MibName, MEs),
+    NewMibData = MibData#mib_data{tree = Tree#tree{root = NewRoot}},
+    {ok, NewMibData}.
+
+verify_loaded(Db, Name) ->
+    case snmpa_general_db:read(Db, Name) of
+        {value, MibInfo} ->
+            MibInfo;
+        false ->
+            throw({error, 'not loaded'})
+    end.
+    
+    
+close(#mib_data{mib_db = MibDb, node_db = NodeDb, tree_db = TreeDb}) ->
+    snmpa_general_db:close(MibDb),
+    snmpa_general_db:close(NodeDb),
+    snmpa_general_db:close(TreeDb),
+    ok.
+
+register_subagent(#mib_data{tree = T} = MibData, Oid, Pid) ->
+    case insert_subagent(Oid, T#tree.root) of
+	{error, Reason} -> 
+	    {error, Reason};
+	NewRootTree ->
+	    SAs = [{Pid, Oid} | MibData#mib_data.subagents],
+	    T2 = T#tree{root = NewRootTree},
+	    MibData#mib_data{tree = T2, subagents = SAs}
+    end.
+
+
+%%----------------------------------------------------------------------
+%% Purpose: Get a list of all loaded mibs
+%% Returns: [{Name, File}]
+%%----------------------------------------------------------------------
+
+which_mibs(#mib_data{mib_db = Db}) ->
+    Mibs = snmpa_general_db:tab2list(Db),
+    [{Name, File} || #mib_info{name = Name, file_name = File} <- Mibs].
+
+
+%%----------------------------------------------------------------------
+%% Purpose: Get a list of all loaded mibs
+%% Returns: [{Name, File}]
+%%----------------------------------------------------------------------
+
+whereis_mib(#mib_data{mib_db = Db}, Name) ->
+    case snmpa_general_db:read(Db, Name) of
+        {value, #mib_info{file_name = File}} ->
+	    {ok, File};
+	false ->
+	    {error, not_found}
+    end.
+
+
+%%----------------------------------------------------------------------
+%% Purpose: Deletes SA with Pid from all subtrees it handles.
+%% Returns: NewMibData.
+%%----------------------------------------------------------------------
+unregister_subagent(MibData, Pid) when is_pid(Pid) ->
+    SAs = MibData#mib_data.subagents,
+    case lists:keysearch(Pid, 1, SAs) of
+	false -> MibData;
+	{value, {Pid, Oid}} ->
+	    % we should never get an error since Oid is found in MibData.
+	    {ok, NewMibData, _DeletedSA} = unregister_subagent(MibData, Oid),
+	    % continue if the same Pid handles other mib subtrees.
+	    unregister_subagent(NewMibData, Pid)
+    end;
+
+%%----------------------------------------------------------------------
+%% Purpose: Deletes one unique subagent. 
+%% Returns: {error, Reason} | {ok, NewMibData, DeletedSubagentPid}
+%%----------------------------------------------------------------------
+unregister_subagent(#mib_data{tree = T} = MibData, Oid) when is_list(Oid) ->
+    case catch delete_subagent(T#tree.root, Oid) of
+	{tree, Tree, Info} ->
+	    OldSAs = MibData#mib_data.subagents,
+	    {value, {Pid, _Oid}} = lists:keysearch(Oid, 2, OldSAs),
+	    SAs = lists:keydelete(Oid, 2, OldSAs),
+	    T2 = T#tree{root = {tree, Tree, Info}},
+	    {ok, 
+	     MibData#mib_data{tree = T2, subagents = SAs},
+	     Pid};
+	_ ->
+	    {error, {'invalid oid', Oid}}
+    end.
+
+%%----------------------------------------------------------------------
+%% Purpose: To inpect memory usage, loaded mibs, registered subagents
+%%----------------------------------------------------------------------
+info(MibData) ->
+    ?vtrace("retrieve info",[]),
+    #mib_data{mib_db = MibDb, node_db = NodeDb, tree_db = TreeDb, 
+	      tree = Tree, subagents = SAs} = MibData,
+    LoadedMibs = old_format(snmpa_general_db:tab2list(MibDb)),
+    TreeSize = snmp_misc:mem_size(Tree),
+    {memory, ProcSize} = erlang:process_info(self(),memory),
+    MibDbSize  = snmpa_general_db:info(MibDb,  memory),
+    NodeDbSize = snmpa_general_db:info(NodeDb, memory),
+    TreeDbSize = snmpa_general_db:info(TreeDb, memory),
+    [{loaded_mibs, LoadedMibs}, {subagents, SAs}, {tree_size_bytes, TreeSize},
+     {process_memory, ProcSize}, 
+     {db_memory, [{mib,MibDbSize},{node,NodeDbSize},{tree,TreeDbSize}]}].
+
+info(#mib_data{mib_db = MibDb}, loaded_mibs) ->
+    Mibs = snmpa_general_db:tab2list(MibDb),
+    [filename:rootname(FN, ".bin") || #mib_info{file_name = FN} <- Mibs];
+info(#mib_data{tree = Tree}, tree_size_bytes) ->
+    snmp_misc:mem_size(Tree);
+info(_, process_memory) ->
+    {memory, ProcSize} = erlang:process_info(self(),memory),
+    ProcSize;
+info(#mib_data{mib_db = MibDb, node_db = NodeDb, tree_db = TreeDb}, 
+     db_memory) ->
+    MibDbSize  = snmpa_general_db:info(MibDb,  memory),
+    NodeDbSize = snmpa_general_db:info(NodeDb, memory),
+    TreeDbSize = snmpa_general_db:info(TreeDb, memory),
+    [{mib,MibDbSize},{node,NodeDbSize},{tree,TreeDbSize}];
+info(#mib_data{subagents = SAs}, subagents) ->
+    SAs.
+
+old_format(LoadedMibs) ->
+    ?vtrace("convert mib info to old format",[]),
+    [{N,S,F} || #mib_info{name=N,symbolic=S,file_name=F} <- LoadedMibs].
+
+    
+%%----------------------------------------------------------------------
+%% A total dump for debugging.
+%%----------------------------------------------------------------------
+dump(#mib_data{mib_db = MibDb, node_db = NodeDb, tree = Tree}) ->
+    (catch io:format("MIB-tables:~n~p~n~n", 
+		     [snmpa_general_db:tab2list(MibDb)])),
+    (catch io:format("MIB-entries:~n~p~n~n", 
+		     [snmpa_general_db:tab2list(NodeDb)])),
+    (catch io:format("Tree:~n~p~n", [Tree])), % good luck reading it!
+    ok.
+
+dump(#mib_data{mib_db = MibDb, node_db = NodeDb, tree = Tree}, File) ->
+    case file:open(File,[write]) of
+	{ok, Fd} ->
+	    io:format(Fd,"~s~n", 
+		      [snmp:date_and_time_to_string(snmp:date_and_time())]),
+	    (catch io:format(Fd,"MIB-tables:~n~p~n~n",
+			     [snmpa_general_db:tab2list(MibDb)])),
+	    (catch io:format(Fd, "MIB-entries:~n~p~n~n", 
+			     [snmpa_general_db:tab2list(NodeDb)])),
+	    io:format(Fd,"Tree:~n~p~n", [Tree]), % good luck reading it!
+	    file:close(Fd),
+	    ok;
+	{error,Reason} ->
+	    ?vinfo("~n   Failed opening file '~s' for reason ~p",
+		   [File,Reason]),
+	    {error,Reason}
+    end.
+
+
+backup(#mib_data{mib_db = M, node_db = N, tree_db = T}, BackupDir) ->
+    MRes = snmpa_general_db:backup(M, BackupDir),
+    NRes = snmpa_general_db:backup(N, BackupDir),
+    TRes = snmpa_general_db:backup(T, BackupDir),
+    handle_backup_res([{mib_db, MRes}, {node_db, NRes}, {tree_db, TRes}]).
+
+handle_backup_res(Res) ->
+    handle_backup_res(Res, []).
+
+handle_backup_res([], []) ->
+    ok;
+handle_backup_res([], Err) ->
+    {error, lists:reverse(Err)};
+handle_backup_res([{_, ok}|Res], Err) ->
+    handle_backup_res(Res, Err);
+handle_backup_res([{Tag, {error, Reason}}|Res], Err) ->
+    handle_backup_res(Res, [{Tag, Reason}|Err]);
+handle_backup_res([{Tag, Error}|Res], Err) ->
+    handle_backup_res(Res, [{Tag, Error}|Err]).
+
+
+%%%======================================================================
+%%% 2. Implementation of tree access
+%%%    lookup and next.
+%%%======================================================================
+
+
+which_mib(#mib_data{tree = T} = D, Oid) ->
+    ?vtrace("which_mib -> entry with"
+	    "~n   Oid: ~p",[Oid]),	    
+    case (catch find_node(D, T#tree.root, Oid, [])) of
+	{variable, _ME, Mib} ->
+	    ?vtrace("which_mib -> variable:"
+		"~n   Mib: ~p", [Mib]),	    
+	    {ok, Mib};
+	{table, _EntryME, _, Mib} ->
+	    ?vtrace("which_mib -> table:"
+		"~n   Mib: ~p", [Mib]),	    
+	    {ok, Mib};
+	{subagent, SubAgentPid, _SANextOid} ->
+	    ?vtrace("which_mib -> subagent:"
+		"~n   SubAgentPid: ~p", [SubAgentPid]),	    
+	    {error, {subagent, SubAgentPid}};
+	{false, ErrorCode} -> 
+	    ?vtrace("which_mib -> false:"
+		"~n   ErrorCode: ~p",[ErrorCode]),	    
+	    {error, ErrorCode};
+	false -> 
+	    ?vtrace("which_mib -> false",[]),	    
+	    {error, noSuchObject};
+	{'EXIT', R} -> 
+	    ?vtrace("which_mib -> exit:"
+		"~n   R:  ~p",[R]),	    
+	    {error, noSuchObject}
+    end.
+
+
+%%-----------------------------------------------------------------
+%% Func: lookup/2
+%% Purpose: Finds the mib entry corresponding to the Oid. If it is a
+%%          variable, the Oid must be <Oid for var>.0 and if it is
+%%          a table, Oid must be <table>.<entry>.<col>.<any>
+%% Returns: {variable, MibEntry} |
+%%          {table_column, MibEntry, TableEntryOid} |
+%%          {subagent, SubAgentPid, SAOid} |
+%%          {false, Reason}
+%%-----------------------------------------------------------------
+lookup(#mib_data{tree = T} = D, Oid) ->
+     ?vtrace("lookup -> entry with"
+ 	"~n   Oid: ~p",[Oid]),	    
+    case (catch find_node(D, T#tree.root, Oid, [])) of
+	{variable, ME, _Mib} when is_record(ME, me) -> 
+	    ?vtrace("lookup -> variable:"
+		"~n   ME: ~p",[ME]),	    
+	    {variable, ME};
+	{table, EntryME, {ColME, TableEntryOid}, _Mib} ->
+	    ?vtrace("lookup -> table:"
+		"~n   EntryME:          ~p"
+		"~n   ColME:            ~p"
+		"~n   RevTableEntryOid: ~p",
+		[EntryME, ColME, TableEntryOid]),	    
+	    MFA = EntryME#me.mfa,
+	    RetME = ColME#me{mfa = MFA},
+	    {table_column, RetME, TableEntryOid};
+	{subagent, SubAgentPid, SANextOid} ->
+	    ?vtrace("lookup -> subagent:"
+		"~n   SubAgentPid: ~p"
+		"~n   SANextOid:   ~p", [SubAgentPid, SANextOid]),	    
+	    {subagent, SubAgentPid, SANextOid};
+	{false, ErrorCode} -> 
+	    ?vtrace("lookup -> false:"
+		"~n   ErrorCode: ~p",[ErrorCode]),	    
+	    {false, ErrorCode};
+	false -> 
+	    ?vtrace("lookup -> false",[]),	    
+	    {false, noSuchObject};
+	{'EXIT', R} -> 
+	    ?vtrace("lookup -> exit:"
+		"~n   R:  ~p",[R]),	    
+	    {false, noSuchObject}
+    end.
+
+
+find_node(D, {tree, Tree, {table, _}}, RestOfOid, RevOid) ->
+     ?vtrace("find_node(tree,table) -> entry with"
+ 	"~n   RestOfOid: ~p"
+ 	"~n   RevOid:    ~p",[RestOfOid, RevOid]),
+    find_node(D, {tree, Tree, internal}, RestOfOid, RevOid);
+find_node(D, {tree, Tree, {table_entry, _}}, RestOfOid, RevOid) ->
+     ?vtrace("find_node(tree,table_entry) -> entry with"
+ 	"~n   RestOfOid: ~p"
+ 	"~n   RevOid:    ~p",[RestOfOid, RevOid]),
+    #mib_data{node_db = Db} = D,
+    Oid = lists:reverse(RevOid),
+    case snmpa_general_db:read(Db, Oid) of
+	{value, #node_info{me = ME, mib_name = Mib}} ->
+	    case find_node(D, {tree, Tree, internal}, RestOfOid, RevOid) of
+		{false, ErrorCode} -> {false, ErrorCode};
+		Val -> {table, ME, Val, Mib}
+	    end;
+	false ->
+	    ?vinfo("find_node -> could not find table_entry ME with"
+		"~n   RevOid:    ~p"
+		"~n   when"
+		"~n   RestOfOid: ~p", 
+		[RevOid, RestOfOid]),
+	    false
+    end;
+find_node(D, {tree, Tree, _Internal}, [Int | RestOfOid], RevOid) ->
+    ?vtrace("find_node(tree) -> entry with"
+	"~n   Int:       ~p"
+	"~n   RestOfOid: ~p"
+	"~n   RevOid:    ~p",[Int, RestOfOid, RevOid]),
+    find_node(D, element(Int+1, Tree), RestOfOid, [Int | RevOid]);
+find_node(D, {node, {table_column, _}}, RestOfOid, [ColInt | RevOid]) ->
+     ?vtrace("find_node(tree,table_column) -> entry with"
+ 	"~n   RestOfOid: ~p"
+ 	"~n   ColInt:    ~p"
+ 	"~n   RevOid:    ~p",[RestOfOid, ColInt, RevOid]),
+    #mib_data{node_db = Db} = D,
+    Oid = lists:reverse([ColInt | RevOid]),
+    case snmpa_general_db:read(Db, Oid) of
+	{value, #node_info{me = ME}} ->
+	    {ME, lists:reverse(RevOid)}; 
+	false ->
+	    X = snmpa_general_db:read(Db, lists:reverse([ColInt | RevOid])),
+	    ?vinfo("find_node -> could not find table_column ME with"
+		"~n   RevOid: ~p"
+		"~n   trying  [~p|~p]"
+		"~n   X:      ~p", 
+		[RevOid, [ColInt | RevOid], X]),
+	    false
+    end;
+find_node(D, {node, {variable, _MibName}}, [0], RevOid) ->
+     ?vtrace("find_node(tree,variable,[0]) -> entry with"
+ 	"~n   RevOid:    ~p",[RevOid]),
+    #mib_data{node_db = Db} = D,
+    Oid = lists:reverse(RevOid),
+    %% {value, #node_info{me = ME}} = snmpa_general_db:read(Db, Oid),
+    case snmpa_general_db:read(Db, Oid) of
+	{value, #node_info{me = ME, mib_name = Mib}} ->
+	    {variable, ME, Mib};
+	false ->
+	    ?vinfo("find_node -> could not find variable ME with"
+		"~n   RevOid: ~p", [RevOid]),
+	    false
+    end;
+find_node(_D, {node, {variable, _MibName}}, [], _RevOid) ->
+    ?vtrace("find_node(tree,variable,[]) -> entry",[]),
+    {false, noSuchObject};
+find_node(_D, {node, {variable, _MibName}}, _, _RevOid) ->
+    ?vtrace("find_node(tree,variable) -> entry",[]),
+    {false, noSuchInstance};
+find_node(D, {node, subagent}, _RestOfOid, SARevOid) ->
+    ?vtrace("find_node(tree,subagent) -> entry with"
+ 	"~n   SARevOid:    ~p",[SARevOid]),
+    #mib_data{subagents = SAs} = D,
+    SAOid = lists:reverse(SARevOid),
+    case lists:keysearch(SAOid, 2, SAs) of
+	{value, {SubAgentPid, SAOid}} ->
+	    {subagent, SubAgentPid, SAOid};
+	false ->
+	    ?vinfo("find_node -> could not find subagent with"
+		"~n   SAOid: ~p"
+		"~n   SAs:   ~p", [SAOid, SAs]),
+	    false
+    end;    
+find_node(_D, Node, _RestOfOid, _RevOid) ->
+    ?vtrace("find_node -> failed:~n~p",[Node]),
+    {false, noSuchObject}.
+
+
+%%-----------------------------------------------------------------
+%% Func: next/3
+%% Purpose: Finds the lexicographically next oid.
+%% Returns: endOfMibView |
+%%          {subagent, SubAgentPid, SAOid} |
+%%          {variable, MibEntry, VarOid} |
+%%          {table, TableOid, TableRestOid, MibEntry}
+%% If a variable is returnes, it is in the MibView.
+%% If a table or subagent is returned, it *may* be in the MibView.
+%%-----------------------------------------------------------------
+next(#mib_data{tree = T} = D, Oid, MibView) ->
+    case catch next_node(D, T#tree.root, Oid, [], MibView) of
+	false -> endOfMibView;
+	Else -> Else
+    end.
+
+%%-----------------------------------------------------------------
+%% This function is used as long as we have any Oid left. Take
+%% one integer at a time from the Oid, and traverse the tree
+%% accordingly. When the Oid is empty, call find_next.
+%% Returns: {subagent, SubAgentPid, SAOid} |
+%%          false |
+%%          {variable, MibEntry, VarOid} |
+%%          {table, TableOid, TableRestOid, MibEntry}
+%%-----------------------------------------------------------------
+next_node(_D, undefined_node, _Oid, _RevOidSoFar, _MibView) ->
+    ?vtrace("next_node(undefined_node) -> entry", []),
+    false;
+
+next_node(_D, {tree, Tree, {table_entry, _Id}}, [Int | _Oid], 
+	  _RevOidSoFar, _MibView)
+  when Int+1 > size(Tree) ->
+    ?vtrace("next_node(tree,table_entry) -> entry when not found whith"
+	"~n   Int:        ~p"
+	"~n   size(Tree): ~p", [Int, size(Tree)]),
+    false;
+next_node(D, {tree, Tree, {table_entry, _MibName}},
+	  Oid, RevOidSoFar, MibView) ->
+    ?vtrace("next_node(tree,table_entry) -> entry when"
+	"~n   size(Tree):  ~p"
+	"~n   Oid:         ~p"
+	"~n   RevOidSoFar: ~p"
+	"~n   MibView:     ~p", [size(Tree), Oid, RevOidSoFar, MibView]),
+    OidSoFar = lists:reverse(RevOidSoFar),
+    case snmpa_acm:is_definitely_not_in_mib_view(OidSoFar, MibView) of
+	true -> 
+	    ?vdebug("next_node(tree,table_entry) -> not in mib view",[]),
+	    false;
+	_ -> 
+	    #mib_data{node_db = Db} = D,
+	    case snmpa_general_db:read(Db, OidSoFar) of
+		false ->
+		    ?vinfo("next_node -> could not find table_entry with"
+			"~n   OidSoFar: ~p", [OidSoFar]),
+		    false;
+		{value, #node_info{me = ME}} ->
+		    ?vtrace("next_node(tree,table_entry) -> found: ~n   ~p",
+			[ME]),
+		    {table, OidSoFar, Oid, ME}
+	    end
+    end;
+
+next_node(D, {tree, Tree, _Info}, [Int | RestOfOid], RevOidSoFar, MibView) 
+  when (Int < size(Tree)) andalso (Int >= 0) ->
+    ?vtrace("next_node(tree) -> entry when"
+	"~n   size(Tree):  ~p"
+	"~n   Int:         ~p"
+	"~n   RestOfOid:   ~p"
+	"~n   RevOidSoFar: ~p"
+	"~n   MibView:     ~p", 
+	[size(Tree), Int, RestOfOid, RevOidSoFar, MibView]),
+    case next_node(D, element(Int+1,Tree), 
+		   RestOfOid, [Int|RevOidSoFar], MibView) of
+	false -> 
+	    find_next(D, {tree, Tree, _Info}, Int+1, RevOidSoFar, MibView);
+	Else -> 
+	    Else
+    end;
+%% no solution
+next_node(D, {tree, Tree, _Info}, [], RevOidSoFar, MibView) ->
+    ?vtrace("next_node(tree,[]) -> entry when"
+	"~n   size(Tree):  ~p"
+	"~n   RevOidSoFar: ~p"
+	"~n   MibView:     ~p", 
+	[size(Tree), RevOidSoFar, MibView]),
+    find_next(D, {tree, Tree, _Info}, 0, RevOidSoFar, MibView);
+next_node(_D, {tree, Tree, _Info}, _RestOfOid, _RevOidSoFar, _MibView) ->
+    ?vtrace("next_node(tree) -> entry when"
+	"~n   size(Tree):  ~p", [size(Tree)]),
+    false;
+
+next_node(D, {node, subagent}, Oid, RevOidSoFar, MibView) ->
+    ?vtrace("next_node(node,subagent) -> entry when"
+	"~n   Oid:         ~p"
+	"~n   RevOidSoFar: ~p"
+	"~n   MibView:     ~p", 
+	[Oid, RevOidSoFar, MibView]),
+    OidSoFar = lists:reverse(RevOidSoFar),
+    case snmpa_acm:is_definitely_not_in_mib_view(OidSoFar, MibView) of
+	true -> 
+	    false;
+	_ -> 
+	    #mib_data{subagents = SAs} = D,
+	    case lists:keysearch(OidSoFar, 2, SAs) of
+		{value, {SubAgentPid, OidSoFar}} ->
+		    {subagent, SubAgentPid, OidSoFar};
+		_ ->
+		    ?vinfo("next_node -> could not find subagent with"
+			"~n   OidSoFar: ~p"
+			"~n   SAs:      ~p", [OidSoFar, SAs]),
+		    false
+	    end
+    end;
+    
+next_node(D, {node, {variable, _MibName}}, [], RevOidSoFar, MibView) ->
+    ?vtrace("next_node(node,variable,[]) -> entry when"
+	"~n   RevOidSoFar: ~p"
+	"~n   MibView:     ~p", 
+	[RevOidSoFar, MibView]),
+    OidSoFar = lists:reverse([0 | RevOidSoFar]),
+    case snmpa_acm:validate_mib_view(OidSoFar, MibView) of
+	true ->
+	    #mib_data{node_db = Db} = D,
+	    case snmpa_general_db:read(Db, lists:reverse(RevOidSoFar)) of
+		false ->
+		    ?vinfo("next_node -> could not find variable with"
+			"~n   RevOidSoFar: ~p", [RevOidSoFar]),
+		    false;
+		{value, #node_info{me = ME}} ->
+		    {variable, ME, OidSoFar}
+	    end;
+	_ -> 
+	    false
+    end;
+
+next_node(_D, {node, {variable, _MibName}}, _Oid, _RevOidSoFar, _MibView) ->
+    ?vtrace("next_node(node,variable) -> entry", []),
+    false.
+
+%%-----------------------------------------------------------------
+%% This function is used to find the first leaf from where we
+%% are.
+%% Returns: {subagent, SubAgentPid, SAOid} |
+%%          false |
+%%          {variable, MibEntry, VarOid} |
+%%          {table, TableOid, TableRestOid, MibEntry}
+%% PRE: This function must always be called with a {internal, Tree}
+%%      node.
+%%-----------------------------------------------------------------
+find_next(D, {tree, Tree, internal}, Idx, RevOidSoFar, MibView) 
+  when Idx < size(Tree) ->
+    case find_next(D, element(Idx+1, Tree), 0, [Idx| RevOidSoFar], MibView) of
+	false -> 
+	    find_next(D, {tree, Tree, internal}, Idx+1, RevOidSoFar, MibView);
+	Other -> 
+	    Other
+    end;
+find_next(_D, {tree, _Tree, internal}, _Idx, _RevOidSoFar, _MibView) ->
+    false;
+find_next(_D, undefined_node, _Idx, _RevOidSoFar, _MibView) ->
+    false;
+find_next(D, {tree, Tree, {table, _MibName}}, Idx, RevOidSoFar, MibView) ->
+    find_next(D, {tree, Tree, internal}, Idx, RevOidSoFar, MibView);
+find_next(D, {tree, _Tree, {table_entry, _MibName}}, _Index,
+	  RevOidSoFar, MibView) ->
+    OidSoFar = lists:reverse(RevOidSoFar),
+    case snmpa_acm:is_definitely_not_in_mib_view(OidSoFar, MibView) of
+	true -> 
+	    false;
+	_ -> 
+	    #mib_data{node_db = Db} = D,
+	    case snmpa_general_db:read(Db, OidSoFar) of
+		false ->
+		    ?vinfo("find_next -> could not find table_entry ME with"
+			"~n   OidSoFar: ~p", [OidSoFar]),
+		    false;
+		{value, #node_info{me = ME}} ->
+		    {table, OidSoFar, [], ME}
+	    end
+    end;
+find_next(D, {node, {variable, _MibName}}, _Idx, RevOidSoFar, MibView) ->
+    OidSoFar = lists:reverse([0 | RevOidSoFar]),
+    case snmpa_acm:validate_mib_view(OidSoFar, MibView) of
+	true -> 
+	    #mib_data{node_db = Db} = D,
+	    case snmpa_general_db:read(Db, lists:reverse(RevOidSoFar)) of
+		false ->
+		    ?vinfo("find_next -> could not find variable with"
+			"~n   RevOidSoFar: ~p", [RevOidSoFar]),
+		    false;
+		{value, #node_info{me = ME}} ->
+		    {variable, ME, OidSoFar}
+	    end;
+	_ -> 
+	    false
+    end;
+find_next(D, {node, subagent}, _Idx, RevOidSoFar, MibView) ->
+    OidSoFar = lists:reverse(RevOidSoFar),
+    case snmpa_acm:is_definitely_not_in_mib_view(OidSoFar, MibView) of
+	true -> 
+	    false;
+	_ -> 
+	    #mib_data{subagents = SAs} = D,
+	    case lists:keysearch(OidSoFar, 2, SAs) of
+		{value, {SubAgentPid, OidSoFar}} ->
+		    {subagent, SubAgentPid, OidSoFar};
+		false ->
+		    ?vinfo("find_node -> could not find subagent with"
+			"~n   OidSoFar: ~p"
+			"~n   SAs:      ~p", [OidSoFar, SAs]),
+		    false
+	    end
+    end.
+
+%%%======================================================================
+%%% 3. Tree building functions
+%%%    Used when loading mibs.
+%%%======================================================================
+
+build_tree(Mes, MibName) ->
+    ?d("build_tree -> "
+	"~n   Mes: ~p", [Mes]),
+    {ListTree, []}  = build_subtree([], Mes, MibName),
+    {tree, convert_tree(ListTree), internal}.
+
+%%----------------------------------------------------------------------
+%% Purpose: Builds the tree where all oids have prefix equal to LevelPrefix.
+%% Returns: {Tree, RestMes}
+%% RestMes are Mes that should not be in this subtree.
+%% The Tree is a temporary and simplified data structure that is easy to
+%% convert to the final tuple tree used by the MIB process.
+%% A Node is represented as in the final tree.
+%% The tree is not represented as a N-tuple, but as an Index-list.
+%% Example: Temporary: [{1, Node1}, {3, Node3}]
+%%          Final:     {Node1, undefined_node, Node3}
+%% Pre: Mes are sorted on oid.
+%%----------------------------------------------------------------------
+build_subtree(LevelPrefix, [Me | Mes], MibName) ->
+    ?vtrace("build subtree -> ~n"
+	   "   oid:         ~p~n"
+	   "   LevelPrefix: ~p~n"
+	   "   MibName:     ~p", [Me#me.oid, LevelPrefix, MibName]),
+    EType = Me#me.entrytype,
+    ?vtrace("build subtree -> EType = ~p",[EType]),
+    case in_subtree(LevelPrefix, Me) of
+	above ->
+	    ?vtrace("build subtree -> above",[]),
+	    {[], [Me|Mes]};
+	{node, Index} ->
+	    ?vtrace("build subtree -> node at ~p",[Index]),
+	    {Tree, RestMes} = build_subtree(LevelPrefix, Mes, MibName),
+	    {[{Index, {node, {EType, MibName}}} | Tree], RestMes};
+	{subtree, Index, NewLevelPrefix} ->
+	    ?vtrace("build subtree -> subtree at"
+		    "~n   ~w with ~w",
+		   [Index, NewLevelPrefix]),
+	    {BelowTree, RestMes} = 
+		build_subtree(NewLevelPrefix, Mes, MibName),
+	    {CurTree, RestMes2} = 
+		build_subtree(LevelPrefix, RestMes, MibName),
+	    {[{Index, {tree, BelowTree, {EType,MibName}}}| CurTree], RestMes2};
+	{internal_subtree, Index, NewLevelPrefix} ->
+	    ?vtrace("build subtree -> internal_subtree at"
+		    "~n   ~w with ~w",
+		   [Index,NewLevelPrefix]),
+	    {BelowTree, RestMes} =
+		build_subtree(NewLevelPrefix, [Me | Mes], MibName),
+	    {CurTree, RestMes2} =
+		build_subtree(LevelPrefix, RestMes, MibName),
+	    {[{Index, {tree, BelowTree, internal}} | CurTree], RestMes2}
+    end;
+
+build_subtree(_LevelPrefix, [], _MibName) -> 
+    ?vtrace("build subtree -> done", []),
+    {[], []}.
+
+%%--------------------------------------------------
+%% Purpose: Determine how/if/where Me should be inserted in subtree
+%%          with LevelPrefix. This function does not build any tree, only 
+%%          determinses what should be done (by build subtree).
+%% Returns:
+%% above - Indicating that this ME should _not_ be in this subtree.
+%% {node, Index} - yes, construct a node with index Index on this level
+%% {internal_subtree, Index, NewLevelPrefix} - yes, there should be an
+%%   internal subtree at this index.
+%% {subtree, Index, NewLevelPrefix} - yes, construct a subtree with 
+%%   NewLevelPrefix and insert this on current level in position Index.
+%%--------------------------------------------------
+in_subtree(LevelPrefix, Me) ->
+    case lists:prefix(LevelPrefix, Me#me.oid) of
+	true when length(Me#me.oid) > length(LevelPrefix) ->
+	    classify_how_in_subtree(LevelPrefix, Me);
+	_ ->
+	    above
+    end.
+
+%%--------------------------------------------------
+%% See comment about in_subtree/2.  This function takes care of all cases
+%% where the ME really should be in _this_ subtree (not above).
+%%--------------------------------------------------
+classify_how_in_subtree(LevelPrefix, Me) 
+  when (length(Me#me.oid) =:= (length(LevelPrefix) + 1)) ->
+    Oid = Me#me.oid,
+    case node_or_subtree(Me#me.entrytype) of
+	subtree ->
+	    {subtree, lists:last(Oid), Oid};
+	node ->
+	    {node, lists:last(Oid)}
+    end;
+
+classify_how_in_subtree(LevelPrefix, Me) 
+  when (length(Me#me.oid) > (length(LevelPrefix) + 1)) ->
+    L1 = length(LevelPrefix) + 1,
+    Oid = Me#me.oid,
+    {internal_subtree, lists:nth(L1, Oid), lists:sublist(Oid, 1, L1)}.
+
+%%--------------------------------------------------
+%% Determines how to treat different kinds om MEs in the tree building process.
+%% Pre: all internal nodes have been removed.
+%%--------------------------------------------------
+node_or_subtree(table) -> subtree;
+node_or_subtree(table_entry) -> subtree;
+node_or_subtree(variable) -> node;
+node_or_subtree(table_column) -> node.
+
+%%--------------------------------------------------
+%% Purpose: (Recursively) Converts a temporary tree (see above) to a final tree.
+%% If input is a ListTree, output is a TupleTree.
+%% If input is a Node, output is the same Node.
+%% Pre: All Indexes are >= 0.
+%%--------------------------------------------------
+convert_tree({Index, {tree, Tree, Info}}) when Index >= 0 ->
+    L = lists:map(fun convert_tree/1, Tree),
+    {Index, {tree, dict_list_to_tuple(L), Info}};
+convert_tree({Index, {node, Info}}) when Index >= 0 ->
+    {Index, {node, Info}};
+convert_tree(Tree) when is_list(Tree) ->
+    L = lists:map(fun convert_tree/1, Tree),
+    dict_list_to_tuple(L).
+
+%%----------------------------------------------------------------------
+%% Purpose: Converts a single level (that is non-recursively) from
+%%          the temporary indexlist to the N-tuple.
+%% Input: A list of {Index, Data}.
+%% Output: A tuple where element Index is Data.
+%%----------------------------------------------------------------------
+dict_list_to_tuple(L) ->
+    L2 = lists:keysort(1, L),
+    list_to_tuple(integrate_indexes(0, L2)).
+
+%%----------------------------------------------------------------------
+%% Purpose: Helper function for dict_list_to_tuple/1.
+%%          Converts an indexlist to a N-list.
+%% Input: A list of {Index, Data}.
+%% Output: A (usually longer, never shorter) list where element Index is Data.
+%% Example: [{1,hej}, {3, sven}] will give output 
+%% [undefined_node, hej, undefined_node, sven].
+%% Initially CurIndex should be 0.
+%%----------------------------------------------------------------------
+integrate_indexes(CurIndex, [{CurIndex, Data} | T]) ->
+    [Data | integrate_indexes(CurIndex + 1, T)];
+integrate_indexes(_Index, []) ->
+    [];
+integrate_indexes(CurIndex, L) ->
+    [undefined_node | integrate_indexes(CurIndex + 1, L)].
+
+%%%======================================================================
+%%% 4. Tree merging
+%%%    Used by: load mib, insert subagent.
+%%%======================================================================
+
+%%----------------------------------------------------------------------
+%% Arg: Two root nodes (that is to be merged).
+%% Returns: A new root node where the nodes have been merger to one.
+%%----------------------------------------------------------------------
+merge_nodes(Same, Same) -> 
+    Same;
+merge_nodes(Node, undefined_node) -> 
+    Node;
+merge_nodes(undefined_node, Node) -> 
+    Node;
+merge_nodes({tree, Tree1, internal}, {tree, Tree2, internal}) ->
+    {tree, merge_levels(tuple_to_list(Tree1),tuple_to_list(Tree2)), internal};
+merge_nodes(Node1, Node2) ->
+    throw({error_merge_nodes, Node1, Node2}).
+
+%%----------------------------------------------------------------------
+%% Arg: Two levels to be merged.
+%%      Here, a level is represented as a list of nodes. A list is easier
+%%      to extend than a tuple.
+%% Returns: The resulting, merged level tuple.
+%%----------------------------------------------------------------------
+merge_levels(Level1, Level2) when length(Level1) =:= length(Level2) ->
+    MergeNodes = fun(N1, N2) -> merge_nodes(N1, N2) end,
+    list_to_tuple(snmp_misc:multi_map(MergeNodes, [Level1, Level2]));
+merge_levels(Level1, Level2) when length(Level1) > length(Level2) ->
+    merge_levels(Level1, Level2 ++ 
+		 undefined_nodes_list(length(Level1) - length(Level2)));
+merge_levels(Level1, Level2) when length(Level1) < length(Level2) ->
+    merge_levels(Level2, Level1).
+
+undefined_nodes_list(N) -> lists:duplicate(N, undefined_node).
+
+
+%%%======================================================================
+%%% 5. Tree deletion routines
+%%%    (for unload mib)
+%%%======================================================================
+
+%%----------------------------------------------------------------------
+%% Purpose:  Actually kicks of the tree reconstruction.
+%% Returns: {list of removed MEs, NewTree}
+%%----------------------------------------------------------------------
+delete_mib_from_tree(MibName, {tree, Tree, internal}) ->
+    case delete_tree(Tree, MibName) of
+	[] -> 
+	    {tree, {undefined_node}, internal}; % reduce
+	LevelList -> 
+	    {tree, list_to_tuple(LevelList), internal}
+    end.
+
+%%----------------------------------------------------------------------
+%% Purpose: Deletes all nodes associated to MibName from this level and
+%%          all levels below.
+%%          If the new level does not contain information (that is, no 
+%%          other mibs use it) anymore the empty list is returned.
+%% Returns: {MEs, The new level represented as a list}
+%%----------------------------------------------------------------------
+delete_tree(Tree, MibName) when is_tuple(Tree) ->
+    NewLevel = delete_nodes(tuple_to_list(Tree), MibName, []),
+    case lists:filter(fun drop_undefined_nodes/1,NewLevel) of
+	[] -> [];
+	_A_perhaps_shorted_list ->
+	    NewLevel  % some other mib needs this level
+    end.
+    
+%%----------------------------------------------------------------------
+%% Purpose: Nodes belonging to MibName are removed from the tree.
+%%          Recursively deletes sub trees to this node.
+%% Returns: {MEs, NewNodesList}
+%%----------------------------------------------------------------------
+delete_nodes([], _MibName, AccNodes) ->
+    lists:reverse(AccNodes);
+
+delete_nodes([{node, {variable, MibName}}|T], MibName, AccNodes) ->
+    delete_nodes(T, MibName, [undefined_node | AccNodes]);
+
+delete_nodes([{node, {table_column, MibName}}|T], MibName, AccNodes) ->
+    delete_nodes(T, MibName, [undefined_node | AccNodes]);
+
+delete_nodes([{tree, _Tree, {table, MibName}}|T], MibName, AccNodes) ->
+    delete_nodes(T, MibName, [undefined_node | AccNodes]);
+
+delete_nodes([{tree, _Tree, {table_entry, MibName}}|T], MibName, AccNodes) ->
+    delete_nodes(T, MibName, [undefined_node | AccNodes]);
+
+delete_nodes([{tree, Tree, Info}|T], MibName, AccNodes) ->
+    case delete_tree(Tree, MibName) of
+	[] -> % tree completely deleted
+	    delete_nodes(T, MibName, [undefined_node | AccNodes]);
+	LevelList ->
+	    delete_nodes(T, MibName, 
+			 [{tree, list_to_tuple(LevelList), Info} | AccNodes])
+    end;
+
+delete_nodes([NodeToKeep|T], MibName, AccNodes) ->
+    delete_nodes(T, MibName, [NodeToKeep | AccNodes]).
+
+drop_undefined_nodes(undefined_node) -> false;
+drop_undefined_nodes(_) -> true.
+
+
+%%%======================================================================
+%%% 6. Functions for subagent handling
+%%%======================================================================
+
+%%----------------------------------------------------------------------
+%% Returns: A new Root|{error, reason}
+%%----------------------------------------------------------------------
+insert_subagent(Oid, OldRoot) ->
+    ListTree = build_tree_for_subagent(Oid),
+    case catch convert_tree(ListTree) of
+	{'EXIT', _Reason} ->
+	    {error, 'cannot construct tree from oid'};
+	Level when is_tuple(Level) ->
+	    T = {tree, Level, internal},
+	    case catch merge_nodes(T, OldRoot) of
+		{error_merge_nodes, _Node1, _Node2} ->
+		    {error, oid_conflict};
+		NewRoot when is_tuple(NewRoot) andalso 
+			     (element(1, NewRoot) =:= tree) ->
+		    NewRoot
+	    end
+    end.
+
+build_tree_for_subagent([Index]) ->
+    [{Index, {node, subagent}}];
+
+build_tree_for_subagent([Index | T]) ->
+    [{Index, {tree, build_tree_for_subagent(T), internal}}].
+
+%%----------------------------------------------------------------------
+%% Returns: A new tree where the subagent at Oid (2nd arg) has been deleted.
+%%----------------------------------------------------------------------
+delete_subagent({tree, Tree, Info}, [Index]) ->
+    {node, subagent} = element(Index+1, Tree),
+    {tree, setelement(Index+1, Tree, undefined_node), Info};
+delete_subagent({tree, Tree, Info}, [Index | TI]) ->
+    {tree, setelement(Index+1, Tree,
+		      delete_subagent(element(Index+1, Tree), TI)), Info}.
+
+%%%======================================================================
+%%% 7. Misc functions
+%%%======================================================================
+
+%%----------------------------------------------------------------------
+%% Installs the mibs found in the database when starting the agent.
+%% Basically calls the instrumentation functions for all non-internal
+%% mib-entries
+%%----------------------------------------------------------------------
+install_mibs(MibDb, NodeDb) ->
+    MibNames = loaded(MibDb),
+    ?vtrace("install_mibs -> found following mibs in database: ~n"
+	"~p", [MibNames]),
+    install_mibs2(NodeDb, MibNames).
+
+install_mibs2(_, []) ->
+    ok;
+install_mibs2(NodeDb, [MibName|MibNames]) ->
+    Pattern = #node_info{oid = '_', mib_name = MibName, me = '_'},
+    Nodes = snmpa_general_db:match_object(NodeDb, Pattern),
+    MEs = [ME || #node_info{me = ME} <- Nodes],
+    ?vtrace("install_mibs2 -> installing ~p MEs for mib ~p", 
+	[length(MEs),MibName]),
+    NewF = fun(ME) -> call_instrumentation(ME, new) end,
+    lists:foreach(NewF, MEs),
+    install_mibs2(NodeDb, MibNames).
+    
+    
+%%----------------------------------------------------------------------
+%% Does all side effect stuff during load_mib.
+%%----------------------------------------------------------------------
+install_mib(Db, Symbolic, Mib, MibName, FileName, NonInternalMes) ->
+    ?vdebug("install_mib -> entry with"
+	    "~n   Symbolic: ~p"
+	    "~n   MibName:  ~p"
+	    "~n   FileName: ~p", [Symbolic, MibName, FileName]),
+    Rec = #mib_info{name = MibName, symbolic = Symbolic, file_name = FileName},
+    snmpa_general_db:write(Db, Rec),
+    install_mib2(Symbolic, MibName, Mib),
+    NewF = fun(ME) -> call_instrumentation(ME, new) end,
+    lists:foreach(NewF, NonInternalMes).
+
+install_mib2(true, MibName, Mib) ->
+    #mib{table_infos    = TabInfos,
+	 variable_infos = VarInfos,
+	 mes            = MEs,
+	 asn1_types     = ASN1Types,
+	 traps          = Traps} = Mib,
+    snmpa_symbolic_store:add_table_infos(MibName, TabInfos),
+    snmpa_symbolic_store:add_variable_infos(MibName, VarInfos),
+    snmpa_symbolic_store:add_aliasnames(MibName, MEs),
+    snmpa_symbolic_store:add_types(MibName, ASN1Types),
+    SetF = fun(Trap) -> 
+		   snmpa_symbolic_store:set_notification(Trap, MibName)
+	   end,
+    lists:foreach(SetF, Traps);
+install_mib2(_, _, _) ->
+    ok.
+
+install_mes(_Db, _MibName, []) ->
+    ok;
+install_mes(Db, MibName, [ME|MEs]) ->
+    Node = #node_info{oid = ME#me.oid, mib_name = MibName, me = ME},
+    snmpa_general_db:write(Db, Node),
+    install_mes(Db, MibName, MEs).
+
+
+%%----------------------------------------------------------------------
+%% Does all side effect stuff during unload_mib.
+%%----------------------------------------------------------------------
+uninstall_mib(Db, Symbolic, MibName, MEs) ->
+    ?vtrace("uninstall_mib -> entry with"
+	"~n   Db:       ~p"
+	"~n   Symbolic: ~p"
+	"~n   MibName:  ~p", [Db, Symbolic, MibName]),
+    Res = snmpa_general_db:delete(Db, MibName),
+    ?vtrace("uninstall_mib -> (mib) db delete result: ~p", [Res]),
+    uninstall_mib2(Symbolic, MibName),
+    DelF = fun(ME) -> call_instrumentation(ME, delete) end,
+    lists:foreach(DelF, MEs).
+
+uninstall_mib2(true, MibName) ->
+    snmpa_symbolic_store:delete_table_infos(MibName),
+    snmpa_symbolic_store:delete_variable_infos(MibName),
+    snmpa_symbolic_store:delete_aliasnames(MibName),
+    snmpa_symbolic_store:delete_types(MibName),
+    snmpa_symbolic_store:delete_notifications(MibName);
+uninstall_mib2(_, _) ->
+    ok.
+
+uninstall_mes(Db, MibName) ->
+    Pattern = #node_info{oid = '_', mib_name = MibName, me = '_'},
+    snmpa_general_db:match_delete(Db, Pattern).
+
+
+%%----------------------------------------------------------------------
+%% Create a list of the names of all the loaded mibs
+%%----------------------------------------------------------------------
+loaded(Db) ->
+    [N || #mib_info{name = N} <- snmpa_general_db:tab2list(Db)].
+    
+
+%%----------------------------------------------------------------------
+%% Calls MFA-instrumentation with 'new' or 'delete' operation.
+%%----------------------------------------------------------------------
+call_instrumentation(#me{entrytype = variable, mfa={M,F,A}}, Operation) ->
+    ?vtrace("call instrumentation with"
+	    "~n   entrytype: variable"
+	    "~n   MFA:       {~p,~p,~p}"
+	    "~n   Operation: ~p",
+	    [M,F,A,Operation]),
+    catch apply(M, F, [Operation | A]);
+call_instrumentation(#me{entrytype = table_entry, mfa={M,F,A}}, Operation) ->
+    ?vtrace("call instrumentation with"
+	    "~n   entrytype: table_entry"
+	    "~n   MFA:       {~p,~p,~p}"
+	    "~n   Operation: ~p",
+	    [M,F,A,Operation]),
+    catch apply(M, F, [Operation | A]);
+call_instrumentation(_ShitME, _Operation) ->
+    done.
+
+
+maybe_drop_me(#me{entrytype = internal}) -> false;
+maybe_drop_me(#me{entrytype = group}) -> false;
+maybe_drop_me(#me{imported = true}) -> false;
+maybe_drop_me(_) -> true.
+
+
+%%----------------------------------------------------------------------
+%% Code change functions
+%%----------------------------------------------------------------------
+
+code_change(down, State) ->
+    ?d("code_change(down) -> entry",[]),
+    State;
+
+code_change(up, State) ->
+    ?d("code_change(up)",[]),
+    State;
+
+code_change(_Vsn, State) ->
+    State.
+
diff --git a/lib/snmp/src/agent/snmpa_mib_data_tttn.erl b/lib/snmp/src/agent/snmpa_mib_data_tttn.erl
new file mode 100644
index 0000000000..90ddf4869f
--- /dev/null
+++ b/lib/snmp/src/agent/snmpa_mib_data_tttn.erl
@@ -0,0 +1,1443 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% 
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%% 
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%% 
+%% %CopyrightEnd%
+%%
+
+-module(snmpa_mib_data_tttn).
+
+
+%%%-----------------------------------------------------------------
+%%% 
+%%%            TTTN - TupleTreeTupleNodes
+%%% 
+%%% This module implements the MIB (internal) data structures.
+%%% The TTTN MIB Data structure consists of three items: 
+%%% 
+%%%      1) A mib-storage (as specified when new is called) for 
+%%%         the data associated with each variable, table, 
+%%%         table-entry and table-column in the MIB. 
+%%%      2) A tree contains information of the Oids in the MIB. 
+%%%      3) A list of registered subagents. 
+%%% 
+%%% The subagent information is consequently duplicated. It resides
+%%% both in the tree and in the list.
+%%%
+%%% When a mib is loaded, the tree is built from the plain list
+%%% in the binary file.
+%%% 
+%%%-----------------------------------------------------------------
+
+-include_lib("snmp/include/snmp_types.hrl").
+-include_lib("snmp/src/misc/snmp_debug.hrl").
+
+-define(VMODULE,"MDATA_TTTN").
+-include_lib("snmp/src/misc/snmp_verbosity.hrl").
+
+-behaviour(snmpa_mib_data).
+
+-define(MIB_DATA, snmpa_mib_data).
+-define(MIB_NODE, snmpa_mib_node).
+-define(MIB_TREE, snmpa_mib_tree).
+-define(DUMMY_TREE_GENERATION, 1).
+-define(DEFAULT_TREE, {tree,{undefined_node},internal}).
+
+
+%%%-----------------------------------------------------------------
+%%% Table of contents
+%%% =================
+%%% 1. Interface
+%%% 2. Implementation of tree access
+%%% 3. Tree building functions
+%%% 4. Tree merging
+%%% 5. Tree deletion routines
+%%% 6. Functions for subagent handling
+%%% 7. Misc functions
+%%%-----------------------------------------------------------------
+
+-record(mib_data, 
+	{
+	  %% Mib storage module
+	  module :: snmpa:mib_storage_module(),  
+
+	  %% A database of loaded mibs
+	  %% #mib_info{}
+	  mib_db,  
+
+	  %% A database with information about each node in the tree
+	  %% #node_info{}
+	  node_db, 
+
+	  %% A database containing _one_ record with the tree
+	  %% without the subagent(s). 
+	  %% (the reason for this is part to get replication 
+	  %% and part out of convenience)
+	  %% #tree{}
+	  tree_db, 
+
+	  %% The root node (same as the tree part of the tree_db 
+	  %% but with the subagents added). 
+	  tree, 
+	  
+	  %% A list of {SAPid, Oid}
+	  subagents = []
+	 }).
+
+-record(mib_info,  {name, symbolic, file_name}).
+-record(node_info, {oid, mib_name, me}).
+
+
+%% (behaviour) API
+-export([new/1, 
+	 close/1, 
+	 sync/1, 
+	 load_mib/4, 
+	 unload_mib/4, 
+	 lookup/2, 
+	 next/3, 
+	 register_subagent/3, 
+	 unregister_subagent/2, 
+	 dump/2, 
+	 which_mib/2, which_mibs/1, 
+	 whereis_mib/2, 
+	 info/1, info/2,
+	 backup/2, 
+	 code_change/4]).
+
+
+%%-----------------------------------------------------------------
+%% A tree is represented as a N-tuple, where each element is a
+%% node. A node is:
+%% 1) {tree, Tree, Info} where Info can be {table, Id}, {table_entry, Id}
+%%                                        or perhaps 'internal'
+%% 2) undefined_node  (memory optimization (instead of {node, undefined}))
+%% 3) {node, Info} where Info can be {subagent, Pid}, {variable, Id}, 
+%%                                   {table_column, Id}
+%% Id is {MibName, MibEntry}
+%% The over all root is represented as {tree, Tree, internal}.
+%%
+%% tree() = {tree, nodes(), tree_info()}
+%% nodes() = {tree() | node() | undefined_node, ...}
+%% node() = {node, node_info()}
+%% tree_info() = {table, Id} | {table_entry, Id} | internal
+%% node_info() = {subagent, Pid} | {variable, Id} | {table_colum, Id}
+%%-----------------------------------------------------------------
+
+%% This record is what is stored in the database. The 'tree' part
+%% is described above...
+-record(tree, {generation = ?DUMMY_TREE_GENERATION, root = ?DEFAULT_TREE}).
+
+
+%%%======================================================================
+%%% 1. Interface
+%%%======================================================================
+
+%%-----------------------------------------------------------------
+%% Func: new/1
+%% Returns: A representation of mib data.
+%%-----------------------------------------------------------------
+
+%% Where -> A list of nodes where the tables will be created
+new(MibStorage) ->
+    Mod  = snmp_misc:get_option(module,  MibStorage), 
+    Opts = snmp_misc:get_option(options, MibStorage, []), 
+
+    %% First we must check if there is already something to read
+    %% If a database already exists, then the tree structure has to be read
+    ?vdebug("open (mib) database",[]),
+    MibDb = 
+	case Mod:open(?MIB_DATA, mib_info, record_info(fields, mib_info), 
+		      set, Opts) of
+	    {ok, T1} ->
+		T1;
+	    {error, Reason1} ->
+		throw({error, {open, mib_data, Reason1}})
+	end,
+
+    ?vdebug("open (mib) node database",[]),
+    NodeDb = 
+	case Mod:open(?MIB_NODE, node_info, record_info(fields, node_info), 
+		      set, Opts) of
+	    {ok, T2} ->
+		T2;
+	    {error, Reason2} ->
+		throw({error, {open, mib_node, Reason2}})
+	end,
+
+    ?vdebug("open (mib) tree database",[]),
+    TreeDb = 
+	case Mod:open(?MIB_TREE, tree, record_info(fields, tree), 
+		      set, Opts) of
+	    {ok, T3} ->
+		T3;
+	    {error, Reason3} ->
+		throw({error, {open, mib_tree, Reason3}})
+	end,
+
+    ?vdebug("write the default (mib) tree",[]),
+    Tree = 
+	case Mod:read(TreeDb, ?DUMMY_TREE_GENERATION) of
+	    false ->
+		T = #tree{},
+		Mod:write(TreeDb, T),
+		T;
+	    {value, T} ->
+		T
+	end,
+    ?vdebug("install (existing) mibs",[]),
+    install_mibs(Mod, MibDb, NodeDb),
+    ?vdebug("done",[]),
+    #mib_data{module  = Mod, 
+	      mib_db  = MibDb, 
+	      node_db = NodeDb,
+	      tree_db = TreeDb, 
+	      tree    = Tree}.
+
+
+%%----------------------------------------------------------------------
+%% Returns: new mib data | {error, Reason}
+%%----------------------------------------------------------------------
+load_mib(MibData, FileName, MeOverride, TeOverride) 
+  when is_record(MibData,mib_data) andalso is_list(FileName) -> 
+    ?vlog("load mib file: ~p",[FileName]),
+    ActualFileName = filename:rootname(FileName, ".bin") ++ ".bin",
+    MibName = list_to_atom(filename:basename(FileName, ".bin")),
+    (catch do_load_mib(MibData, ActualFileName, MibName, 
+                       MeOverride, TeOverride)).
+
+do_load_mib(MibData, ActualFileName, MibName, MeOverride, TeOverride) ->
+    ?vtrace("do_load_mib -> entry with"
+        "~n  ActualFileName: ~s"
+        "~n  MibName:        ~p",[ActualFileName, MibName]),
+    #mib_data{module  = Mod, 
+	      mib_db  = MibDb, 
+	      node_db = NodeDb, 
+	      %% tree_db = TreeDb,
+	      tree    = Tree} = MibData,
+    verify_not_loaded(Mod, MibDb, MibName),
+    ?vtrace("do_load_mib -> already loaded mibs:"
+	    "~n   ~p", [loaded(Mod, MibDb)]),
+    Mib = do_read_mib(ActualFileName),
+    ?vtrace("do_load_mib -> read mib ~s",[Mib#mib.name]),
+    NonInternalMes = 
+        lists:filter(fun(ME) -> maybe_drop_me(ME) end, Mib#mib.mes),
+    OldRoot = Tree#tree.root,
+    T = build_tree(NonInternalMes, MibName),
+    ?d("load_mib -> "
+	"~n   OldRoot: ~p"
+	"~n   T:       ~p", [OldRoot, T]),
+    case (catch merge_nodes(T, OldRoot)) of
+	{error_merge_nodes, Node1, Node2} ->
+	    ?vlog("error merging nodes:"
+		"~n~p~nand~n~p", [Node1,Node2]),
+	    {error, oid_conflict};
+	NewRoot when is_tuple(NewRoot) andalso (element(1,NewRoot) =:= tree) ->
+ 	    ?d("load_mib -> "
+ 		"~n   NewRoot: ~p", [NewRoot]),
+	    Symbolic = not lists:member(no_symbolic_info, Mib#mib.misc),
+	    case (catch check_notif_and_mes(TeOverride, MeOverride, Symbolic, 
+					    Mib#mib.traps, NonInternalMes)) of
+		true ->
+		    install_mes(Mod, NodeDb, MibName, NonInternalMes),
+		    install_mib(Mod, 
+				MibDb, Symbolic, Mib, 
+				MibName, ActualFileName, NonInternalMes),
+		    ?vtrace("installed mib ~s", [Mib#mib.name]),
+		    Tree2 = Tree#tree{root = NewRoot},
+		    {ok, MibData#mib_data{tree = Tree2}};
+		Else -> 
+		    Else
+	    end
+    end.
+
+
+verify_not_loaded(Mod, Tab, Name) ->
+    case Mod:read(Tab, Name) of
+        {value, #mib_info{name = Name}} -> 
+            throw({error, already_loaded});
+        false ->
+            ok
+    end.
+
+do_read_mib(ActualFileName) ->
+    case snmp_misc:read_mib(ActualFileName) of
+        {error, Reason} -> 
+            ?vlog("Failed reading mib file ~p with reason: ~p",
+		  [ActualFileName, Reason]),
+            throw({error, Reason});
+        {ok, Mib} ->
+            Mib
+    end.
+
+%% The Tree DB is handled in a special way since it can be very large.
+sync(#mib_data{module  = Mod, 
+	       mib_db  = M, 
+	       node_db = N, 
+	       tree_db = T, tree = Tree, subagents = []}) ->
+    Mod:sync(M),
+    Mod:sync(N),
+    Mod:write(T, Tree),
+    Mod:sync(T);
+sync(#mib_data{module  = Mod, 
+	       mib_db  = M, 
+	       node_db = N, 
+	       tree_db = T, tree = Tree, subagents = SAs}) ->
+
+    Mod:sync(M),
+    Mod:sync(N),
+
+    %% Ouch. Since the subagent info is dynamic we do not 
+    %% want to store the tree containing subagent info. So, we 
+    %% have to create a tmp tree without those and store it.
+
+    case delete_subagents(Tree, SAs) of
+	{ok, TreeWithoutSAs} ->
+	    Mod:write(T, TreeWithoutSAs),
+	    Mod:sync(T);
+	Error ->
+	    Error
+    end.
+
+delete_subagents(Tree, []) ->
+    {ok, Tree};
+delete_subagents(Tree0, [{_, Oid}|SAs]) ->
+    case (catch delete_subagent(Tree0, Oid)) of
+	{tree, _Tree, _Info} = Tree1 ->
+	    delete_subagents(Tree1, SAs);
+	_Error ->
+	    {error, {'invalid oid', Oid}} 
+    end.
+
+%%----------------------------------------------------------------------
+%% (OTP-3601)
+%%----------------------------------------------------------------------
+check_notif_and_mes(TeOverride,MeOverride,Symbolic,Traps,MEs) ->
+    ?vtrace("check notifications and mib entries",[]),
+    check_notifications(TeOverride,Symbolic,Traps),
+    check_mes(MeOverride,MEs).
+
+check_notifications(true, _Symbolic, _Traps) ->
+    ?vtrace("trapentry override = true => skip check",[]),
+    true;
+check_notifications(_, Symbolic, Traps) -> 
+    check_notifications(Symbolic, Traps).
+
+check_notifications(true, Traps) ->
+    check_notifications(Traps);
+check_notifications(_, _) -> true.
+
+check_notifications([]) -> true;
+check_notifications([#trap{trapname = Key} = Trap | Traps]) ->
+    ?vtrace("check notification [trap] with Key: ~p",[Key]),
+    case snmpa_symbolic_store:get_notification(Key) of
+	{value, Trap} -> check_notifications(Traps);
+	{value,    _} -> throw({error, {'trap already defined', Key}});
+	undefined     -> check_notifications(Traps)
+    end;
+check_notifications([#notification{trapname = Key} = Notif | Traps]) ->
+    ?vtrace("check notification [notification] with Key: ~p",[Key]),
+    case snmpa_symbolic_store:get_notification(Key) of
+	{value, Notif} -> 
+	    check_notifications(Traps);
+	{value,     _} -> 
+	    throw({error, {'notification already defined', Key}});
+	undefined      -> 
+	    check_notifications(Traps)
+    end;
+check_notifications([Crap | Traps]) ->
+    ?vlog("skipped check of: ~n~p",[Crap]),
+    check_notifications(Traps).
+
+check_mes(true,_) ->
+    ?vtrace("mibentry override = true => skip check",[]),
+    true; 
+check_mes(_,MEs) ->
+    check_mes(MEs).
+
+check_mes([]) -> true;
+check_mes([#me{aliasname = Name, oid = Oid1} | MEs]) ->
+    ?vtrace("check mib entries with aliasname: ~p",[Name]),
+    case snmpa_symbolic_store:aliasname_to_oid(Name) of
+	{value, Oid1} -> 
+	    check_mes(MEs);
+	{value, Oid2} -> 
+	    ?vinfo("~n   expecting '~p'~n   but found '~p'",[Oid1, Oid2]),
+	    throw({error, {'mibentry already defined', Name}});
+	false -> 
+	    check_mes(MEs)
+    end;
+check_mes([Crap | MEs]) ->
+    ?vlog("skipped check of: ~n~p",[Crap]),
+    check_mes(MEs).
+    
+
+
+%%----------------------------------------------------------------------
+%% Returns: new mib data | {error, Reason}
+%%----------------------------------------------------------------------
+unload_mib(MibData, FileName, _, _) when is_list(FileName) -> 
+    MibName = list_to_atom(filename:basename(FileName, ".bin")),
+    (catch do_unload_mib(MibData, MibName)).
+
+do_unload_mib(MibData, MibName) ->
+    ?vtrace("do_unload_mib -> entry with"
+	"~n   MibName: ~p", [MibName]),
+    #mib_data{module  = Mod, 
+	      mib_db  = MibDb, 
+	      node_db = NodeDb, 
+	      %% tree_db = TreeDb, 
+	      tree    = Tree} = MibData,
+    #mib_info{symbolic = Symbolic} = verify_loaded(Mod, MibDb, MibName),
+    NewRoot = delete_mib_from_tree(MibName, Tree#tree.root),
+    MEs = uninstall_mes(Mod, NodeDb, MibName),
+    uninstall_mib(Mod, MibDb, Symbolic, MibName, MEs),
+    NewMibData = MibData#mib_data{tree = Tree#tree{root = NewRoot}},
+    {ok, NewMibData}.
+
+verify_loaded(Mod, Tab, Name) ->
+    case Mod:read(Tab, Name) of
+        {value, MibInfo} ->
+            MibInfo;
+        false ->
+            throw({error, not_loaded})
+    end.
+    
+    
+close(#mib_data{module  = Mod, 
+		mib_db  = MibDb, 
+		node_db = NodeDb, 
+		tree_db = TreeDb}) ->
+    Mod:close(MibDb),
+    Mod:close(NodeDb),
+    Mod:close(TreeDb),
+    ok.
+
+register_subagent(#mib_data{tree = T} = MibData, Oid, Pid) ->
+    case insert_subagent(Oid, T#tree.root) of
+	{error, Reason} -> 
+	    {error, Reason};
+	NewRootTree ->
+	    SAs = [{Pid, Oid} | MibData#mib_data.subagents],
+	    T2 = T#tree{root = NewRootTree},
+	    {ok, MibData#mib_data{tree = T2, subagents = SAs}}
+    end.
+
+
+%%----------------------------------------------------------------------
+%% Purpose: Get a list of all loaded mibs
+%% Returns: [{Name, File}]
+%%----------------------------------------------------------------------
+
+which_mibs(#mib_data{module = Mod, mib_db = Db}) ->
+    Mibs = Mod:tab2list(Db),
+    [{Name, File} || #mib_info{name = Name, file_name = File} <- Mibs].
+
+
+%%----------------------------------------------------------------------
+%% Purpose: Get a list of all loaded mibs
+%% Returns: [{Name, File}]
+%%----------------------------------------------------------------------
+
+whereis_mib(#mib_data{module = Mod, mib_db = Db}, Name) ->
+    case Mod:read(Db, Name) of
+        {value, #mib_info{file_name = File}} ->
+	    {ok, File};
+	false ->
+	    {error, not_found}
+    end.
+
+
+%%----------------------------------------------------------------------
+%% Purpose: Deletes SA with Pid from all subtrees it handles.
+%% Returns: NewMibData.
+%%----------------------------------------------------------------------
+unregister_subagent(#mib_data{subagents = SAs} = MibData, Pid) 
+  when is_pid(Pid) ->
+    SAs = MibData#mib_data.subagents,
+    case lists:keysearch(Pid, 1, SAs) of
+	false -> 
+	    {ok, MibData};
+	{value, {Pid, Oid}} ->
+	    % we should never get an error since Oid is found in MibData.
+	    {ok, NewMibData, _DeletedSA} = unregister_subagent(MibData, Oid),
+	    % continue if the same Pid handles other mib subtrees.
+	    unregister_subagent(NewMibData, Pid)
+    end;
+
+%%----------------------------------------------------------------------
+%% Purpose: Deletes one unique subagent. 
+%% Returns: {error, Reason} | {ok, NewMibData, DeletedSubagentPid}
+%%----------------------------------------------------------------------
+unregister_subagent(#mib_data{tree = T} = MibData, Oid) when is_list(Oid) ->
+    case (catch delete_subagent(T#tree.root, Oid)) of
+	{tree, Tree, Info} ->
+	    OldSAs = MibData#mib_data.subagents,
+	    {value, {Pid, _Oid}} = lists:keysearch(Oid, 2, OldSAs),
+	    SAs = lists:keydelete(Oid, 2, OldSAs),
+	    T2 = T#tree{root = {tree, Tree, Info}},
+	    {ok, 
+	     MibData#mib_data{tree = T2, subagents = SAs},
+	     Pid};
+	_ ->
+	    {error, {invalid_oid, Oid}}
+    end.
+
+%%----------------------------------------------------------------------
+%% Purpose: To inpect memory usage, loaded mibs, registered subagents
+%%----------------------------------------------------------------------
+info(MibData) ->
+    ?vtrace("retrieve info",[]),
+    #mib_data{module    = Mod, 
+	      mib_db    = MibDb, 
+	      node_db   = NodeDb, 
+	      tree_db   = TreeDb, 
+	      tree      = Tree, 
+	      subagents = SAs} = MibData,
+    LoadedMibs = old_format(Mod:tab2list(MibDb)),
+    TreeSize = snmp_misc:mem_size(Tree),
+    {memory, ProcSize} = erlang:process_info(self(), memory),
+    MibDbSize  = Mod:info(MibDb,  memory),
+    NodeDbSize = Mod:info(NodeDb, memory),
+    TreeDbSize = Mod:info(TreeDb, memory),
+    [{loaded_mibs, LoadedMibs}, {subagents, SAs}, {tree_size_bytes, TreeSize},
+     {process_memory, ProcSize}, 
+     {db_memory, [{mib,MibDbSize},{node,NodeDbSize},{tree,TreeDbSize}]}].
+
+info(#mib_data{module = Mod, mib_db = MibDb}, loaded_mibs) ->
+    Mibs = Mod:tab2list(MibDb),
+    [filename:rootname(FN, ".bin") || #mib_info{file_name = FN} <- Mibs];
+info(#mib_data{tree = Tree}, tree_size_bytes) ->
+    snmp_misc:mem_size(Tree);
+info(_, process_memory) ->
+    {memory, ProcSize} = erlang:process_info(self(),memory),
+    ProcSize;
+info(#mib_data{module  = Mod, 
+	       mib_db  = MibDb, 
+	       node_db = NodeDb, 
+	       tree_db = TreeDb}, 
+     db_memory) ->
+    MibDbSize  = Mod:info(MibDb,  memory),
+    NodeDbSize = Mod:info(NodeDb, memory),
+    TreeDbSize = Mod:info(TreeDb, memory),
+    [{mib, MibDbSize}, {node, NodeDbSize}, {tree, TreeDbSize}];
+info(#mib_data{subagents = SAs}, subagents) ->
+    SAs.
+
+old_format(LoadedMibs) ->
+    ?vtrace("convert mib info to old format",[]),
+    [{N,S,F} || #mib_info{name=N,symbolic=S,file_name=F} <- LoadedMibs].
+
+    
+%%----------------------------------------------------------------------
+%% A total dump for debugging.
+%%----------------------------------------------------------------------
+
+dump(#mib_data{module  = Mod, 
+	       mib_db  = MibDb, 
+	       node_db = NodeDb, 
+	       tree    = Tree}, io) ->
+    (catch io:format("MIB-tables:~n~p~n~n", 
+		     [Mod:tab2list(MibDb)])),
+    (catch io:format("MIB-entries:~n~p~n~n", 
+		     [Mod:tab2list(NodeDb)])),
+    (catch io:format("Tree:~n~p~n", [Tree])), % good luck reading it!
+    ok;
+
+dump(#mib_data{module  = Mod, 
+	       mib_db  = MibDb, 
+	       node_db = NodeDb, 
+	       tree    = Tree}, File) ->
+    case file:open(File, [write]) of
+	{ok, Fd} ->
+	    io:format(Fd,"~s~n", 
+		      [snmp:date_and_time_to_string(snmp:date_and_time())]),
+	    (catch io:format(Fd,"MIB-tables:~n~p~n~n",
+			     [Mod:tab2list(MibDb)])),
+	    (catch io:format(Fd, "MIB-entries:~n~p~n~n", 
+			     [Mod:tab2list(NodeDb)])),
+	    io:format(Fd,"Tree:~n~p~n", [Tree]), % good luck reading it!
+	    file:close(Fd),
+	    ok;
+	{error, Reason} ->
+	    ?vinfo("~n   Failed opening file '~s' for reason ~p",
+		   [File, Reason]),
+	    {error, Reason}
+    end.
+
+
+backup(#mib_data{module  = Mod, 
+		 mib_db  = M, 
+		 node_db = N, 
+		 tree_db = T}, BackupDir) ->
+    MRes = Mod:backup(M, BackupDir),
+    NRes = Mod:backup(N, BackupDir),
+    TRes = Mod:backup(T, BackupDir),
+    handle_backup_res([{mib_db, MRes}, {node_db, NRes}, {tree_db, TRes}]).
+
+handle_backup_res(Res) ->
+    handle_backup_res(Res, []).
+
+handle_backup_res([], []) ->
+    ok;
+handle_backup_res([], Err) ->
+    {error, lists:reverse(Err)};
+handle_backup_res([{_, ok}|Res], Err) ->
+    handle_backup_res(Res, Err);
+handle_backup_res([{Tag, {error, Reason}}|Res], Err) ->
+    handle_backup_res(Res, [{Tag, Reason}|Err]);
+handle_backup_res([{Tag, Error}|Res], Err) ->
+    handle_backup_res(Res, [{Tag, Error}|Err]).
+
+
+%%%======================================================================
+%%% 2. Implementation of tree access
+%%%    lookup and next.
+%%%======================================================================
+
+
+which_mib(#mib_data{tree = T} = D, Oid) ->
+    ?vtrace("which_mib -> entry with"
+	    "~n   Oid: ~p",[Oid]),	    
+    case (catch find_node(D, T#tree.root, Oid, [])) of
+	{variable, _ME, Mib} ->
+	    ?vtrace("which_mib -> variable:"
+		"~n   Mib: ~p", [Mib]),	    
+	    {ok, Mib};
+	{table, _EntryME, _, Mib} ->
+	    ?vtrace("which_mib -> table:"
+		"~n   Mib: ~p", [Mib]),	    
+	    {ok, Mib};
+	{subagent, SubAgentPid, _SANextOid} ->
+	    ?vtrace("which_mib -> subagent:"
+		"~n   SubAgentPid: ~p", [SubAgentPid]),	    
+	    {error, {subagent, SubAgentPid}};
+	{false, ErrorCode} -> 
+	    ?vtrace("which_mib -> false:"
+		"~n   ErrorCode: ~p",[ErrorCode]),	    
+	    {error, ErrorCode};
+	false -> 
+	    ?vtrace("which_mib -> false",[]),	    
+	    {error, noSuchObject};
+	{'EXIT', R} -> 
+	    ?vtrace("which_mib -> exit:"
+		"~n   R:  ~p",[R]),	    
+	    {error, noSuchObject}
+    end.
+
+
+%%-----------------------------------------------------------------
+%% Func: lookup/2
+%% Purpose: Finds the mib entry corresponding to the Oid. If it is a
+%%          variable, the Oid must be <Oid for var>.0 and if it is
+%%          a table, Oid must be <table>.<entry>.<col>.<any>
+%% Returns: {variable, MibEntry} |
+%%          {table_column, MibEntry, TableEntryOid} |
+%%          {subagent, SubAgentPid, SAOid} |
+%%          {false, Reason}
+%%-----------------------------------------------------------------
+lookup(#mib_data{tree = T} = D, Oid) ->
+     ?vtrace("lookup -> entry with"
+ 	"~n   Oid: ~p",[Oid]),	    
+    case (catch find_node(D, T#tree.root, Oid, [])) of
+	{variable, ME, _Mib} when is_record(ME, me) -> 
+	    ?vtrace("lookup -> variable:"
+		"~n   ME: ~p",[ME]),	    
+	    {variable, ME};
+	{table, EntryME, {ColME, TableEntryOid}, _Mib} ->
+	    ?vtrace("lookup -> table:"
+		"~n   EntryME:          ~p"
+		"~n   ColME:            ~p"
+		"~n   RevTableEntryOid: ~p",
+		[EntryME, ColME, TableEntryOid]),	    
+	    MFA = EntryME#me.mfa,
+	    RetME = ColME#me{mfa = MFA},
+	    {table_column, RetME, TableEntryOid};
+	{subagent, SubAgentPid, SANextOid} ->
+	    ?vtrace("lookup -> subagent:"
+		"~n   SubAgentPid: ~p"
+		"~n   SANextOid:   ~p", [SubAgentPid, SANextOid]),	    
+	    {subagent, SubAgentPid, SANextOid};
+	{false, ErrorCode} -> 
+	    ?vtrace("lookup -> false:"
+		"~n   ErrorCode: ~p",[ErrorCode]),	    
+	    {false, ErrorCode};
+	false -> 
+	    ?vtrace("lookup -> false",[]),	    
+	    {false, noSuchObject};
+	{'EXIT', R} -> 
+	    ?vtrace("lookup -> exit:"
+		"~n   R:  ~p",[R]),	    
+	    {false, noSuchObject}
+    end.
+
+
+find_node(D, {tree, Tree, {table, _}}, RestOfOid, RevOid) ->
+     ?vtrace("find_node(tree,table) -> entry with"
+ 	"~n   RestOfOid: ~p"
+ 	"~n   RevOid:    ~p",[RestOfOid, RevOid]),
+    find_node(D, {tree, Tree, internal}, RestOfOid, RevOid);
+find_node(D, {tree, Tree, {table_entry, _}}, RestOfOid, RevOid) ->
+     ?vtrace("find_node(tree,table_entry) -> entry with"
+ 	"~n   RestOfOid: ~p"
+ 	"~n   RevOid:    ~p",[RestOfOid, RevOid]),
+    #mib_data{module = Mod, node_db = Db} = D,
+    Oid = lists:reverse(RevOid),
+    case Mod:read(Db, Oid) of
+	{value, #node_info{me = ME, mib_name = Mib}} ->
+	    case find_node(D, {tree, Tree, internal}, RestOfOid, RevOid) of
+		{false, ErrorCode} -> {false, ErrorCode};
+		Val -> {table, ME, Val, Mib}
+	    end;
+	false ->
+	    ?vinfo("find_node -> could not find table_entry ME with"
+		"~n   RevOid:    ~p"
+		"~n   when"
+		"~n   RestOfOid: ~p", 
+		[RevOid, RestOfOid]),
+	    false
+    end;
+find_node(D, {tree, Tree, _Internal}, [Int | RestOfOid], RevOid) ->
+    ?vtrace("find_node(tree) -> entry with"
+	"~n   Int:       ~p"
+	"~n   RestOfOid: ~p"
+	"~n   RevOid:    ~p",[Int, RestOfOid, RevOid]),
+    find_node(D, element(Int+1, Tree), RestOfOid, [Int | RevOid]);
+find_node(D, {node, {table_column, _}}, RestOfOid, [ColInt | RevOid]) ->
+     ?vtrace("find_node(tree,table_column) -> entry with"
+ 	"~n   RestOfOid: ~p"
+ 	"~n   ColInt:    ~p"
+ 	"~n   RevOid:    ~p",[RestOfOid, ColInt, RevOid]),
+    #mib_data{module = Mod, node_db = Db} = D,
+    Oid = lists:reverse([ColInt | RevOid]),
+    case Mod:read(Db, Oid) of
+	{value, #node_info{me = ME}} ->
+	    {ME, lists:reverse(RevOid)}; 
+	false ->
+	    X = Mod:read(Db, lists:reverse([ColInt | RevOid])),
+	    ?vinfo("find_node -> could not find table_column ME with"
+		"~n   RevOid: ~p"
+		"~n   trying  [~p|~p]"
+		"~n   X:      ~p", 
+		[RevOid, [ColInt | RevOid], X]),
+	    false
+    end;
+find_node(D, {node, {variable, _MibName}}, [0], RevOid) ->
+     ?vtrace("find_node(tree,variable,[0]) -> entry with"
+ 	"~n   RevOid:    ~p",[RevOid]),
+    #mib_data{module = Mod, node_db = Db} = D,
+    Oid = lists:reverse(RevOid),
+    case Mod:read(Db, Oid) of
+	{value, #node_info{me = ME, mib_name = Mib}} ->
+	    {variable, ME, Mib};
+	false ->
+	    ?vinfo("find_node -> could not find variable ME with"
+		"~n   RevOid: ~p", [RevOid]),
+	    false
+    end;
+find_node(_D, {node, {variable, _MibName}}, [], _RevOid) ->
+    ?vtrace("find_node(tree,variable,[]) -> entry",[]),
+    {false, noSuchObject};
+find_node(_D, {node, {variable, _MibName}}, _, _RevOid) ->
+    ?vtrace("find_node(tree,variable) -> entry",[]),
+    {false, noSuchInstance};
+find_node(D, {node, subagent}, _RestOfOid, SARevOid) ->
+    ?vtrace("find_node(tree,subagent) -> entry with"
+ 	"~n   SARevOid:    ~p",[SARevOid]),
+    #mib_data{subagents = SAs} = D,
+    SAOid = lists:reverse(SARevOid),
+    case lists:keysearch(SAOid, 2, SAs) of
+	{value, {SubAgentPid, SAOid}} ->
+	    {subagent, SubAgentPid, SAOid};
+	false ->
+	    ?vinfo("find_node -> could not find subagent with"
+		"~n   SAOid: ~p"
+		"~n   SAs:   ~p", [SAOid, SAs]),
+	    false
+    end;    
+find_node(_D, Node, _RestOfOid, _RevOid) ->
+    ?vtrace("find_node -> failed:~n~p",[Node]),
+    {false, noSuchObject}.
+
+
+%%-----------------------------------------------------------------
+%% Func: next/3
+%% Purpose: Finds the lexicographically next oid.
+%% Returns: endOfMibView |
+%%          {subagent, SubAgentPid, SAOid} |
+%%          {variable, MibEntry, VarOid} |
+%%          {table, TableOid, TableRestOid, MibEntry}
+%% If a variable is returnes, it is in the MibView.
+%% If a table or subagent is returned, it *may* be in the MibView.
+%%-----------------------------------------------------------------
+next(#mib_data{tree = T} = D, Oid, MibView) ->
+    case catch next_node(D, T#tree.root, Oid, [], MibView) of
+	false -> endOfMibView;
+	Else -> Else
+    end.
+
+%%-----------------------------------------------------------------
+%% This function is used as long as we have any Oid left. Take
+%% one integer at a time from the Oid, and traverse the tree
+%% accordingly. When the Oid is empty, call find_next.
+%% Returns: {subagent, SubAgentPid, SAOid} |
+%%          false |
+%%          {variable, MibEntry, VarOid} |
+%%          {table, TableOid, TableRestOid, MibEntry}
+%%-----------------------------------------------------------------
+next_node(_D, undefined_node, _Oid, _RevOidSoFar, _MibView) ->
+    ?vtrace("next_node(undefined_node) -> entry", []),
+    false;
+
+next_node(_D, {tree, Tree, {table_entry, _Id}}, [Int | _Oid], 
+	  _RevOidSoFar, _MibView)
+  when Int+1 > size(Tree) ->
+    ?vtrace("next_node(tree,table_entry) -> entry when not found whith"
+	"~n   Int:        ~p"
+	"~n   size(Tree): ~p", [Int, size(Tree)]),
+    false;
+next_node(D, {tree, Tree, {table_entry, _MibName}},
+	  Oid, RevOidSoFar, MibView) ->
+    ?vtrace("next_node(tree,table_entry) -> entry when"
+	"~n   size(Tree):  ~p"
+	"~n   Oid:         ~p"
+	"~n   RevOidSoFar: ~p"
+	"~n   MibView:     ~p", [size(Tree), Oid, RevOidSoFar, MibView]),
+    OidSoFar = lists:reverse(RevOidSoFar),
+    case snmpa_acm:is_definitely_not_in_mib_view(OidSoFar, MibView) of
+	true -> 
+	    ?vdebug("next_node(tree,table_entry) -> not in mib view",[]),
+	    false;
+	_ -> 
+	    #mib_data{module = Mod, node_db = Db} = D,
+	    case Mod:read(Db, OidSoFar) of
+		false ->
+		    ?vinfo("next_node -> could not find table_entry with"
+			"~n   OidSoFar: ~p", [OidSoFar]),
+		    false;
+		{value, #node_info{me = ME}} ->
+		    ?vtrace("next_node(tree,table_entry) -> found: ~n   ~p",
+			[ME]),
+		    {table, OidSoFar, Oid, ME}
+	    end
+    end;
+
+next_node(D, {tree, Tree, _Info}, [Int | RestOfOid], RevOidSoFar, MibView) 
+  when (Int < size(Tree)) andalso (Int >= 0) ->
+    ?vtrace("next_node(tree) -> entry when"
+	"~n   size(Tree):  ~p"
+	"~n   Int:         ~p"
+	"~n   RestOfOid:   ~p"
+	"~n   RevOidSoFar: ~p"
+	"~n   MibView:     ~p", 
+	[size(Tree), Int, RestOfOid, RevOidSoFar, MibView]),
+    case next_node(D, element(Int+1,Tree), 
+		   RestOfOid, [Int|RevOidSoFar], MibView) of
+	false -> 
+	    find_next(D, {tree, Tree, _Info}, Int+1, RevOidSoFar, MibView);
+	Else -> 
+	    Else
+    end;
+%% no solution
+next_node(D, {tree, Tree, _Info}, [], RevOidSoFar, MibView) ->
+    ?vtrace("next_node(tree,[]) -> entry when"
+	"~n   size(Tree):  ~p"
+	"~n   RevOidSoFar: ~p"
+	"~n   MibView:     ~p", 
+	[size(Tree), RevOidSoFar, MibView]),
+    find_next(D, {tree, Tree, _Info}, 0, RevOidSoFar, MibView);
+next_node(_D, {tree, Tree, _Info}, _RestOfOid, _RevOidSoFar, _MibView) ->
+    ?vtrace("next_node(tree) -> entry when"
+	"~n   size(Tree):  ~p", [size(Tree)]),
+    false;
+
+next_node(D, {node, subagent}, Oid, RevOidSoFar, MibView) ->
+    ?vtrace("next_node(node,subagent) -> entry when"
+	"~n   Oid:         ~p"
+	"~n   RevOidSoFar: ~p"
+	"~n   MibView:     ~p", 
+	[Oid, RevOidSoFar, MibView]),
+    OidSoFar = lists:reverse(RevOidSoFar),
+    case snmpa_acm:is_definitely_not_in_mib_view(OidSoFar, MibView) of
+	true -> 
+	    false;
+	_ -> 
+	    #mib_data{subagents = SAs} = D,
+	    case lists:keysearch(OidSoFar, 2, SAs) of
+		{value, {SubAgentPid, OidSoFar}} ->
+		    {subagent, SubAgentPid, OidSoFar};
+		_ ->
+		    ?vinfo("next_node -> could not find subagent with"
+			"~n   OidSoFar: ~p"
+			"~n   SAs:      ~p", [OidSoFar, SAs]),
+		    false
+	    end
+    end;
+    
+next_node(D, {node, {variable, _MibName}}, [], RevOidSoFar, MibView) ->
+    ?vtrace("next_node(node,variable,[]) -> entry when"
+	"~n   RevOidSoFar: ~p"
+	"~n   MibView:     ~p", 
+	[RevOidSoFar, MibView]),
+    OidSoFar = lists:reverse([0 | RevOidSoFar]),
+    case snmpa_acm:validate_mib_view(OidSoFar, MibView) of
+	true ->
+	    #mib_data{module = Mod, node_db = Db} = D,
+	    case Mod:read(Db, lists:reverse(RevOidSoFar)) of
+		false ->
+		    ?vinfo("next_node -> could not find variable with"
+			"~n   RevOidSoFar: ~p", [RevOidSoFar]),
+		    false;
+		{value, #node_info{me = ME}} ->
+		    {variable, ME, OidSoFar}
+	    end;
+	_ -> 
+	    false
+    end;
+
+next_node(_D, {node, {variable, _MibName}}, _Oid, _RevOidSoFar, _MibView) ->
+    ?vtrace("next_node(node,variable) -> entry", []),
+    false.
+
+
+%%-----------------------------------------------------------------
+%% This function is used to find the first leaf from where we
+%% are.
+%% Returns: {subagent, SubAgentPid, SAOid} |
+%%          false |
+%%          {variable, MibEntry, VarOid} |
+%%          {table, TableOid, TableRestOid, MibEntry}
+%% PRE: This function must always be called with a {internal, Tree}
+%%      node.
+%%-----------------------------------------------------------------
+find_next(D, {tree, Tree, internal}, Idx, RevOidSoFar, MibView) 
+  when Idx < size(Tree) ->
+    case find_next(D, element(Idx+1, Tree), 0, [Idx| RevOidSoFar], MibView) of
+	false -> 
+	    find_next(D, {tree, Tree, internal}, Idx+1, RevOidSoFar, MibView);
+	Other -> 
+	    Other
+    end;
+find_next(_D, {tree, _Tree, internal}, _Idx, _RevOidSoFar, _MibView) ->
+    false;
+find_next(_D, undefined_node, _Idx, _RevOidSoFar, _MibView) ->
+    false;
+find_next(D, {tree, Tree, {table, _MibName}}, Idx, RevOidSoFar, MibView) ->
+    find_next(D, {tree, Tree, internal}, Idx, RevOidSoFar, MibView);
+find_next(D, {tree, _Tree, {table_entry, _MibName}}, _Index,
+	  RevOidSoFar, MibView) ->
+    OidSoFar = lists:reverse(RevOidSoFar),
+    case snmpa_acm:is_definitely_not_in_mib_view(OidSoFar, MibView) of
+	true -> 
+	    false;
+	_ -> 
+	    #mib_data{module = Mod, node_db = Db} = D,
+	    case Mod:read(Db, OidSoFar) of
+		false ->
+		    ?vinfo("find_next -> could not find table_entry ME with"
+			"~n   OidSoFar: ~p", [OidSoFar]),
+		    false;
+		{value, #node_info{me = ME}} ->
+		    {table, OidSoFar, [], ME}
+	    end
+    end;
+find_next(D, {node, {variable, _MibName}}, _Idx, RevOidSoFar, MibView) ->
+    OidSoFar = lists:reverse([0 | RevOidSoFar]),
+    case snmpa_acm:validate_mib_view(OidSoFar, MibView) of
+	true -> 
+	    #mib_data{module = Mod, node_db = Db} = D,
+	    case Mod:read(Db, lists:reverse(RevOidSoFar)) of
+		false ->
+		    ?vinfo("find_next -> could not find variable with"
+			"~n   RevOidSoFar: ~p", [RevOidSoFar]),
+		    false;
+		{value, #node_info{me = ME}} ->
+		    {variable, ME, OidSoFar}
+	    end;
+	_ -> 
+	    false
+    end;
+find_next(D, {node, subagent}, _Idx, RevOidSoFar, MibView) ->
+    OidSoFar = lists:reverse(RevOidSoFar),
+    case snmpa_acm:is_definitely_not_in_mib_view(OidSoFar, MibView) of
+	true -> 
+	    false;
+	_ -> 
+	    #mib_data{subagents = SAs} = D,
+	    case lists:keysearch(OidSoFar, 2, SAs) of
+		{value, {SubAgentPid, OidSoFar}} ->
+		    {subagent, SubAgentPid, OidSoFar};
+		false ->
+		    ?vinfo("find_node -> could not find subagent with"
+			"~n   OidSoFar: ~p"
+			"~n   SAs:      ~p", [OidSoFar, SAs]),
+		    false
+	    end
+    end.
+
+%%%======================================================================
+%%% 3. Tree building functions
+%%%    Used when loading mibs.
+%%%======================================================================
+
+build_tree(Mes, MibName) ->
+    ?d("build_tree -> "
+	"~n   Mes: ~p", [Mes]),
+    {ListTree, []}  = build_subtree([], Mes, MibName),
+    {tree, convert_tree(ListTree), internal}.
+
+%%----------------------------------------------------------------------
+%% Purpose: Builds the tree where all oids have prefix equal to LevelPrefix.
+%% Returns: {Tree, RestMes}
+%% RestMes are Mes that should not be in this subtree.
+%% The Tree is a temporary and simplified data structure that is easy to
+%% convert to the final tuple tree used by the MIB process.
+%% A Node is represented as in the final tree.
+%% The tree is not represented as a N-tuple, but as an Index-list.
+%% Example: Temporary: [{1, Node1}, {3, Node3}]
+%%          Final:     {Node1, undefined_node, Node3}
+%% Pre: Mes are sorted on oid.
+%%----------------------------------------------------------------------
+build_subtree(LevelPrefix, [Me | Mes], MibName) ->
+    ?vtrace("build subtree -> ~n"
+	   "   oid:         ~p~n"
+	   "   LevelPrefix: ~p~n"
+	   "   MibName:     ~p", [Me#me.oid, LevelPrefix, MibName]),
+    EType = Me#me.entrytype,
+    ?vtrace("build subtree -> EType = ~p",[EType]),
+    case in_subtree(LevelPrefix, Me) of
+	above ->
+	    ?vtrace("build subtree -> above",[]),
+	    {[], [Me|Mes]};
+	{node, Index} ->
+	    ?vtrace("build subtree -> node at ~p",[Index]),
+	    {Tree, RestMes} = build_subtree(LevelPrefix, Mes, MibName),
+	    {[{Index, {node, {EType, MibName}}} | Tree], RestMes};
+	{subtree, Index, NewLevelPrefix} ->
+	    ?vtrace("build subtree -> subtree at"
+		    "~n   ~w with ~w",
+		   [Index, NewLevelPrefix]),
+	    {BelowTree, RestMes} = 
+		build_subtree(NewLevelPrefix, Mes, MibName),
+	    {CurTree, RestMes2} = 
+		build_subtree(LevelPrefix, RestMes, MibName),
+	    {[{Index, {tree, BelowTree, {EType,MibName}}}| CurTree], RestMes2};
+	{internal_subtree, Index, NewLevelPrefix} ->
+	    ?vtrace("build subtree -> internal_subtree at"
+		    "~n   ~w with ~w",
+		   [Index,NewLevelPrefix]),
+	    {BelowTree, RestMes} =
+		build_subtree(NewLevelPrefix, [Me | Mes], MibName),
+	    {CurTree, RestMes2} =
+		build_subtree(LevelPrefix, RestMes, MibName),
+	    {[{Index, {tree, BelowTree, internal}} | CurTree], RestMes2}
+    end;
+
+build_subtree(_LevelPrefix, [], _MibName) -> 
+    ?vtrace("build subtree -> done", []),
+    {[], []}.
+
+%%--------------------------------------------------
+%% Purpose: Determine how/if/where Me should be inserted in subtree
+%%          with LevelPrefix. This function does not build any tree, only 
+%%          determinses what should be done (by build subtree).
+%% Returns:
+%% above - Indicating that this ME should _not_ be in this subtree.
+%% {node, Index} - yes, construct a node with index Index on this level
+%% {internal_subtree, Index, NewLevelPrefix} - yes, there should be an
+%%   internal subtree at this index.
+%% {subtree, Index, NewLevelPrefix} - yes, construct a subtree with 
+%%   NewLevelPrefix and insert this on current level in position Index.
+%%--------------------------------------------------
+in_subtree(LevelPrefix, Me) ->
+    case lists:prefix(LevelPrefix, Me#me.oid) of
+	true when length(Me#me.oid) > length(LevelPrefix) ->
+	    classify_how_in_subtree(LevelPrefix, Me);
+	_ ->
+	    above
+    end.
+
+%%--------------------------------------------------
+%% See comment about in_subtree/2.  This function takes care of all cases
+%% where the ME really should be in _this_ subtree (not above).
+%%--------------------------------------------------
+classify_how_in_subtree(LevelPrefix, Me) 
+  when (length(Me#me.oid) =:= (length(LevelPrefix) + 1)) ->
+    Oid = Me#me.oid,
+    case node_or_subtree(Me#me.entrytype) of
+	subtree ->
+	    {subtree, lists:last(Oid), Oid};
+	node ->
+	    {node, lists:last(Oid)}
+    end;
+
+classify_how_in_subtree(LevelPrefix, Me) 
+  when (length(Me#me.oid) > (length(LevelPrefix) + 1)) ->
+    L1 = length(LevelPrefix) + 1,
+    Oid = Me#me.oid,
+    {internal_subtree, lists:nth(L1, Oid), lists:sublist(Oid, 1, L1)}.
+
+%%--------------------------------------------------
+%% Determines how to treat different kinds om MEs in the tree building process.
+%% Pre: all internal nodes have been removed.
+%%--------------------------------------------------
+node_or_subtree(table) -> subtree;
+node_or_subtree(table_entry) -> subtree;
+node_or_subtree(variable) -> node;
+node_or_subtree(table_column) -> node.
+
+%%--------------------------------------------------
+%% Purpose: (Recursively) Converts a temporary tree (see above) to a final tree.
+%% If input is a ListTree, output is a TupleTree.
+%% If input is a Node, output is the same Node.
+%% Pre: All Indexes are >= 0.
+%%--------------------------------------------------
+convert_tree({Index, {tree, Tree, Info}}) when Index >= 0 ->
+    L = lists:map(fun convert_tree/1, Tree),
+    {Index, {tree, dict_list_to_tuple(L), Info}};
+convert_tree({Index, {node, Info}}) when Index >= 0 ->
+    {Index, {node, Info}};
+convert_tree(Tree) when is_list(Tree) ->
+    L = lists:map(fun convert_tree/1, Tree),
+    dict_list_to_tuple(L).
+
+%%----------------------------------------------------------------------
+%% Purpose: Converts a single level (that is non-recursively) from
+%%          the temporary indexlist to the N-tuple.
+%% Input: A list of {Index, Data}.
+%% Output: A tuple where element Index is Data.
+%%----------------------------------------------------------------------
+dict_list_to_tuple(L) ->
+    L2 = lists:keysort(1, L),
+    list_to_tuple(integrate_indexes(0, L2)).
+
+%%----------------------------------------------------------------------
+%% Purpose: Helper function for dict_list_to_tuple/1.
+%%          Converts an indexlist to a N-list.
+%% Input: A list of {Index, Data}.
+%% Output: A (usually longer, never shorter) list where element Index is Data.
+%% Example: [{1,hej}, {3, sven}] will give output 
+%% [undefined_node, hej, undefined_node, sven].
+%% Initially CurIndex should be 0.
+%%----------------------------------------------------------------------
+integrate_indexes(CurIndex, [{CurIndex, Data} | T]) ->
+    [Data | integrate_indexes(CurIndex + 1, T)];
+integrate_indexes(_Index, []) ->
+    [];
+integrate_indexes(CurIndex, L) ->
+    [undefined_node | integrate_indexes(CurIndex + 1, L)].
+
+%%%======================================================================
+%%% 4. Tree merging
+%%%    Used by: load mib, insert subagent.
+%%%======================================================================
+
+%%----------------------------------------------------------------------
+%% Arg: Two root nodes (that is to be merged).
+%% Returns: A new root node where the nodes have been merger to one.
+%%----------------------------------------------------------------------
+merge_nodes(Same, Same) -> 
+    Same;
+merge_nodes(Node, undefined_node) -> 
+    Node;
+merge_nodes(undefined_node, Node) -> 
+    Node;
+merge_nodes({tree, Tree1, internal}, {tree, Tree2, internal}) ->
+    {tree, merge_levels(tuple_to_list(Tree1),tuple_to_list(Tree2)), internal};
+merge_nodes(Node1, Node2) ->
+    throw({error_merge_nodes, Node1, Node2}).
+
+%%----------------------------------------------------------------------
+%% Arg: Two levels to be merged.
+%%      Here, a level is represented as a list of nodes. A list is easier
+%%      to extend than a tuple.
+%% Returns: The resulting, merged level tuple.
+%%----------------------------------------------------------------------
+merge_levels(Level1, Level2) when length(Level1) =:= length(Level2) ->
+    MergeNodes = fun(N1, N2) -> merge_nodes(N1, N2) end,
+    list_to_tuple(snmp_misc:multi_map(MergeNodes, [Level1, Level2]));
+merge_levels(Level1, Level2) when length(Level1) > length(Level2) ->
+    merge_levels(Level1, Level2 ++ 
+		 undefined_nodes_list(length(Level1) - length(Level2)));
+merge_levels(Level1, Level2) when length(Level1) < length(Level2) ->
+    merge_levels(Level2, Level1).
+
+undefined_nodes_list(N) -> lists:duplicate(N, undefined_node).
+
+
+%%%======================================================================
+%%% 5. Tree deletion routines
+%%%    (for unload mib)
+%%%======================================================================
+
+%%----------------------------------------------------------------------
+%% Purpose:  Actually kicks of the tree reconstruction.
+%% Returns: {list of removed MEs, NewTree}
+%%----------------------------------------------------------------------
+delete_mib_from_tree(MibName, {tree, Tree, internal}) ->
+    case delete_tree(Tree, MibName) of
+	[] -> 
+	    {tree, {undefined_node}, internal}; % reduce
+	LevelList -> 
+	    {tree, list_to_tuple(LevelList), internal}
+    end.
+
+%%----------------------------------------------------------------------
+%% Purpose: Deletes all nodes associated to MibName from this level and
+%%          all levels below.
+%%          If the new level does not contain information (that is, no 
+%%          other mibs use it) anymore the empty list is returned.
+%% Returns: {MEs, The new level represented as a list}
+%%----------------------------------------------------------------------
+delete_tree(Tree, MibName) when is_tuple(Tree) ->
+    NewLevel = delete_nodes(tuple_to_list(Tree), MibName, []),
+    case lists:filter(fun drop_undefined_nodes/1,NewLevel) of
+	[] -> [];
+	_A_perhaps_shorted_list ->
+	    NewLevel  % some other mib needs this level
+    end.
+    
+%%----------------------------------------------------------------------
+%% Purpose: Nodes belonging to MibName are removed from the tree.
+%%          Recursively deletes sub trees to this node.
+%% Returns: {MEs, NewNodesList}
+%%----------------------------------------------------------------------
+delete_nodes([], _MibName, AccNodes) ->
+    lists:reverse(AccNodes);
+
+delete_nodes([{node, {variable, MibName}}|T], MibName, AccNodes) ->
+    delete_nodes(T, MibName, [undefined_node | AccNodes]);
+
+delete_nodes([{node, {table_column, MibName}}|T], MibName, AccNodes) ->
+    delete_nodes(T, MibName, [undefined_node | AccNodes]);
+
+delete_nodes([{tree, _Tree, {table, MibName}}|T], MibName, AccNodes) ->
+    delete_nodes(T, MibName, [undefined_node | AccNodes]);
+
+delete_nodes([{tree, _Tree, {table_entry, MibName}}|T], MibName, AccNodes) ->
+    delete_nodes(T, MibName, [undefined_node | AccNodes]);
+
+delete_nodes([{tree, Tree, Info}|T], MibName, AccNodes) ->
+    case delete_tree(Tree, MibName) of
+	[] -> % tree completely deleted
+	    delete_nodes(T, MibName, [undefined_node | AccNodes]);
+	LevelList ->
+	    delete_nodes(T, MibName, 
+			 [{tree, list_to_tuple(LevelList), Info} | AccNodes])
+    end;
+
+delete_nodes([NodeToKeep|T], MibName, AccNodes) ->
+    delete_nodes(T, MibName, [NodeToKeep | AccNodes]).
+
+drop_undefined_nodes(undefined_node) -> false;
+drop_undefined_nodes(_) -> true.
+
+
+%%%======================================================================
+%%% 6. Functions for subagent handling
+%%%======================================================================
+
+%%----------------------------------------------------------------------
+%% Returns: A new Root|{error, reason}
+%%----------------------------------------------------------------------
+insert_subagent(Oid, OldRoot) ->
+    ListTree = build_tree_for_subagent(Oid),
+    case catch convert_tree(ListTree) of
+	{'EXIT', _Reason} ->
+	    {error, 'cannot construct tree from oid'};
+	Level when is_tuple(Level) ->
+	    T = {tree, Level, internal},
+	    case catch merge_nodes(T, OldRoot) of
+		{error_merge_nodes, _Node1, _Node2} ->
+		    {error, oid_conflict};
+		NewRoot when is_tuple(NewRoot) andalso 
+			     (element(1, NewRoot) =:= tree) ->
+		    NewRoot
+	    end
+    end.
+
+build_tree_for_subagent([Index]) ->
+    [{Index, {node, subagent}}];
+
+build_tree_for_subagent([Index | T]) ->
+    [{Index, {tree, build_tree_for_subagent(T), internal}}].
+
+
+%%----------------------------------------------------------------------
+%% Returns: A new tree where the subagent at Oid (2nd arg) has been deleted.
+%%----------------------------------------------------------------------
+
+delete_subagent({tree, Tree, Info}, [Index]) ->
+    {node, subagent} = element(Index+1, Tree),
+    {tree, setelement(Index+1, Tree, undefined_node), Info};
+delete_subagent({tree, Tree, Info}, [Index | TI]) ->
+    {tree, setelement(Index+1, Tree,
+		      delete_subagent(element(Index+1, Tree), TI)), Info}.
+
+
+%%%======================================================================
+%%% 7. Misc functions
+%%%======================================================================
+
+%%----------------------------------------------------------------------
+%% Installs the mibs found in the database when starting the agent.
+%% Basically calls the instrumentation functions for all non-internal
+%% mib-entries
+%%----------------------------------------------------------------------
+install_mibs(Mod, MibDb, NodeDb) ->
+    MibNames = loaded(Mod, MibDb),
+    ?vtrace("install_mibs -> found following mibs in database: ~n"
+	"~p", [MibNames]),
+    install_mibs2(Mod, NodeDb, MibNames).
+
+install_mibs2(_, _, []) ->
+    ok;
+install_mibs2(Mod, NodeDb, [MibName|MibNames]) ->
+    Pattern = #node_info{oid = '_', mib_name = MibName, me = '_'},
+    Nodes = Mod:match_object(NodeDb, Pattern),
+    MEs = [ME || #node_info{me = ME} <- Nodes],
+    ?vtrace("install_mibs2 -> installing ~p MEs for mib ~p", 
+	    [length(MEs), MibName]),
+    NewF = fun(ME) -> call_instrumentation(ME, new) end,
+    lists:foreach(NewF, MEs),
+    install_mibs2(Mod, NodeDb, MibNames).
+    
+    
+%%----------------------------------------------------------------------
+%% Does all side effect stuff during load_mib.
+%%----------------------------------------------------------------------
+install_mib(Mod, Db, Symbolic, Mib, MibName, FileName, NonInternalMes) ->
+    ?vdebug("install_mib -> entry with"
+	    "~n   Symbolic: ~p"
+	    "~n   MibName:  ~p"
+	    "~n   FileName: ~p", [Symbolic, MibName, FileName]),
+    Rec = #mib_info{name = MibName, symbolic = Symbolic, file_name = FileName},
+    Mod:write(Db, Rec),
+    install_mib2(Symbolic, MibName, Mib),
+    NewF = fun(ME) -> call_instrumentation(ME, new) end,
+    lists:foreach(NewF, NonInternalMes).
+
+install_mib2(true, MibName, Mib) ->
+    #mib{table_infos    = TabInfos,
+	 variable_infos = VarInfos,
+	 mes            = MEs,
+	 asn1_types     = ASN1Types,
+	 traps          = Traps} = Mib,
+    snmpa_symbolic_store:add_table_infos(MibName, TabInfos),
+    snmpa_symbolic_store:add_variable_infos(MibName, VarInfos),
+    snmpa_symbolic_store:add_aliasnames(MibName, MEs),
+    snmpa_symbolic_store:add_types(MibName, ASN1Types),
+    SetF = fun(Trap) -> 
+		   snmpa_symbolic_store:set_notification(Trap, MibName)
+	   end,
+    lists:foreach(SetF, Traps);
+install_mib2(_, _, _) ->
+    ok.
+
+install_mes(Mod, Db, MibName, MEs) ->
+    Write = fun(#me{oid = Oid} = ME) ->
+		    Node = #node_info{oid      = Oid, 
+				      mib_name = MibName, 
+				      me       = ME},
+		    Mod:write(Db, Node)
+	    end,
+    install_mes(Write, MEs).
+
+install_mes(_Write, []) ->
+    ok;
+install_mes(Write, [ME|MEs]) ->
+    Write(ME),
+    install_mes(Write, MEs).
+
+
+%%----------------------------------------------------------------------
+%% Does all side effect stuff during unload_mib.
+%%----------------------------------------------------------------------
+uninstall_mib(Mod, Db, Symbolic, MibName, MEs) ->
+    ?vtrace("uninstall_mib -> entry with"
+	"~n   Db:       ~p"
+	"~n   Symbolic: ~p"
+	"~n   MibName:  ~p", [Db, Symbolic, MibName]),
+    Res = Mod:delete(Db, MibName),
+    ?vtrace("uninstall_mib -> (mib) db delete result: ~p", [Res]),
+    uninstall_mib2(Symbolic, MibName),
+    DelF = fun(ME) -> call_instrumentation(ME, delete) end,
+    lists:foreach(DelF, MEs).
+
+uninstall_mib2(true, MibName) ->
+    snmpa_symbolic_store:delete_table_infos(MibName),
+    snmpa_symbolic_store:delete_variable_infos(MibName),
+    snmpa_symbolic_store:delete_aliasnames(MibName),
+    snmpa_symbolic_store:delete_types(MibName),
+    snmpa_symbolic_store:delete_notifications(MibName);
+uninstall_mib2(_, _) ->
+    ok.
+
+uninstall_mes(Mod, Db, MibName) ->
+    Pattern = #node_info{oid = '_', mib_name = MibName, me = '_'},
+    Mod:match_delete(Db, Pattern).
+
+
+%%----------------------------------------------------------------------
+%% Create a list of the names of all the loaded mibs
+%%----------------------------------------------------------------------
+loaded(Mod, Db) ->
+    [N || #mib_info{name = N} <- Mod:tab2list(Db)].
+    
+
+%%----------------------------------------------------------------------
+%% Calls MFA-instrumentation with 'new' or 'delete' operation.
+%%----------------------------------------------------------------------
+call_instrumentation(#me{entrytype = variable, mfa={M,F,A}}, Operation) ->
+    ?vtrace("call instrumentation with"
+	    "~n   entrytype: variable"
+	    "~n   MFA:       {~p,~p,~p}"
+	    "~n   Operation: ~p",
+	    [M,F,A,Operation]),
+    catch apply(M, F, [Operation | A]);
+call_instrumentation(#me{entrytype = table_entry, mfa={M,F,A}}, Operation) ->
+    ?vtrace("call instrumentation with"
+	    "~n   entrytype: table_entry"
+	    "~n   MFA:       {~p,~p,~p}"
+	    "~n   Operation: ~p",
+	    [M,F,A,Operation]),
+    catch apply(M, F, [Operation | A]);
+call_instrumentation(_ShitME, _Operation) ->
+    done.
+
+
+maybe_drop_me(#me{entrytype = internal}) -> false;
+maybe_drop_me(#me{entrytype = group}) -> false;
+maybe_drop_me(#me{imported = true}) -> false;
+maybe_drop_me(_) -> true.
+
+
+%%----------------------------------------------------------------------
+%% Code change functions
+%%----------------------------------------------------------------------
+
+code_change(down, _Vsn, _Extra, State) ->
+    ?d("code_change(down) -> entry when"
+       "~n   Vsn:   ~p"
+       "~n   Extra: ~p", [_Vsn, _Extra]),
+    State;
+
+code_change(up, _Vsn, _Extra, State) ->
+    ?d("code_change(up) -> entry when"
+       "~n   Vsn:   ~p"
+       "~n   Extra: ~p", [_Vsn, _Extra]),
+    State.
+
+
diff --git a/lib/snmp/src/agent/snmpa_mib_storage.erl b/lib/snmp/src/agent/snmpa_mib_storage.erl
new file mode 100644
index 0000000000..5c3f76d89b
--- /dev/null
+++ b/lib/snmp/src/agent/snmpa_mib_storage.erl
@@ -0,0 +1,181 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013-2013. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+-module(snmpa_mib_storage).
+
+-export_type([
+	      mib_storage_fields/0, 
+	      mib_storage_table_type/0, 
+	      mib_storage_table_id/0
+	     ]).
+
+
+%%% ----------------------------------------------------------------
+%%% This behaviour module defines the API for the mib-storage. 
+%%% This is how the agent stores its internal mib-data 
+%%% (symbolic-store and mib-server). 
+%%%-----------------------------------------------------------------
+
+-type mib_storage_fields()     :: [atom()].
+-type mib_storage_table_type() :: set | bag. 
+-type mib_storage_table_id()   :: term().
+
+
+%% ---------------------------------------------------------------
+%% open
+%% 
+%% Open or create a mib-storage table. 
+%% If any extra info needs to be communicated to the implementor
+%% (of the behaviour), this is done using the *Options* argument. 
+%% ---------------------------------------------------------------
+
+%% Options is callback module dependant
+
+-callback open(Name    :: atom(), 
+	       RecName :: atom(), 
+	       Fields  :: mib_storage_fields(), 
+	       Type    :: mib_storage_table_type(), 
+	       Options :: list()) ->
+    {ok, TabId :: mib_storage_table_id()} | {error, Reason :: term()}.
+
+
+%% ---------------------------------------------------------------
+%% close
+%% 
+%% Close the mib-storage table. What this does is up to the 
+%% implementor (when using mnesia it may be a no-op but for ets 
+%% it may actually delete the table). 
+%% ---------------------------------------------------------------
+
+-callback close(TabId :: mib_storage_table_id()) ->
+    term().
+
+
+%% ---------------------------------------------------------------
+%% read/2
+%% 
+%% Retrieve a record from the mib-storage table.
+%% ---------------------------------------------------------------
+
+-callback read(TabId :: mib_storage_table_id(), 
+	       Key   :: term()) ->
+    false | {value, Record :: tuple()}.
+
+
+%% ---------------------------------------------------------------
+%% write/2
+%% 
+%% Write a record to the mib-storage table.
+%% ---------------------------------------------------------------
+
+-callback write(TabId  :: mib_storage_table_id(), 
+		Record :: tuple()) ->
+    ok | {error, Reason :: term()}.
+
+
+%% ---------------------------------------------------------------
+%% delete/1
+%% 
+%% Delete the mib-storage table. 
+%% ---------------------------------------------------------------
+
+-callback delete(TabId :: mib_storage_table_id()) ->
+    snmp:void().
+
+
+%% ---------------------------------------------------------------
+%% delete/2
+%% 
+%% Delete a record from the mib-storage table.
+%% ---------------------------------------------------------------
+
+-callback delete(TabId :: mib_storage_table_id(), 
+		 Key   :: term()) ->
+    ok | {error, Reason :: term()}.
+
+
+%% ---------------------------------------------------------------
+%% match_object
+%% 
+%% Search the mib-storage table for records which matches 
+%% the pattern.
+%% ---------------------------------------------------------------
+
+-callback match_object(TabId   :: mib_storage_table_id(), 
+		       Pattern :: ets:match_pattern()) ->
+    {ok, Recs :: [tuple()]} | {error, Reason :: term()}.
+
+
+%% ---------------------------------------------------------------
+%% match_delete
+%% 
+%% Search the mib-storage table for records which matches the 
+%% pattern and deletes them from the database and return the 
+%5 deleted records.
+%% ---------------------------------------------------------------
+
+-callback match_delete(TabId   :: mib_storage_table_id(), 
+		       Pattern :: ets:match_pattern()) ->
+    {ok, Recs :: [tuple()]} | {error, Reason :: term()}.
+
+
+%% ---------------------------------------------------------------
+%% tab2list
+%% 
+%% Return all records in the table in the form of a list.
+%% ---------------------------------------------------------------
+
+-callback tab2list(TabId :: mib_storage_table_id()) ->
+    [tuple()].
+
+
+%% ---------------------------------------------------------------
+%% info/1,2
+%% 
+%% Retrieve implementation dependent mib-storage table 
+%% information.
+%% ---------------------------------------------------------------
+
+-callback info(TabId :: mib_storage_table_id()) ->
+    Info :: term().
+
+-callback info(TabId :: mib_storage_table_id(), Item :: atom()) ->
+    Info :: term().
+
+
+%% ---------------------------------------------------------------
+%% sync
+%% 
+%% Dump mib-storage table to disc (if it has a disk component). 
+%% ---------------------------------------------------------------
+
+-callback sync(TabId :: mib_storage_table_id()) ->
+    snmp:void().
+
+
+%% ---------------------------------------------------------------
+%% backup
+%% 
+%% Make a backup copy of the mib-storage table. 
+%% ---------------------------------------------------------------
+
+-callback backup(TabId :: mib_storage_table_id(), 
+		 Dir   :: file:filename()) ->
+    ok | {error, Reason :: term()}.
+
diff --git a/lib/snmp/src/agent/snmpa_mib_storage_dets.erl b/lib/snmp/src/agent/snmpa_mib_storage_dets.erl
new file mode 100644
index 0000000000..e84e18e7ea
--- /dev/null
+++ b/lib/snmp/src/agent/snmpa_mib_storage_dets.erl
@@ -0,0 +1,309 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013-2013. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(snmpa_mib_storage_dets).
+
+-behaviour(snmpa_mib_storage).
+
+
+%%%-----------------------------------------------------------------
+%%% This module implements the snmpa_mib_storage behaviour. 
+%%% It uses dets for storage. 
+%%%-----------------------------------------------------------------
+
+-export([
+	 open/5, 
+	 close/1, 
+	 read/2, 
+	 write/2, 
+	 delete/1, 
+	 delete/2, 
+	 match_object/2, 
+	 match_delete/2, 
+	 tab2list/1, 
+	 info/1, info/2, 
+	 sync/1, 
+	 backup/2
+	]).
+
+
+-define(VMODULE, "MS-DETS").
+-include("snmp_verbosity.hrl").
+
+-record(tab, {id, rec_name}).
+
+
+%% ---------------------------------------------------------------
+%% open
+%% 
+%% Open or create a mib-storage (dets) table. 
+%% 
+%% Opts - A list of implementation dependent options
+%%        dets_open_options() = [dets_open_option()]
+%%        dets_open_option()  = {dir,       filename()} | 
+%%                              {action,    keep | clear} | 
+%%                              {auto_save, default | pos_integer()} |
+%%                              {repair,    force | boolean()}
+%%                              
+%% ---------------------------------------------------------------
+
+open(Name, RecName, _Fields, Type, Opts) ->
+    Dir      = snmp_misc:get_option(dir,       Opts), 
+    Action   = snmp_misc:get_option(action,    Opts, keep), 
+    AutoSave = snmp_misc:get_option(auto_save, Opts, default), 
+    Repair   = snmp_misc:get_option(repair,    Opts, false), 
+    File     = dets_filename(Name, Dir), 
+    OpenOpts = [{file,   File}, 
+		{type,   Type}, 
+		{keypos, 2}, 
+		{repair, Repair}] ++ 
+	case AutoSave of
+	    default ->
+		[];
+	    _ ->
+		[{auto_save, AutoSave}]
+	end,
+    case dets:open_file(Name, OpenOpts) of
+	{ok, ID} when (Action =:= keep) ->
+	    {ok, #tab{id = ID, rec_name = RecName}};
+	{ok, ID} when (Action =:= clear) ->
+	    dets:match_delete(ID, '_'),
+	    {ok, #tab{id = ID, rec_name = RecName}};
+	{error, Reason} ->
+	    {error, {dets_open, Reason}}
+    end.
+
+dets_filename(Name, Dir) ->
+    Dir1 = dets_filename1(Dir),
+    Dir2 = string:strip(Dir1, right, $/),
+    io_lib:format("~s/~p.dat", [Dir2, Name]).
+    
+dets_filename1([])  -> ".";
+dets_filename1(Dir) -> Dir.
+
+
+%% ---------------------------------------------------------------
+%% close
+%% 
+%% Close the table. 
+%% ---------------------------------------------------------------
+
+close(#tab{id = ID}) ->
+    ?vtrace("close database ~p", [ID]),
+    dets:close(ID).
+
+
+%% ---------------------------------------------------------------
+%% read
+%% 
+%% Retrieve a record from the database table.
+%% ---------------------------------------------------------------
+
+read(#tab{id = ID}, Key) ->
+    ?vtrace("read from table ~p: ~p", [ID, Key]),
+    case dets:lookup(ID, Key) of
+	[Rec|_] -> {value, Rec};
+	_ -> false
+    end.
+    
+
+%% ---------------------------------------------------------------
+%% write
+%% 
+%% Write a record to the database table.
+%% ---------------------------------------------------------------
+
+write(#tab{id = ID, rec_name = RecName}, Rec) 
+  when (is_tuple(Rec) andalso (element(1, Rec) =:= RecName)) ->
+    ?vtrace("write to table ~p", [ID]),
+    dets:insert(ID, Rec).
+
+
+%% ---------------------------------------------------------------
+%% delete
+%% 
+%% Delete the database table. 
+%% ---------------------------------------------------------------
+
+delete(#tab{id = ID}) ->
+    ?vtrace("delete database ~p", [ID]),
+    File = dets:info(ID, filename),
+    case dets:close(ID) of
+	ok ->
+	    file:delete(File);
+	Error ->
+	    Error
+    end.
+
+
+%% ---------------------------------------------------------------
+%% delete
+%% 
+%% Delete a record from the database table.
+%% ---------------------------------------------------------------
+
+delete(#tab{id = ID}, Key) ->
+    ?vtrace("delete from table ~p: ~p", [ID, Key]),
+    dets:delete(ID, Key).
+
+
+%% ---------------------------------------------------------------
+%% match_object
+%% 
+%% Search the database table for records witch matches the pattern.
+%% ---------------------------------------------------------------
+
+match_object(#tab{id = ID}, Pattern) ->
+    ?vtrace("match_object in ~p of ~p", [ID, Pattern]),
+    dets:match_object(ID, Pattern).
+    
+
+%% ---------------------------------------------------------------
+%% match_delete
+%% 
+%% Search the database table for records witch matches the 
+%% pattern and deletes them from the database table.
+%% ---------------------------------------------------------------
+
+match_delete(#tab{id = ID}, Pattern) -> 
+    ?vtrace("match_delete in ~p with pattern ~p", [ID, Pattern]),
+    Recs = dets:match_object(ID, Pattern),
+    dets:match_delete(ID, Pattern),
+    Recs.
+
+
+%% ---------------------------------------------------------------
+%% tab2list
+%% 
+%% Return all records in the table in the form of a list.
+%% ---------------------------------------------------------------
+
+tab2list(#tab{id = ID} = Tab) ->
+    ?vtrace("tab2list -> list of ~p", [ID]),
+    match_object(Tab, '_').
+
+
+%% ---------------------------------------------------------------
+%% info
+%% 
+%% Retrieve implementation dependent mib-storage table 
+%% information.
+%% ---------------------------------------------------------------
+
+info(#tab{id = ID}) ->
+    ?vtrace("info -> info of ~p", [ID]),
+    dets:info(ID).
+
+
+info(TabId, all = _Item) ->
+    info(TabId);
+info(#tab{id = ID}, memory = _Item) ->
+    ?vtrace("info on ~p (~w)", [ID, _Item]),
+    dets:info(ID, file_size);
+info(#tab{id = ID}, Item) ->
+    ?vtrace("info on ~p (~w)", [ID, Item]),
+    dets:info(ID, Item).
+
+
+%% ---------------------------------------------------------------
+%% sync
+%% 
+%% Dump mib-storage table to disc (if it has a disk component)
+%% ---------------------------------------------------------------
+
+sync(#tab{id = ID}) ->
+    ?vtrace("sync -> sync ~p", [ID]),
+    dets:sync(ID).
+
+
+%% ---------------------------------------------------------------
+%% backup
+%% 
+%% Make a backup copy of the mib-storage table. 
+%% ---------------------------------------------------------------
+
+backup(#tab{id = ID}, BackupDir) ->
+    ?vtrace("backup -> backup of ~p to ~p", [ID, BackupDir]),
+    case dets:info(ID, filename) of
+	undefined ->
+	    {error, no_file};
+	Filename ->
+	    case filename:dirname(Filename) of
+		BackupDir ->
+		    {error, db_dir};
+		_ ->
+		    Type = dets:info(ID, type),
+		    KP   = dets:info(ID, keypos),
+		    dets_backup(ID, 
+				filename:basename(Filename), 
+				BackupDir, Type, KP)
+	    end
+    end.
+
+	      
+dets_backup(ID, Filename, BackupDir, Type, KP) ->
+    ?vtrace("dets_backup -> entry with"
+	    "~n   ID:        ~p"
+	    "~n   Filename:  ~p"
+	    "~n   BackupDir: ~p"
+	    "~n   Type:      ~p"
+	    "~n   KP:        ~p", [ID, Filename, BackupDir, Type, KP]),
+    BackupFile = filename:join(BackupDir, Filename),
+    ?vtrace("dets_backup -> "
+	    "~n   BackupFile: ~p", [BackupFile]),
+    Backup = list_to_atom(atom_to_list(ID) ++ "_backup"),
+    Opts   = [{file, BackupFile}, {type, Type}, {keypos, KP}], 
+    case dets:open_file(Backup, Opts) of
+	{ok, B} ->
+	    ?vtrace("dets_backup -> create fun", []),
+	    F = fun(Arg) -> 
+			dets_backup(Arg, start, ID, B)
+		end,
+	    dets:safe_fixtable(ID, true),
+	    Res = dets:init_table(Backup, F, [{format, bchunk}]),
+	    dets:safe_fixtable(ID, false),
+	    ?vtrace("dets_backup -> Res: ~p", [Res]),
+	    Res;
+	Error ->
+	    ?vinfo("dets_backup -> open_file failed: "
+		   "~n   ~p", [Error]),
+	    Error
+    end.
+
+dets_backup(close, _Cont, _ID, B) ->
+    dets:close(B),
+    ok;
+dets_backup(read, Cont1, ID, B) ->
+    case dets:bchunk(ID, Cont1) of
+	{Cont2, Data} ->
+	    F = fun(Arg) ->
+			dets_backup(Arg, Cont2, ID, B)
+		end,
+	    {Data, F};
+	'$end_of_table' ->
+	    dets:close(B),
+	    end_of_input;
+	Error ->
+	    Error
+    end.
+
+
+%%----------------------------------------------------------------------
+
+%% user_err(F, A) ->
+%%     snmpa_error:user_err(F, A).
diff --git a/lib/snmp/src/agent/snmpa_mib_storage_ets.erl b/lib/snmp/src/agent/snmpa_mib_storage_ets.erl
new file mode 100644
index 0000000000..04faf46864
--- /dev/null
+++ b/lib/snmp/src/agent/snmpa_mib_storage_ets.erl
@@ -0,0 +1,341 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013-2013. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+-module(snmpa_mib_storage_ets).
+
+-behaviour(snmpa_mib_storage).
+
+%%%-----------------------------------------------------------------
+%%% This module implements the snmpa_mib_storage behaviour. 
+%%% It uses ets for storage. 
+%%%-----------------------------------------------------------------
+
+-export([
+	 open/5, 
+	 close/1, 
+	 read/2, 
+	 write/2, 
+	 delete/1, 
+	 delete/2, 
+	 match_object/2, 
+	 match_delete/2, 
+	 tab2list/1, 
+	 info/1, info/2, 
+	 sync/1, 
+	 backup/2
+	]).
+
+
+-define(VMODULE,"MS-ETS").
+-include("snmp_verbosity.hrl").
+
+-record(tab, {id, rec_name, file, checksum = false}).
+
+
+%% ---------------------------------------------------------------
+%% open
+%% 
+%% Open or create an ets table. 
+%% Possibly also read data from a (specified) file (mirror) and 
+%% populate the table from that (the dir option). 
+%% 
+%% Opts    - A list of implementation dependent options
+%%           ets_open_options() = [ets_open_option()]
+%%           ets_open_option()  = {dir,      filename()} | 
+%%                                {action,   keep | clear} | 
+%%                                {checksum, boolean()}
+%% 
+%% The RecName and Fields arguments are not used in this 
+%% implementation. 
+%% 
+%% ---------------------------------------------------------------
+
+%% This function creates the ets table 
+open(Name, RecName, _Fields, Type, Opts) ->
+    ?vtrace("open table ~p", [Name]),
+    case lists:keysearch(dir, 1, Opts) of
+	{value, {dir, Dir}} ->
+	    Action   = snmp_misc:get_option(action,   Opts, keep),
+	    Checksum = snmp_misc:get_option(checksum, Opts, false),
+	    ?vtrace("open ~p database ~p - check if file exist", [Type, Name]),
+	    File = filename:join(Dir, atom_to_list(Name) ++ ".db"),
+	    case file:read_file_info(File) of
+		{ok, _} ->
+		    ?vdebug("open ~p database ~p - file exist - try reading", 
+			    [Type, Name]),
+		    case ets:file2tab(File, [{verify, Checksum}]) of
+			{ok, ID} ->
+			    ?vtrace("open ~p database ~p - "
+				    "data read from file", [Type, Name]),
+			    {ok, #tab{id       = ID, 
+				      rec_name = RecName, 
+				      file     = File, 
+				      checksum = Checksum}};
+			{error, Reason} when (Action =:= keep) ->
+			    ?vinfo("open ~p database ~p - "
+				   "failed reading from file (keep): "
+				   "~n   ~p", 
+				   [Type, Name, Reason]),
+			    {error, {file2tab, Reason}};
+			{error, Reason} ->
+			    ?vlog("open ~p database ~p - "
+				  "failed reading from file (clear): "
+				  "~n   ~p", [Type, Name, Reason]),
+			    user_err("Warning: could not read file - "
+				     "create new (empty): "
+				     "~n   File:   ~p"
+				     "~n   Reason: ~p", [File, Reason]), 
+			    ID = ets:new(Name, [Type, protected, {keypos, 2}]),
+			    write_ets_file(ID, File, Checksum), 
+			    {ok, #tab{id       = ID, 
+				      rec_name = RecName, 
+				      file     = File, 
+				      checksum = Checksum}}
+		    end;
+		{error, enoent} ->
+		    %% No such file - create it
+		    ?vdebug("open ~p database ~p - "
+			    "file does *not* exist - create", 
+			    [Type, Name]),
+		    ID = ets:new(Name, [Type, protected, {keypos, 2}]),
+		    write_ets_file(ID, File, Checksum), 
+		    {ok, #tab{id       = ID, 
+			      rec_name = RecName, 
+			      file     = File, 
+			      checksum = Checksum}};
+		{error, Reason} when (Action =:= keep) ->
+		    ?vinfo("open ~p database ~p - "
+			   "failed reading file info (keep): "
+			   "~n   ~p", 
+			   [Type, Name, Reason]),
+		    {error, {read_file_info, Reason}};
+		{error, Reason} ->
+		    ?vlog("open ~p database ~p - "
+			  "failed reading file info (clear): "
+			  "~n   ~p", 
+			  [Type, Name, Reason]),
+		    user_err("Warning: could not read file info - "
+			     "create new file: "
+			     "~n   File:   ~p"
+			     "~n   Reason: ~p", [File, Reason]), 
+		    ID = ets:new(Name, [Type, protected, {keypos, 2}]),
+		    write_ets_file(ID, File, Checksum), 
+		    {ok, #tab{id       = ID, 
+			      rec_name = RecName, 
+			      file     = File, 
+			      checksum = Checksum}}
+	    end;
+	false ->
+	    ?vdebug("open ~p database ~p - ok", [Type, Name]),
+	    ID = ets:new(Name, [Type, protected, {keypos, 2}]),
+	    {ok, #tab{id = ID, rec_name = RecName}}
+    end.
+
+
+%% ---------------------------------------------------------------
+%% close
+%% 
+%% Close the mib-storage table. 
+%% We will delete the table and if there is a file component, 
+%% will also be written to file. 
+%% ---------------------------------------------------------------
+close(#tab{id = ID, file = undefined}) ->
+    ?vtrace("close (delete) table ~p", [ID]),
+    ets:delete(ID);
+close(#tab{id = ID, file = File, checksum = Checksum}) ->
+    ?vtrace("close (delete) table ~p", [ID]),
+    write_ets_file(ID, File, Checksum),
+    ets:delete(ID).
+
+
+%% ---------------------------------------------------------------
+%% read
+%% 
+%% Retrieve a record from the mib-storage table.
+%% ---------------------------------------------------------------
+
+read(#tab{id = ID}, Key) ->
+    ?vtrace("read from table ~p: ~p", [ID, Key]),
+    case ets:lookup(ID, Key) of
+	[Rec|_] -> {value, Rec};
+	_ -> false
+    end.
+    
+
+%% ---------------------------------------------------------------
+%% write
+%% 
+%% Write a record to the mib-storage table.
+%% ---------------------------------------------------------------
+
+%% This is a very crude guard test is used instead of: is_record(Rec, RecName)
+write(#tab{id = ID, rec_name = RecName}, Rec) 
+  when (is_tuple(Rec) andalso (element(1, Rec) =:= RecName)) ->
+    ?vtrace("write to table ~p", [ID]),
+    ets:insert(ID, Rec).
+
+
+%% ---------------------------------------------------------------
+%% delete
+%% 
+%% Delete the mib-storage table. 
+%% ---------------------------------------------------------------
+delete(#tab{id = ID, file = undefined}) ->
+    ?vtrace("delete table ~p", [ID]),
+    ets:delete(ID);
+delete(#tab{id = ID, file = File}) ->
+    ?vtrace("delete table ~p", [ID]),
+    file:delete(File),
+    ets:delete(ID).
+
+
+%% ---------------------------------------------------------------
+%% delete
+%% 
+%% Delete a record from the mib-storage table.
+%% ---------------------------------------------------------------
+delete(#tab{id = ID}, Key) ->
+    ?vtrace("delete from table ~p: ~p", [ID, Key]),
+    ets:delete(ID, Key).
+
+
+%% ---------------------------------------------------------------
+%% match_object
+%% 
+%% Search the mib-storage table for records witch matches 
+%% the pattern.
+%% ---------------------------------------------------------------
+
+match_object(#tab{id = ID}, Pattern) ->
+    ?vtrace("match_object in ~p of ~p", [ID, Pattern]),
+    ets:match_object(ID, Pattern).
+    
+
+%% ---------------------------------------------------------------
+%% match_delete
+%% 
+%% Search the mib-storage table for records witch matches 
+%% the pattern and deletes them from the table.
+%% ---------------------------------------------------------------
+ 
+match_delete(#tab{id = ID}, Pattern) -> 
+    ?vtrace("match_delete in ~p with pattern ~p", [ID, Pattern]),
+    Recs = ets:match_object(ID, Pattern),
+    ets:match_delete(ID, Pattern),
+    Recs.
+
+
+%% ---------------------------------------------------------------
+%% tab2list
+%% 
+%% Return all records in the mib-storage table in the form 
+%% of a list.
+%% ---------------------------------------------------------------
+
+tab2list(#tab{id = ID}) ->
+    ?vtrace("tab2list -> list of ~p", [ID]),
+    ets:tab2list(ID).
+
+
+
+%% ---------------------------------------------------------------
+%% info/1,2
+%% 
+%% Retrieve implementation dependent mib-storage table 
+%% information.
+%% ---------------------------------------------------------------
+info(#tab{id = ID}) ->
+    ?vtrace("info on ~p", [ID]),
+    case ets:info(ID) of
+	undefined ->
+	    [];
+	L ->
+	    L
+    end.
+
+
+info(TabId, all = _Item) ->
+    info(TabId);
+info(#tab{id = ID}, Item) ->
+    ?vtrace("info on ~p", [ID]),
+    ets:info(ID, Item).
+
+
+%% ---------------------------------------------------------------
+%% sync
+%% 
+%% Dump mib-storage table to disc (if there is a file compionent)
+%% ---------------------------------------------------------------
+
+sync(#tab{file = undefined}) ->
+    ok;
+sync(#tab{id = ID, file = File, checksum = Checksum}) ->
+    ?vtrace("sync ~p", [ID]),
+    write_ets_file(ID, File, Checksum).
+
+
+%% ---------------------------------------------------------------
+%% backup
+%% 
+%% Make a backup copy of the mib-storage table. Only valid id
+%% there is a file component. 
+%% ---------------------------------------------------------------
+
+backup(#tab{file = undefined}, _BackupDir) ->
+    ok;
+backup(#tab{id = ID, file = File, checksum = Checksum}, BackupDir) ->
+    ?vtrace("backup ~p to ~p", [ID, BackupDir]),
+    Filename = filename:basename(File),
+    case filename:join(BackupDir, Filename) of
+	File ->
+	    %% Oups: backup-dir and db-dir the same
+	    {error, db_dir};
+	BackupFile ->
+	    write_ets_file(ID, BackupFile, Checksum)
+    end.
+
+	      
+%%----------------------------------------------------------------------
+
+write_ets_file(ID, File, Checksum) when (Checksum =:= true) ->
+    do_write_ets_file(ID, File, [{extended_info, [md5sum]}]);
+write_ets_file(ID, File, Checksum) when (Checksum =:= false) ->
+    do_write_ets_file(ID, File, []).
+
+do_write_ets_file(ID, File, Options) ->
+    TmpFile = File ++ ".tmp",
+    case ets:tab2file(ID, TmpFile, Options) of
+	ok ->
+	    case file:rename(TmpFile, File) of
+		ok ->
+		    ok;
+		Else ->
+		    user_err("Warning: could not move file ~p"
+			     " (~p)", [File, Else])
+	    end;
+	{error, Reason} ->
+	    user_err("Warning: could not save file ~p (~p)",
+		     [File, Reason])
+    end.
+
+
+%%----------------------------------------------------------------------
+
+user_err(F, A) ->
+    snmpa_error:user_err(F, A).
diff --git a/lib/snmp/src/agent/snmpa_mib_storage_mnesia.erl b/lib/snmp/src/agent/snmpa_mib_storage_mnesia.erl
new file mode 100644
index 0000000000..192b5aa26e
--- /dev/null
+++ b/lib/snmp/src/agent/snmpa_mib_storage_mnesia.erl
@@ -0,0 +1,302 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2013-2013. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(snmpa_mib_storage_mnesia).
+
+
+-behaviour(snmpa_mib_storage).
+
+%%%-----------------------------------------------------------------
+%%% This module implements the snmpa_mib_storage behaviour. 
+%%% It uses mnesia for storage. 
+%%%-----------------------------------------------------------------
+
+-export([
+	 open/5, 
+	 close/1, 
+	 read/2, 
+	 write/2, 
+	 delete/1, 
+	 delete/2, 
+	 match_object/2, 
+	 match_delete/2, 
+	 tab2list/1, 
+	 info/1, info/2, 
+	 sync/1, 
+	 backup/2
+	]).
+
+
+-define(VMODULE,"MS-MNESIA").
+-include("snmp_verbosity.hrl").
+
+-record(tab, {id}).
+
+
+%% ---------------------------------------------------------------
+%% open
+%% 
+%% Open or create a mnesia table. 
+%% 
+%% Opts    - A list of implementation dependent options
+%%           mnesia_open_options() = [mnesia_open_option()]
+%%           mnesia_open_option()  = {action, keep | clear} | 
+%%                                   {nodes,  [node()]}
+%% 
+%% ---------------------------------------------------------------
+
+open(Name, RecName, Fields, Type, Opts) ->
+    ?vtrace("open ~p table ~p for record ~p",
+	    [Type, Name, RecName]),
+    Action  = get_action(Opts), 
+    Nodes   = get_nodes(Opts), 
+    case table_exists(Name) of
+	true when (Action =:= keep) -> 
+	    ?vtrace("open table ~p - exist (keep)", [Name]),
+	    {ok, #tab{id = Name}};
+	true when (Action =:= clear) -> 
+	    ?vtrace("open table ~p - exist (clear)", [Name]),
+	    F = fun() -> mnesia:clear_table(Name) end,
+	    case mnesia:transaction(F) of
+		{aborted, Reason} ->
+		    {error, {clear, Reason}};
+		{atomic, _} ->
+		    {ok, #tab{id = Name}}
+	    end;
+	false ->
+	    ?vtrace("open table ~p - does not exist", [Name]),
+	    Args = [{record_name, RecName}, 
+		    {attributes,  Fields},
+		    {type,        Type}, 
+		    {disc_copies, Nodes}],
+	    case mnesia:create_table(Name, Args) of
+		{atomic, ok} ->
+		    ?vtrace("open table ~p - ok", [Name]),
+		    {ok, #tab{id = Name}};
+		{aborted, Reason} ->
+		    ?vinfo("open table ~p - aborted"
+			   "~n   Reason: ~p", [Name, Reason]),
+		    {error, {create, Reason}}
+	    end
+    end.
+
+table_exists(Name) ->
+    case (catch mnesia:table_info(Name, type)) of
+	{'EXIT', _Reason} ->
+	    false;
+	_ ->
+	    true
+    end.
+   
+
+%% ---------------------------------------------------------------
+%% close
+%% 
+%% Close the mib-storage table. 
+%% This does nothing in the mnesia case.
+%% ---------------------------------------------------------------
+
+close(_) ->
+    ?vtrace("close mib-storage - ignore",[]),
+    ok.
+
+
+%% ---------------------------------------------------------------
+%% read
+%% 
+%% Retrieve a record from the mib-storage table.
+%% ---------------------------------------------------------------
+
+read(#tab{id = ID}, Key) ->
+    ?vtrace("read (dirty) from database ~p: ~p", [ID, Key]),
+    case (catch mnesia:dirty_read(ID, Key)) of
+	[Rec|_] -> {value,Rec};
+	_ -> false
+    end.
+    
+
+%% ---------------------------------------------------------------
+%% write
+%% 
+%% Write a record to the mib-storage table.
+%% ---------------------------------------------------------------
+
+write(#tab{id = ID}, Rec) -> 
+    ?vtrace("write to database ~p", [ID]),
+    F = fun() -> mnesia:write(ID, Rec, write) end,
+    case mnesia:transaction(F) of
+	{aborted, _Reason} = ABORTED ->
+	    {error, ABORTED};
+	{atomic,_} ->
+	    ok
+    end.
+
+
+%% ---------------------------------------------------------------
+%% delete
+%% 
+%% Delete the mib-storage table. 
+%% ---------------------------------------------------------------
+
+delete(#tab{id = ID}) ->
+    ?vtrace("delete database: ~p", [ID]),
+    mnesia:delete_table(ID).
+
+
+%% ---------------------------------------------------------------
+%% delete
+%% 
+%% Delete a record from the mib-storage table.
+%% ---------------------------------------------------------------
+
+delete(#tab{id = ID}, Key) -> 
+    ?vtrace("delete from database ~p: ~p", [ID, Key]),
+    F = fun() -> mnesia:delete(ID, Key, write) end,
+    case mnesia:transaction(F) of
+	{aborted, _Reason} = ABORTED ->
+	    {error, ABORTED};
+	{atomic, _} ->
+	    ok
+    end.
+
+
+%% ---------------------------------------------------------------
+%% match_object
+%% 
+%% Search the mib-storage table for records witch matches 
+%% the pattern.
+%% ---------------------------------------------------------------
+
+match_object(#tab{id = ID}, Pattern) ->
+    ?vtrace("match_object in ~p of ~p", [ID, Pattern]),
+    F = fun() -> mnesia:match_object(ID, Pattern, read) end,
+    case mnesia:transaction(F) of
+	{aborted, _Reason} = ABORTED ->
+	    {error, ABORTED};
+	{atomic, Rs} ->
+	    Rs
+    end.
+    
+
+%% ---------------------------------------------------------------
+%% match_delete
+%% 
+%% Search the mib-storage table for records witch matches 
+%% the pattern and deletes them from the table.
+%% ---------------------------------------------------------------
+
+match_delete(#tab{id = ID}, Pattern) -> 
+    ?vtrace("match_delete in ~p with pattern ~p", [ID, Pattern]),
+    F = fun() -> 
+		Recs = mnesia:match_object(ID, Pattern, read),
+		lists:foreach(fun(Rec) -> 
+				      mnesia:delete_object(ID, Rec, write)
+			      end, Recs),
+		Recs
+	end,
+    case mnesia:transaction(F) of
+	{aborted, _Reason} = ABORTED ->
+	    {error, ABORTED};
+	{atomic, Rs} ->
+	    Rs
+    end.
+
+
+%% ---------------------------------------------------------------
+%% tab2list
+%% 
+%% Return all records in the mib-storage table in the form of 
+%% a list.
+%% ---------------------------------------------------------------
+
+tab2list(#tab{id = ID} = Tab) ->
+    ?vtrace("tab2list -> list of ~p", [ID]),
+    match_object(Tab, mnesia:table_info(ID, wild_pattern)).
+
+
+%% ---------------------------------------------------------------
+%% info
+%% 
+%% Retrieve implementation dependent mib-storage table 
+%% information.
+%% ---------------------------------------------------------------
+
+info(#tab{id = ID}) ->
+    case (catch mnesia:table_info(ID, all)) of
+	Info when is_list(Info) ->
+	    Info;
+	{'EXIT', {aborted, Reason}} ->
+	    {error, Reason}
+    end.
+
+
+info(#tab{id = ID}, Item) ->
+    mnesia:table_info(ID, Item).
+
+
+%% ---------------------------------------------------------------
+%% sync
+%% 
+%% Ignore
+%% ---------------------------------------------------------------
+
+sync(_) ->
+    ok.
+
+
+%% ---------------------------------------------------------------
+%% backup
+%% 
+%% Ignore. Mnesia handles its own backups. 
+%% ---------------------------------------------------------------
+
+backup(_, _) ->
+    ok.
+
+	      
+%%----------------------------------------------------------------------
+
+get_action(Opts) ->
+    snmp_misc:get_option(action, Opts, keep). 
+
+get_nodes(Opts) ->
+    case snmp_misc:get_option(nodes, Opts, erlang:nodes()) of
+	[] ->
+	    [node()];
+	Nodes when is_list(Nodes) ->
+	    Nodes;
+	all ->
+	    erlang:nodes();
+	visible ->
+	    erlang:nodes(visible);
+	connected ->
+	    erlang:nodes(connected);
+	db_nodes -> 
+	    try mnesia:system_info(db_nodes) of
+		DbNodes when is_list(DbNodes) ->
+		    DbNodes;
+		_ ->
+		    erlang:nodes()
+	    catch 
+		_:_ ->
+		    erlang:nodes()
+	    end
+    end.
+	    
+%% user_err(F, A) ->
+%%     snmpa_error:user_err(F, A).
diff --git a/lib/snmp/src/agent/snmpa_supervisor.erl b/lib/snmp/src/agent/snmpa_supervisor.erl
index 886fd074bc..aebcdbaa84 100644
--- a/lib/snmp/src/agent/snmpa_supervisor.erl
+++ b/lib/snmp/src/agent/snmpa_supervisor.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -224,26 +224,101 @@ init([AgentType, Opts]) ->
     ets:insert(snmp_agent_table, {error_report_mod, ErrorReportMod}),
 
     %% -- mib storage --
+    %% MibStorage has only one mandatory part: module
+    %% Everything else is module dependent and therefor 
+    %% put in a special option: options
     MibStorage = 
-	case get_opt(mib_storage, Opts, ets) of
+	case get_opt(mib_storage, Opts, [{module, snmpa_mib_storage_ets}]) of
+
+	    %% --- ETS wrappers ---
+
+	    ets ->
+		[{module, snmpa_mib_storage_ets}];
+	    {ets, default} ->
+		[{module,  snmpa_mib_storage_ets}, 
+		 {options, [{dir,    filename:join([DbDir])}, 
+			    {action, keep}]}];
+	    {ets, Dir} when is_list(Dir) ->
+		[{module,  snmpa_mib_storage_ets}, 
+		 {options, [{dir,    filename:join([Dir])}, 
+			    {action, keep}]}];
+	    {ets, default, Action} when ((Action =:= keep) orelse 
+					 (Action =:= clear)) ->
+		[{module,  snmpa_mib_storage_ets}, 
+		 {options, [{dir,    filename:join([DbDir])}, 
+			    {action, Action}]}];
+	    {ets, Dir, Action} when is_list(Dir) andalso 
+				    ((Action =:= keep) orelse 
+				     (Action =:= clear)) ->
+		[{module,  snmpa_mib_storage_ets}, 
+		 {options, [{dir,    filename:join([Dir])}, 
+			    {action, Action}]}];
+
+	    %% --- DETS wrappers ---
+
 	    dets ->
-		{dets, DbDir};
+		[{module,  snmpa_mib_storage_dets}, 
+		 {options, [{dir,    filename:join([DbDir])}, 
+			    {action, keep}]}];
 	    {dets, default} ->
-		{dets, DbDir};
-	    {dets, default, Act} ->
-		{dets, DbDir, Act};
-	    {ets, default} ->
-		{ets, DbDir};
+		[{module,  snmpa_mib_storage_dets}, 
+		 {options, [{dir,    filename:join([DbDir])}, 
+			    {action, keep}]}];
+	    {dets, default, Action} when ((Action =:= keep) orelse 
+					  (Action =:= clear)) ->
+		[{module,  snmpa_mib_storage_dets}, 
+		 {options, [{dir,    filename:join([DbDir])}, 
+			    {action, Action}]}];
+	    {dets, Dir, Action} when is_list(Dir) andalso 
+				     ((Action =:= keep) orelse 
+				      (Action =:= clear)) ->
+		[{module,  snmpa_mib_storage_dets}, 
+		 {options, [{dir,    filename:join([Dir])}, 
+			    {action, Action}]}];
+
+	    %% --- Mnesia wrappers ---
+
 	    mnesia ->
-		{mnesia, erlang:nodes()};
-	    {mnesia, visible} ->
-		{mnesia, erlang:nodes(visible)};
-	    {mnesia, connected} ->
-		{mnesia, erlang:nodes(connected)};
-	    Other ->
+		[{module,  snmpa_mib_storage_mnesia}, 
+		 {options, [{nodes,  erlang:nodes()}, 
+			    {action, keep}]}];
+	    {mnesia, Nodes0} ->
+		Nodes = 
+		    if
+			Nodes0 =:= visible ->
+			    erlang:nodes(visible);
+			Nodes0 =:= connected ->
+			    erlang:nodes(connected);
+			Nodes0 =:= [] ->
+			    [node()];
+			true ->
+			    Nodes0
+		    end,
+		[{module, snmpa_mib_storage_mnesia}, 
+		 {options, [{nodes,  Nodes}, 
+			    {action, keep}]}];
+	    {mnesia, Nodes0, Action} when ((Action =:= keep) orelse 
+					   (Action =:= clear)) ->
+		Nodes = 
+		    if
+			Nodes0 =:= visible ->
+			    erlang:nodes(visible);
+			Nodes0 =:= connected ->
+			    erlang:nodes(connected);
+			Nodes0 =:= [] ->
+			    [node()];
+			true ->
+			    Nodes0
+		    end,
+		[{module,  snmpa_mib_storage_mnesia}, 
+		 {options, [{nodes,  Nodes}, 
+			    {action, Action}]}];
+
+	    Other when is_list(Other) ->
 		Other
 	end,
-    ?vdebug("[agent table] store mib storage: ~w",[MibStorage]),
+
+    ?vdebug("[agent table] store mib storage: ~w", [MibStorage]),
     ets:insert(snmp_agent_table, {mib_storage, MibStorage}),
 
     %% -- Agent mib storage --
@@ -388,7 +463,7 @@ init([AgentType, Opts]) ->
 		     
 		AgentSpec =
 		    worker_spec(snmpa_agent, 
-				[Prio,snmp_master_agent,none,Ref,AgentOpts],
+				[Prio, snmp_master_agent, none, Ref, AgentOpts],
 				Restart, 15000),
 		AgentSupSpec = 
 		    sup_spec(snmpa_agent_sup, [AgentSpec], 
diff --git a/lib/snmp/src/agent/snmpa_symbolic_store.erl b/lib/snmp/src/agent/snmpa_symbolic_store.erl
index 6c58ffde41..00178f4bcd 100644
--- a/lib/snmp/src/agent/snmpa_symbolic_store.erl
+++ b/lib/snmp/src/agent/snmpa_symbolic_store.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -78,7 +78,7 @@
         gen_server:start_link({local, ?SERVER}, ?MODULE, [Prio, Opts], [])).
 -endif.
   
--record(state,  {db, backup}).
+-record(state,  {module, db, backup}).
 -record(symbol, {key, mib_name, info}).
 
 
@@ -112,6 +112,9 @@ backup(BackupDir) ->
 get_db() ->
     call(get_db).
 
+which_module() ->
+    call(which_module).
+
 
 %%----------------------------------------------------------------------
 %% Returns: {value, Oid} | false
@@ -202,49 +205,63 @@ verbosity(Verbosity) ->
 %%----------------------------------------------------------------------
 %% DB access (read) functions: Returns: {value, Oid} | false
 %%----------------------------------------------------------------------
+
 aliasname_to_oid(Db, Aliasname) ->
-    case snmpa_general_db:read(Db, {alias, Aliasname}) of
+    Mod = which_module(), 
+    aliasname_to_oid(Mod, Db, Aliasname).
+
+aliasname_to_oid(Mod, Db, Aliasname) ->
+    case Mod:read(Db, {alias, Aliasname}) of
 	{value,#symbol{info = {Oid, _Enums}}} -> {value, Oid};
 	false -> false
     end.
 
-oid_to_aliasname(Db,Oid) ->
-    case snmpa_general_db:read(Db, {oid, Oid}) of
+oid_to_aliasname(Db, Oid) ->
+    Mod = which_module(), 
+    oid_to_aliasname(Mod, Db, Oid).
+
+oid_to_aliasname(Mod, Db, Oid) ->
+    case Mod:read(Db, {oid, Oid}) of
 	{value,#symbol{info = Aliasname}} -> {value, Aliasname};
 	_ -> false
     end.
 
-which_notifications(Db) ->
+which_notifications(Mod, Db) ->
     Pattern = #symbol{key = {trap, '_'}, _ = '_'},
-    Symbols = snmpa_general_db:match_object(Db, Pattern),
+    Symbols = Mod:match_object(Db, Pattern),
     [{Name, Mib, Rec} || #symbol{key      = {trap, Name}, 
 				 mib_name = Mib, 
 				 info     = Rec} <- Symbols].
 
-which_aliasnames(Db) ->
+which_aliasnames(Mod, Db) ->
     Pattern = #symbol{key = {alias, '_'}, _ = '_'},
-    Symbols = snmpa_general_db:match_object(Db, Pattern),
+    Symbols = Mod:match_object(Db, Pattern),
     [Alias || #symbol{key = {alias, Alias}} <- Symbols].
 
-which_tables(Db) ->
+which_tables(Mod, Db) ->
     Pattern = #symbol{key = {table_info, '_'}, _ = '_'},
-    Symbols = snmpa_general_db:match_object(Db, Pattern),
+    Symbols = Mod:match_object(Db, Pattern),
     [Name || #symbol{key = {table_info, Name}} <- Symbols].
 
-which_variables(Db) ->
+which_variables(Mod, Db) ->
     Pattern = #symbol{key = {variable_info, '_'}, _ = '_'},
-    Symbols = snmpa_general_db:match_object(Db, Pattern),
+    Symbols = Mod:match_object(Db, Pattern),
     [Name || #symbol{key = {variable_info, Name}} <- Symbols].
 
-int_to_enum(Db,TypeOrObjName,Int) ->
-    case snmpa_general_db:read(Db, {alias, TypeOrObjName}) of
+
+int_to_enum(Db, TypeOrObjName, Int) ->
+    Mod = which_module(), 
+    int_to_enum(Mod, Db, TypeOrObjName, Int).
+
+int_to_enum(Mod, Db, TypeOrObjName, Int) ->
+    case Mod:read(Db, {alias, TypeOrObjName}) of
 	{value,#symbol{info = {_Oid, Enums}}} ->
 	    case lists:keysearch(Int, 2, Enums) of
 		{value, {Enum, _Int}} -> {value, Enum};
 		false -> false
 	    end;
 	false -> % Not an Aliasname ->
-	    case snmpa_general_db:read(Db, {type, TypeOrObjName}) of
+	    case Mod:read(Db, {type, TypeOrObjName}) of
 		{value,#symbol{info = Enums}} ->
 		    case lists:keysearch(Int, 2, Enums) of
 			{value, {Enum, _Int}} -> {value, Enum};
@@ -256,14 +273,18 @@ int_to_enum(Db,TypeOrObjName,Int) ->
     end.
 
 enum_to_int(Db, TypeOrObjName, Enum) ->
-    case snmpa_general_db:read(Db, {alias, TypeOrObjName}) of
+    Mod = which_module(), 
+    enum_to_int(Mod, Db, TypeOrObjName, Enum).
+
+enum_to_int(Mod, Db, TypeOrObjName, Enum) ->
+    case Mod:read(Db, {alias, TypeOrObjName}) of
 	{value,#symbol{info = {_Oid, Enums}}} ->
 	    case lists:keysearch(Enum, 1, Enums) of
 		{value, {_Enum, Int}} -> {value, Int};
 		false -> false
 	    end;
 	false -> % Not an Aliasname
-	    case snmpa_general_db:read(Db, {type, TypeOrObjName}) of
+	    case Mod:read(Db, {type, TypeOrObjName}) of
 		{value,#symbol{info = Enums}} ->
 		    case lists:keysearch(Enum, 1, Enums) of
 			{value, {_Enum, Int}} -> {value, Int};
@@ -278,8 +299,9 @@ enum_to_int(Db, TypeOrObjName, Enum) ->
 %%----------------------------------------------------------------------
 %% DB access (read) functions: Returns: false|{value, Info}
 %%----------------------------------------------------------------------
-table_info(Db,TableName) ->
-    case snmpa_general_db:read(Db, {table_info, TableName}) of
+
+table_info(Mod, Db, TableName) ->
+    case Mod:read(Db, {table_info, TableName}) of
 	{value,#symbol{info = Info}} -> {value, Info};
 	false -> false
     end.
@@ -288,8 +310,8 @@ table_info(Db,TableName) ->
 %%----------------------------------------------------------------------
 %% DB access (read) functions: Returns: false|{value, Info}
 %%----------------------------------------------------------------------
-variable_info(Db,VariableName) ->
-    case snmpa_general_db:read(Db, {variable_info, VariableName}) of
+variable_info(Mod, Db, VariableName) ->
+    case Mod:read(Db, {variable_info, VariableName}) of
 	{value,#symbol{info = Info}} -> {value, Info};
 	false -> false
     end.
@@ -299,7 +321,7 @@ variable_info(Db,VariableName) ->
 %% Implementation
 %%----------------------------------------------------------------------
 
-init([Prio,Opts]) ->
+init([Prio, Opts]) ->
     ?d("init -> entry with"
 	"~n   Prio: ~p"
 	"~n   Opts: ~p", [Prio,Opts]),
@@ -317,102 +339,125 @@ do_init(Prio, Opts) ->
     put(sname,ss),
     put(verbosity,get_verbosity(Opts)),
     ?vlog("starting",[]),
-    Storage = get_mib_storage(Opts),
+    MibStorage = get_mib_storage(Opts),
+    Mod        = snmp_misc:get_option(module,  MibStorage), 
+    MsOpts     = snmp_misc:get_option(options, MibStorage, []), 
+    
     %% type = bag solves the problem with import and multiple
     %% object/type definitions.
-    Db = snmpa_general_db:open(Storage, snmpa_symbolic_store,
-			       symbol, record_info(fields,symbol), bag),
-    S  = #state{db = Db},
-    ?vdebug("started",[]),
-    {ok, S}.
+    case Mod:open(?MODULE, symbol, record_info(fields, symbol), bag, MsOpts) of
+	{ok, Db} ->
+	    S  = #state{module = Mod, db = Db},
+	    ?vdebug("started",[]),
+	    {ok, S};
+	{error, _} = ERROR ->
+	    ERROR
+    end.
 
 
 handle_call(get_db, _From, #state{db = DB} = S) ->
     ?vlog("get db",[]),
     {reply, DB, S};
 
-handle_call({table_info, TableName}, _From, #state{db = DB} = S) ->
+handle_call(which_module, _From, #state{module = Mod} = S) ->
+    ?vlog("which module",[]),
+    {reply, Mod, S};
+
+handle_call({table_info, TableName}, _From, 
+	    #state{module = Mod, db = DB} = S) ->
     ?vlog("table info: ~p",[TableName]),
-    Res = table_info(DB, TableName),
+    Res = table_info(Mod, DB, TableName),
     ?vdebug("table info result: ~p",[Res]),
     {reply, Res, S};
 
-handle_call({variable_info, VariableName}, _From, #state{db = DB} = S) ->
+handle_call({variable_info, VariableName}, _From, 
+	    #state{module = Mod, db = DB} = S) ->
     ?vlog("variable info: ~p",[VariableName]),
-    Res = variable_info(DB, VariableName),
+    Res = variable_info(Mod, DB, VariableName),
     ?vdebug("variable info result: ~p",[Res]),
     {reply, Res, S};
 
-handle_call({aliasname_to_oid, Aliasname}, _From, #state{db = DB} = S) ->
+handle_call({aliasname_to_oid, Aliasname}, _From, 
+	    #state{module = Mod, db = DB} = S) ->
     ?vlog("aliasname to oid: ~p",[Aliasname]),
-    Res = aliasname_to_oid(DB,Aliasname),
+    Res = aliasname_to_oid(Mod, DB, Aliasname),
     ?vdebug("aliasname to oid result: ~p",[Res]),
     {reply, Res, S};
 
-handle_call({oid_to_aliasname, Oid}, _From, #state{db = DB} = S) ->
+handle_call({oid_to_aliasname, Oid}, _From, 
+	    #state{module = Mod, db = DB} = S) ->
     ?vlog("oid to aliasname: ~p",[Oid]),
-    Res = oid_to_aliasname(DB, Oid),
+    Res = oid_to_aliasname(Mod, DB, Oid),
     ?vdebug("oid to aliasname result: ~p",[Res]),
     {reply, Res, S};
 
-handle_call(which_aliasnames, _From, #state{db = DB} = S) ->
+handle_call(which_aliasnames, _From, 
+	    #state{module = Mod, db = DB} = S) ->
     ?vlog("which aliasnames",[]),
-    Res = which_aliasnames(DB),
+    Res = which_aliasnames(Mod, DB),
     ?vdebug("which aliasnames: ~p",[Res]),
     {reply, Res, S};
 
-handle_call(which_tables, _From, #state{db = DB} = S) ->
+handle_call(which_tables, _From, 
+	    #state{module = Mod, db = DB} = S) ->
     ?vlog("which tables",[]),
-    Res = which_tables(DB),
+    Res = which_tables(Mod, DB),
     ?vdebug("which tables: ~p",[Res]),
     {reply, Res, S};
 
-handle_call(which_variables, _From, #state{db = DB} = S) ->
+handle_call(which_variables, _From, 
+	    #state{module = Mod, db = DB} = S) ->
     ?vlog("which variables",[]),
-    Res = which_variables(DB),
+    Res = which_variables(Mod, DB),
     ?vdebug("which variables: ~p",[Res]),
     {reply, Res, S};
 
-handle_call({enum_to_int, TypeOrObjName, Enum}, _From, #state{db = DB} = S) ->
+handle_call({enum_to_int, TypeOrObjName, Enum}, _From, 
+	    #state{module = Mod, db = DB} = S) ->
     ?vlog("enum to int: ~p, ~p",[TypeOrObjName,Enum]),
-    Res = enum_to_int(DB, TypeOrObjName, Enum),
+    Res = enum_to_int(Mod, DB, TypeOrObjName, Enum),
     ?vdebug("enum to int result: ~p",[Res]),
     {reply, Res, S};
 
-handle_call({int_to_enum, TypeOrObjName, Int}, _From, #state{db = DB} = S) ->
+handle_call({int_to_enum, TypeOrObjName, Int}, _From, 
+	    #state{module = Mod, db = DB} = S) ->
     ?vlog("int to enum: ~p, ~p",[TypeOrObjName,Int]),
-    Res = int_to_enum(DB, TypeOrObjName, Int),
+    Res = int_to_enum(Mod, DB, TypeOrObjName, Int),
     ?vdebug("int to enum result: ~p",[Res]),
     {reply, Res, S};
 
-handle_call({set_notification, MibName, Trap}, _From, #state{db = DB} = S) ->
+handle_call({set_notification, MibName, Trap}, _From, 
+	    #state{module = Mod, db = DB} = S) ->
     ?vlog("set notification:"
 	  "~n   ~p~n   ~p", [MibName,Trap]),
-    set_notif(DB, MibName, Trap),
+    set_notif(Mod, DB, MibName, Trap),
     {reply, true, S};
 
-handle_call({delete_notifications, MibName}, _From, #state{db = DB} = S) ->
+handle_call({delete_notifications, MibName}, _From, 
+	    #state{module = Mod, db = DB} = S) ->
     ?vlog("delete notification: ~p",[MibName]),
-    delete_notif(DB, MibName),
+    delete_notif(Mod, DB, MibName),
     {reply, true, S};
 
-handle_call(which_notifications, _From, #state{db = DB} = S) ->
+handle_call(which_notifications, _From, 
+	    #state{module = Mod, db = DB} = S) ->
     ?vlog("which notifications", []),
-    Reply = which_notifications(DB), 
+    Reply = which_notifications(Mod, DB), 
     {reply, Reply, S};
 
-handle_call({get_notification, Key}, _From, #state{db = DB} = S) ->
+handle_call({get_notification, Key}, _From, 
+	    #state{module = Mod, db = DB} = S) ->
     ?vlog("get notification: ~p",[Key]),
-    Res = get_notif(DB, Key),
+    Res = get_notif(Mod, DB, Key),
     ?vdebug("get notification result: ~p",[Res]),
     {reply, Res, S};
 
-handle_call(info, _From, #state{db = DB} = S) ->
+handle_call(info, _From, #state{module = Mod, db = DB} = S) ->
     ?vlog("info",[]),
-    Info = get_info(DB), 
+    Info = get_info(Mod, DB), 
     {reply, Info, S};
 
-handle_call({backup, BackupDir}, From, #state{db = DB} = S) ->
+handle_call({backup, BackupDir}, From, #state{module = Mod, db = DB} = S) ->
     ?vlog("info to ~p",[BackupDir]),
     Pid = self(),
     V   = get(verbosity),
@@ -424,7 +469,7 @@ handle_call({backup, BackupDir}, From, #state{db = DB} = S) ->
 			  put(sname, albs),
 			  put(verbosity, V),
 			  Dir   = filename:join([BackupDir]), 
-			  Reply = snmpa_general_db:backup(DB, Dir),
+			  Reply = Mod:backup(DB, Dir),
 			  Pid ! {backup_done, Reply},
 			  unlink(Pid)
 		  end),	
@@ -446,7 +491,7 @@ handle_call(Req, _From, S) ->
     {reply, Reply, S}.
 
 
-handle_cast({add_types, MibName, Types}, #state{db = DB} = S) ->
+handle_cast({add_types, MibName, Types}, #state{module = Mod, db = DB} = S) ->
     ?vlog("add types for ~p:",[MibName]),
     F = fun(#asn1_type{assocList = Alist, aliasname = Name}) ->
 		case snmp_misc:assq(enums, Alist) of
@@ -455,20 +500,21 @@ handle_cast({add_types, MibName, Types}, #state{db = DB} = S) ->
 			Rec = #symbol{key      = {type, Name}, 
 				      mib_name = MibName, 
 				      info     = Es},
-			snmpa_general_db:write(DB, Rec);
+			Mod:write(DB, Rec);
 		    false -> done
 		end
 	end,
     lists:foreach(F, Types),
     {noreply, S};
 
-handle_cast({delete_types, MibName}, #state{db = DB} = S) ->
+handle_cast({delete_types, MibName}, #state{module = Mod, db = DB} = S) ->
     ?vlog("delete types: ~p",[MibName]),
     Pattern = #symbol{key = {type, '_'}, mib_name = MibName, info = '_'},
-    snmpa_general_db:match_delete(DB, Pattern),
+    Mod:match_delete(DB, Pattern),
     {noreply, S};
 
-handle_cast({add_aliasnames, MibName, MEs}, #state{db = DB} = S) ->
+handle_cast({add_aliasnames, MibName, MEs}, 
+	    #state{module = Mod, db = DB} = S) ->
     ?vlog("add aliasnames for ~p:",[MibName]),
     F = fun(#me{aliasname = AN, oid = Oid, asn1_type = AT}) ->
 		Enums =
@@ -480,20 +526,21 @@ handle_cast({add_aliasnames, MibName, MEs}, #state{db = DB} = S) ->
 			    end;
 			_ -> []
 		    end,
-		write_alias(AN, DB, Enums, MibName, Oid)
+		write_alias(Mod, AN, DB, Enums, MibName, Oid)
 	end,
     lists:foreach(F, MEs),
     {noreply, S};
 
-handle_cast({delete_aliasname, MibName}, #state{db = DB} = S) ->
+handle_cast({delete_aliasname, MibName}, #state{module = Mod, db = DB} = S) ->
     ?vlog("delete aliasname: ~p",[MibName]),
     Pattern1 = #symbol{key = {alias, '_'}, mib_name = MibName, info = '_'},
-    snmpa_general_db:match_delete(DB, Pattern1),
+    Mod:match_delete(DB, Pattern1),
     Pattern2 = #symbol{key = {oid, '_'}, mib_name = MibName, info = '_'},
-    snmpa_general_db:match_delete(DB, Pattern2),
+    Mod:match_delete(DB, Pattern2),
     {noreply, S};
 
-handle_cast({add_table_infos, MibName, TableInfos}, #state{db = DB} = S) ->
+handle_cast({add_table_infos, MibName, TableInfos}, 
+	    #state{module = Mod, db = DB} = S) ->
     ?vlog("add table infos for ~p:",[MibName]),
     F = fun({Name, TableInfo}) ->
 		?vlog("add table info~n   ~p -> ~p",
@@ -501,19 +548,20 @@ handle_cast({add_table_infos, MibName, TableInfos}, #state{db = DB} = S) ->
 		Rec = #symbol{key      = {table_info, Name}, 
 			      mib_name = MibName, 
 			      info     = TableInfo},
-		snmpa_general_db:write(DB, Rec)
+		Mod:write(DB, Rec)
 	end,
     lists:foreach(F, TableInfos),
     {noreply, S};
 
-handle_cast({delete_table_infos, MibName}, #state{db = DB} = S) ->
+handle_cast({delete_table_infos, MibName}, 
+	    #state{module = Mod, db = DB} = S) ->
     ?vlog("delete table infos: ~p",[MibName]),
     Pattern = #symbol{key = {table_info, '_'}, mib_name = MibName, info = '_'},
-    snmpa_general_db:match_delete(DB, Pattern),
+    Mod:match_delete(DB, Pattern),
     {noreply, S};
 
 handle_cast({add_variable_infos, MibName, VariableInfos}, 
-	    #state{db = DB} = S) ->
+	    #state{module = Mod, db = DB} = S) ->
     ?vlog("add variable infos for ~p:",[MibName]),
     F = fun({Name, VariableInfo}) ->
 		?vlog("add variable info~n   ~p -> ~p",
@@ -521,17 +569,18 @@ handle_cast({add_variable_infos, MibName, VariableInfos},
 		Rec = #symbol{key      = {variable_info, Name},
 			      mib_name = MibName,
 			      info     = VariableInfo},
-		snmpa_general_db:write(DB, Rec)
+		Mod:write(DB, Rec)
 	end,
     lists:foreach(F, VariableInfos),
     {noreply, S};
 
-handle_cast({delete_variable_infos, MibName}, #state{db = DB} = S) ->
+handle_cast({delete_variable_infos, MibName}, 
+	    #state{module = Mod, db = DB} = S) ->
     ?vlog("delete variable infos: ~p",[MibName]),
     Pattern = #symbol{key      = {variable_info,'_'}, 
 		      mib_name = MibName, 
 		      info     = '_'},
-    snmpa_general_db:match_delete(DB, Pattern),
+    Mod:match_delete(DB, Pattern),
     {noreply, S};
 
 handle_cast({verbosity,Verbosity}, State) ->
@@ -565,9 +614,9 @@ handle_info(Info, S) ->
     {noreply, S}.
 
 
-terminate(Reason, S) ->
-    ?vlog("terminate: ~p",[Reason]),
-    snmpa_general_db:close(S#state.db).
+terminate(Reason, #state{module = Mod, db = DB}) ->
+    ?vlog("terminate: ~p", [Reason]),
+    Mod:close(DB).
 
 
 %%----------------------------------------------------------
@@ -575,18 +624,18 @@ terminate(Reason, S) ->
 %%----------------------------------------------------------
 
 % downgrade
-code_change({down, _Vsn}, #state{db = DB, backup = B}, downgrade_to_pre_4_7) ->
-    ?d("code_change(down) -> entry", []),
-    stop_backup_server(B),
-    S = {state, DB},
-    {ok, S};
-
-% upgrade
-code_change(_Vsn, S, upgrade_from_pre_4_7) ->
-    ?d("code_change(up) -> entry", []),
-    {state, DB} = S,
-    S1 = #state{db = DB},
-    {ok, S1};
+%% code_change({down, _Vsn}, #state{db = DB, backup = B}, downgrade_to_pre_4_7) ->
+%%     ?d("code_change(down) -> entry", []),
+%%     stop_backup_server(B),
+%%     S = {state, DB},
+%%     {ok, S};
+
+%% % upgrade
+%% code_change(_Vsn, S, upgrade_from_pre_4_7) ->
+%%     ?d("code_change(up) -> entry", []),
+%%     {state, DB} = S,
+%%     S1 = #state{db = DB},
+%%     {ok, S1};
 
 code_change(_Vsn, S, _Extra) ->
     ?d("code_change -> entry [do nothing]", []),
@@ -609,13 +658,13 @@ stop_backup_server({Pid, _}) when is_pid(Pid) ->
 %%-----------------------------------------------------------------
 %% Returns: {value, Value} | undefined
 %%-----------------------------------------------------------------
-get_notif(Db, Key) ->
-    case snmpa_general_db:read(Db, {trap, Key}) of
+get_notif(Mod, Db, Key) ->
+    case Mod:read(Db, {trap, Key}) of
 	{value,#symbol{info = Value}} -> {value, Value};
 	false -> undefined
     end.
 
-set_notif(Db, MibName, Trap) when is_record(Trap, trap) ->
+set_notif(Mod, Db, MibName, Trap) when is_record(Trap, trap) ->
     #trap{trapname = Name} = Trap,
     Rec = #symbol{key = {trap, Name}, mib_name = MibName, info = Trap},
     %% convert old v1 trap to oid
@@ -625,40 +674,41 @@ set_notif(Db, MibName, Trap) when is_record(Trap, trap) ->
 	      Oid0 ->
 		  Oid0 ++ [0, Trap#trap.specificcode]
 	  end,
-    write_alias(Name, Db, MibName, Oid),
-    snmpa_general_db:write(Db, Rec);
-set_notif(Db, MibName, Trap) ->
+    write_alias(Mod, Name, Db, MibName, Oid),
+    Mod:write(Db, Rec);
+set_notif(Mod, Db, MibName, Trap) ->
     #notification{trapname = Name, oid = Oid} = Trap,
     Rec = #symbol{key = {trap, Name}, mib_name = MibName, info = Trap},
-    write_alias(Name, Db, MibName, Oid),
-    snmpa_general_db:write(Db, Rec).
+    write_alias(Mod, Name, Db, MibName, Oid),
+    Mod:write(Db, Rec).
 
-delete_notif(Db, MibName) ->
+delete_notif(Mod, Db, MibName) ->
     Pattern = #symbol{key = {trap, '_'}, mib_name = MibName, info = '_'},
-    snmpa_general_db:match_delete(Db, Pattern).
+    Mod:match_delete(Db, Pattern).
 
 
-write_alias(AN, DB, MibName, Oid) ->
-    write_alias(AN, DB, [], MibName, Oid).
+write_alias(Mod, AN, DB, MibName, Oid) ->
+    write_alias(Mod, AN, DB, [], MibName, Oid).
 
-write_alias(AN, DB, Enums, MibName, Oid) ->
+write_alias(Mod, AN, DB, Enums, MibName, Oid) ->
     ?vlog("add alias~n   ~p -> {~p,~p}",[AN, Oid, Enums]),
     Rec1 = #symbol{key      = {alias, AN}, 
 		   mib_name = MibName, 
 		   info     = {Oid,Enums}},
-    snmpa_general_db:write(DB, Rec1),
+    Mod:write(DB, Rec1),
     ?vlog("add oid~n   ~p -> ~p",[Oid, AN]),
     Rec2 = #symbol{key      = {oid, Oid}, 
 		   mib_name = MibName, 
 		   info     = AN},
-    snmpa_general_db:write(DB, Rec2).
+    Mod:write(DB, Rec2).
+
 
 %% -------------------------------------
 
-get_info(DB) ->
+get_info(Mod, DB) ->
     ProcSize = proc_mem(self()),
-    DbSz     = tab_size(DB),
-    [{process_memory, ProcSize}, {db_memory, DbSz}].
+    DbMemory = Mod:info(DB, memory), 
+    [{process_memory, ProcSize}, {db_memory, DbMemory}].
 
 proc_mem(P) when is_pid(P) ->
     case (catch erlang:process_info(P, memory)) of
@@ -667,26 +717,15 @@ proc_mem(P) when is_pid(P) ->
 	_ ->
 	    undefined
     end.
-%% proc_mem(_) ->
-%%     undefined.
-
-tab_size(DB) ->
-    case (catch snmpa_general_db:info(DB, memory)) of
-        Sz when is_integer(Sz) ->
-            Sz;
-        _ ->
-            undefined
-    end.
-
 
 
 %% -------------------------------------
 
 get_verbosity(L) -> 
-    snmp_misc:get_option(verbosity,L,?default_verbosity).
+    snmp_misc:get_option(verbosity, L, ?default_verbosity).
 
 get_mib_storage(L) -> 
-    snmp_misc:get_option(mib_storage,L,ets).
+    snmp_misc:get_option(mib_storage, L).
 
 
 %% -------------------------------------
diff --git a/lib/snmp/src/app/snmp.app.src b/lib/snmp/src/app/snmp.app.src
index b11c1ef934..904d17954b 100644
--- a/lib/snmp/src/app/snmp.app.src
+++ b/lib/snmp/src/app/snmp.app.src
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -48,11 +48,15 @@
              snmpa_error_io,
              snmpa_error_logger,
              snmpa_error_report,
-             snmpa_general_db,
              snmpa_local_db,
              snmpa_mib,
              snmpa_mib_data,
+             snmpa_mib_data_tttn,
              snmpa_mib_lib,
+             snmpa_mib_storage,
+             snmpa_mib_storage_ets,
+             snmpa_mib_storage_dets,
+             snmpa_mib_storage_mnesia,
              snmpa_misc_sup,
              snmpa_mpd,
              snmpa_net_if,
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 4c5f14da90..7ffa4a725d 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -22,19 +22,15 @@
 %% ----- U p g r a d e -------------------------------------------------------
 
  [
-  {"4.23", 
-   [
-   ]
-  }
+  {"4.23.1", [{restart_application, snmp}]}, 
+  {"4.23",   [{restart_application, snmp}]}
  ], 
 
 %% ------D o w n g r a d e ---------------------------------------------------
 
  [
-  {"4.23", 
-   [
-   ]
-  } 
+  {"4.23.1", [{restart_application, snmp}]}, 
+  {"4.23",   [{restart_application, snmp}]}
  ]
 
 }.
diff --git a/lib/snmp/src/app/snmp.erl b/lib/snmp/src/app/snmp.erl
index cd3e3a0055..1bb562654a 100644
--- a/lib/snmp/src/app/snmp.erl
+++ b/lib/snmp/src/app/snmp.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -90,6 +90,13 @@
 
 	]).
 
+-export_type([
+	      oid/0,
+ 
+	      void/0
+	     ]).
+
+
 %% This is for XREF
 -deprecated([{c,                     1, eventually},
 	     {c,                     2, eventually},
@@ -143,6 +150,15 @@
 -define(APPLICATION, snmp).
 
 
+
+%%-----------------------------------------------------------------
+%% Types
+%%-----------------------------------------------------------------
+
+-type oid()  :: [non_neg_integer()].
+-type void() :: term().
+
+
 %%-----------------------------------------------------------------
 %% Application
 %%-----------------------------------------------------------------
diff --git a/lib/snmp/src/app/snmp_app.erl b/lib/snmp/src/app/snmp_app.erl
index deb42cc373..0cfbb22a5a 100644
--- a/lib/snmp/src/app/snmp_app.erl
+++ b/lib/snmp/src/app/snmp_app.erl
@@ -62,17 +62,17 @@ entities([], []) ->
 	    ?d("entities -> converted config: ~n~p", [Conf]),
 	    [{agent, Conf}]
     end;
-entities([], E) ->
+entities([], Acc) ->
     ?d("entities -> done", []),
-    lists:reverse(E);
-entities([ET|ETs], E) ->
+    lists:reverse(Acc);
+entities([Ent|Ents], Acc) ->
     ?d("entities -> entry with"
-       "~n   ET: ~p", [ET]),
-    case application:get_env(snmp, ET) of
+       "~n   Ent: ~p", [Ent]),
+    case application:get_env(snmp, Ent) of
 	{ok, Conf} ->
-	    entities(ETs, [{ET, Conf}|E]);
+	    entities(Ents, [{Ent, Conf}|Acc]);
 	_ ->
-	    entities(ETs, E)
+	    entities(Ents, Acc)
     end.
 	
 start_entities(_Type, []) ->
diff --git a/lib/snmp/src/manager/snmpm_config.erl b/lib/snmp/src/manager/snmpm_config.erl
index 5bbf9e5542..9d687f1d31 100644
--- a/lib/snmp/src/manager/snmpm_config.erl
+++ b/lib/snmp/src/manager/snmpm_config.erl
@@ -2028,7 +2028,7 @@ verify_usm_user_auth(usmNoAuthProtocol, AuthKey) ->
     end;
 verify_usm_user_auth(usmHMACMD5AuthProtocol, AuthKey) 
   when is_list(AuthKey) andalso (length(AuthKey) =:= 16) ->
-    case is_crypto_supported(md5_mac_96) of
+    case is_crypto_supported(md5) of
 	true -> 
 	    case snmp_conf:all_integer(AuthKey) of
 		true ->
@@ -2037,7 +2037,7 @@ verify_usm_user_auth(usmHMACMD5AuthProtocol, AuthKey)
 		    error({invalid_auth_key, usmHMACMD5AuthProtocol})
 	    end;
 	false -> 
-	    error({unsupported_crypto, md5_mac_96})
+	    error({unsupported_crypto, md5})
     end;    
 verify_usm_user_auth(usmHMACMD5AuthProtocol, AuthKey) when is_list(AuthKey) ->
     Len = length(AuthKey),
@@ -2046,7 +2046,7 @@ verify_usm_user_auth(usmHMACMD5AuthProtocol, _AuthKey) ->
     error({invalid_auth_key, usmHMACMD5AuthProtocol});
 verify_usm_user_auth(usmHMACSHAAuthProtocol, AuthKey) 
   when is_list(AuthKey) andalso (length(AuthKey) =:= 20) ->
-    case is_crypto_supported(sha_mac_96) of
+    case is_crypto_supported(sha) of
 	true -> 
 	    case snmp_conf:all_integer(AuthKey) of
 		true ->
@@ -2055,7 +2055,7 @@ verify_usm_user_auth(usmHMACSHAAuthProtocol, AuthKey)
 		    error({invalid_auth_key, usmHMACSHAAuthProtocol})
 	    end;
 	false -> 
-	    error({unsupported_crypto, sha_mac_96})
+	    error({unsupported_crypto, sha})
     end;
 verify_usm_user_auth(usmHMACSHAAuthProtocol, AuthKey) when is_list(AuthKey) ->
     Len = length(AuthKey),
@@ -2074,7 +2074,7 @@ verify_usm_user_priv(usmNoPrivProtocol, PrivKey) ->
     end;
 verify_usm_user_priv(usmDESPrivProtocol, PrivKey) 
   when (length(PrivKey) =:= 16) ->
-    case is_crypto_supported(des_cbc_decrypt) of
+    case is_crypto_supported(des_cbc) of
 	true -> 
 	    case snmp_conf:all_integer(PrivKey) of
 		true ->
@@ -2083,7 +2083,7 @@ verify_usm_user_priv(usmDESPrivProtocol, PrivKey)
 		    error({invalid_priv_key, usmDESPrivProtocol})
 	    end;
 	false -> 
-	    error({unsupported_crypto, des_cbc_decrypt})
+	    error({unsupported_crypto, des_cbc})
     end;
 verify_usm_user_priv(usmDESPrivProtocol, PrivKey) when is_list(PrivKey) ->
     Len = length(PrivKey),
@@ -2092,7 +2092,7 @@ verify_usm_user_priv(usmDESPrivProtocol, _PrivKey) ->
     error({invalid_priv_key, usmDESPrivProtocol});
 verify_usm_user_priv(usmAesCfb128Protocol, PrivKey) 
   when (length(PrivKey) =:= 16) ->
-    case is_crypto_supported(aes_cfb_128_decrypt) of
+    case is_crypto_supported(aes_cfb128) of
 	true -> 
 	    case snmp_conf:all_integer(PrivKey) of
 		true ->
@@ -2101,7 +2101,7 @@ verify_usm_user_priv(usmAesCfb128Protocol, PrivKey)
 		    error({invalid_priv_key, usmAesCfb128Protocol})
 	    end;
 	false -> 
-	    error({unsupported_crypto, aes_cfb_128_decrypt})
+	    error({unsupported_crypto, aes_cfb128})
     end;
 verify_usm_user_priv(usmAesCfb128Protocol, PrivKey) when is_list(PrivKey) ->
     Len = length(PrivKey),
@@ -2111,13 +2111,10 @@ verify_usm_user_priv(usmAesCfb128Protocol, _PrivKey) ->
 verify_usm_user_priv(PrivP, _PrivKey) ->
     error({invalid_priv_protocol, PrivP}).
     
+
+-compile({inline, [{is_crypto_supported,1}]}).
 is_crypto_supported(Func) ->
-    %% The 'catch' handles the case when 'crypto' is
-    %% not present in the system (or not started).
-    case (catch lists:member(Func, crypto:info())) of
-        true -> true;
-        _ -> false
-    end.
+    snmp_misc:is_crypto_supported(Func). 
  
 
 read_manager_config_file(Dir) ->
@@ -2879,11 +2876,11 @@ do_update_usm_user_info(Key,
 			#usm_user{auth = usmHMACMD5AuthProtocol} = User, 
 			auth_key, Val) 
   when length(Val) =:= 16 ->
-    case is_crypto_supported(md5_mac_96) of
+    case is_crypto_supported(md5) of
 	true -> 
 	    do_update_usm_user_info(Key, User#usm_user{auth_key = Val});
 	false -> 
-	    {error, {unsupported_crypto, md5_mac_96}}
+	    {error, {unsupported_crypto, md5}}
     end;    
 do_update_usm_user_info(_Key, 
 			#usm_user{auth = usmHMACMD5AuthProtocol}, 
@@ -2898,11 +2895,11 @@ do_update_usm_user_info(Key,
 			#usm_user{auth = usmHMACSHAAuthProtocol} = User, 
 			auth_key, Val) 
   when length(Val) =:= 20 ->
-    case is_crypto_supported(sha_mac_96) of
+    case is_crypto_supported(sha) of
 	true -> 
 	    do_update_usm_user_info(Key, User#usm_user{auth_key = Val});
 	false -> 
-	    {error, {unsupported_crypto, sha_mac_96}}
+	    {error, {unsupported_crypto, sha}}
     end;    
 do_update_usm_user_info(_Key, 
 			#usm_user{auth = usmHMACSHAAuthProtocol}, 
@@ -2933,21 +2930,21 @@ do_update_usm_user_info(Key,
 			#usm_user{priv = usmDESPrivProtocol} = User, 
 			priv_key, Val) 
   when length(Val) =:= 16 ->
-    case is_crypto_supported(des_cbc_decrypt) of
+    case is_crypto_supported(des_cbc) of
 	true -> 
 	    do_update_usm_user_info(Key, User#usm_user{priv_key = Val});
 	false -> 
-	    {error, {unsupported_crypto, des_cbc_decrypt}}
+	    {error, {unsupported_crypto, des_cbc}}
     end;    
 do_update_usm_user_info(Key, 
 			#usm_user{priv = usmAesCfb128Protocoll} = User, 
 			priv_key, Val) 
   when length(Val) =:= 16 ->
-    case is_crypto_supported(aes_cfb_128_decrypt) of
+    case is_crypto_supported(aes_cfb128) of
 	true -> 
 	    do_update_usm_user_info(Key, User#usm_user{priv_key = Val});
 	false -> 
-	    {error, {unsupported_crypto, aes_cfb_128_decrypt}}
+	    {error, {unsupported_crypto, aes_cfb128}}
     end;    
 do_update_usm_user_info(_Key, 
 			#usm_user{auth = usmHMACSHAAuthProtocol}, 
diff --git a/lib/snmp/src/misc/snmp_config.erl b/lib/snmp/src/misc/snmp_config.erl
index 0bed097b62..22fe25941c 100644
--- a/lib/snmp/src/misc/snmp_config.erl
+++ b/lib/snmp/src/misc/snmp_config.erl
@@ -238,7 +238,7 @@ config_agent_sys() ->
     MibStorage = 
 	case MibStorageType of
 	    ets ->
-		ets;
+		[{module, snmpa_mib_storage_ets}];
 	    dets ->
 		DetsDir = ask("6b. Mib storage directory (absolute path)?",
 			      DbDir, fun verify_dir/1),
@@ -248,13 +248,14 @@ config_agent_sys() ->
 				 "default", fun verify_mib_storage_action/1),
 		case DetsAction of
 		    default ->
-			{dets, DetsDir};
+			[{module, snmpa_mib_storage_dets}, 
+			 {options, [{dir,    DetsDir}]}];
 		    _ ->
-			{dets, DetsDir, DetsAction}
+			[{module, snmpa_mib_storage_dets}, 
+			 {options, [{dir,    DetsDir}, 
+				    {action, DetsAction}]}]
 		end;
 	    mnesia ->
-% 		Nodes = ask("Mib storage nodes?", "none", 
-% 			    fun verify_mib_storage_nodes/1),
 		Nodes = [],
 		MnesiaAction = ask("6b. Mib storage [mnesia] database start "
 				   "action "
@@ -262,11 +263,18 @@ config_agent_sys() ->
 				   "default", fun verify_mib_storage_action/1),
 		case MnesiaAction of
 		    default ->
-			{mnesia, Nodes};
+			[{module, snmpa_mib_storage_mnesia}, 
+			 {options, [{nodes, Nodes}]}];
 		    _ ->
-			{mnesia, Nodes, MnesiaAction}
+			[{module, snmpa_mib_storage_mnesia}, 
+			 {options, [{nodes,  Nodes}, 
+				    {action, MnesiaAction}]}]
 		end
 	end,
+
+    %% Here we should ask about mib-server data module, 
+    %% but as we only have one at the moment...
+
     TargetCacheVerb = ask("7. Target cache verbosity "
 			  "(silence/info/log/debug/trace)?", "silence",
 			  fun verify_verbosity/1),
diff --git a/lib/snmp/src/misc/snmp_misc.erl b/lib/snmp/src/misc/snmp_misc.erl
index a061dcd97c..293b22991b 100644
--- a/lib/snmp/src/misc/snmp_misc.erl
+++ b/lib/snmp/src/misc/snmp_misc.erl
@@ -43,6 +43,7 @@
 	 ip/1, ip/2, 
 	 is_auth/1,
 	 is_BitString/1,
+	 is_crypto_supported/1, 
 	 is_oid/1,
 	 is_priv/1,
 	 is_reportable/1,
@@ -117,13 +118,27 @@ now(sec) ->
 	(element(3,Now) div 1000000).
     
 
+is_crypto_supported(Alg) ->
+    %% The 'try catch' handles the case when 'crypto' is
+    %% not present in the system (or not started).
+    try
+	begin
+	    Supported = crypto:supports(),
+	    Hashs     = proplists:get_value(hashs,   Supported),
+	    Ciphers   = proplists:get_value(ciphers, Supported),
+	    lists:member(Alg, Hashs ++ Ciphers)
+	end
+    catch
+	_:_ ->
+	    false
+    end.
+
 is_string([]) -> true;
 is_string([Tkn | Str]) 
   when is_integer(Tkn) andalso (Tkn >= 0) andalso (Tkn =< 255) ->
     is_string(Str);
 is_string(_) -> false.
 
-
 is_oid([E1, E2| Rest]) 
   when (length(Rest) =< 126) andalso (E1 *40 + E2 =< 255) ->
     is_oid2(Rest);
diff --git a/lib/snmp/src/misc/snmp_usm.erl b/lib/snmp/src/misc/snmp_usm.erl
index 53c291ca0e..67e3476816 100644
--- a/lib/snmp/src/misc/snmp_usm.erl
+++ b/lib/snmp/src/misc/snmp_usm.erl
@@ -142,32 +142,33 @@ auth_out(?usmHMACSHAAuthProtocol, AuthKey, Message, UsmSecParams) ->
     sha_auth_out(AuthKey, Message, UsmSecParams).
 
 md5_auth_out(AuthKey, Message, UsmSecParams) ->
+    %% ?vtrace("md5_auth_out -> entry with"
+    %%  	    "~n   AuthKey:      ~w"
+    %% 	    "~n   Message:      ~w"
+    %%  	    "~n   UsmSecParams: ~w", [AuthKey, Message, UsmSecParams]),
     %% 6.3.1.1
     Message2 = set_msg_auth_params(Message, UsmSecParams, ?twelwe_zeros),
-    Packet = snmp_pdus:enc_message_only(Message2),
+    Packet   = snmp_pdus:enc_message_only(Message2),
     %% 6.3.1.2-4 is done by the crypto function
     %% 6.3.1.4
     MAC = binary_to_list(crypto:hmac(md5, AuthKey, Packet, 12)),
-    ?vtrace("md5_auth_out -> entry with"
-    	    "~n   Packet:    ~w"
-     	    "~n   AuthKey:   ~w"
-     	    "~n   MAC:       ~w"
-    , [Packet, AuthKey, MAC]),
+    %% ?vtrace("md5_auth_out -> crypto (md5) encoded"
+    %%  	    "~n   MAC: ~w", [MAC]),
     %% 6.3.1.5
     set_msg_auth_params(Message, UsmSecParams, MAC).
 
 md5_auth_in(AuthKey, AuthParams, Packet) when length(AuthParams) == 12 ->
+    %% ?vtrace("md5_auth_in -> entry with"
+    %%  	    "~n   AuthKey:    ~w"
+    %%  	    "~n   AuthParams: ~w"
+    %%  	    "~n   Packet:     ~w", [AuthKey, AuthParams, Packet]),
     %% 6.3.2.3
     Packet2 = patch_packet(binary_to_list(Packet)),
     %% 6.3.2.5
     MAC = binary_to_list(crypto:hmac(md5, AuthKey, Packet2, 12)),
     %% 6.3.2.6
-    ?vtrace("md5_auth_in -> entry with"
-     	    "~n   Packet2:    ~w"
-     	    "~n   AuthKey:    ~w"
-     	    "~n   AuthParams: ~w"
-     	    "~n   MAC:        ~w"
-     	    , [Packet2, AuthKey, AuthParams, MAC]),
+    %% ?vtrace("md5_auth_in -> crypto (md5) encoded"
+    %%  	    "~n   MAC: ~w", [MAC]),
     MAC == AuthParams;
 md5_auth_in(_AuthKey, _AuthParams, _Packet) ->
     %% 6.3.2.1
diff --git a/lib/snmp/test/snmp_agent_mibs_test.erl b/lib/snmp/test/snmp_agent_mibs_test.erl
index 3e48130fac..248fe7d83e 100644
--- a/lib/snmp/test/snmp_agent_mibs_test.erl
+++ b/lib/snmp/test/snmp_agent_mibs_test.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2003-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2013. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -19,13 +19,17 @@
 
 %%
 %%----------------------------------------------------------------------
-%% Purpose:
+%% Purpose: Test suite of the agent mib-server.
+%%          Some of these tests should really be in a mib-storage suite.
 %%----------------------------------------------------------------------
+
 -module(snmp_agent_mibs_test).
 
+
 %%----------------------------------------------------------------------
 %% Include files
 %%----------------------------------------------------------------------
+
 -include_lib("test_server/include/test_server.hrl").
 -include("snmp_test_lib.hrl").
 -include_lib("snmp/include/snmp_types.hrl").
@@ -39,13 +43,25 @@
 %% External exports
 %%----------------------------------------------------------------------
 -export([
-	all/0,groups/0,init_per_group/2,end_per_group/2, 
-         init_per_testcase/2, end_per_testcase/2,
-	 init_per_suite/1, end_per_suite/1, 
+	 all/0,
+	 groups/0,
+
+	 init_per_suite/1, 
+	 end_per_suite/1, 
+
+	 init_per_group/2,
+	 end_per_group/2, 
+
+         init_per_testcase/2, 
+	 end_per_testcase/2,
 
 	 start_and_stop/1,
 	
-	 size_check_ets/1,
+	 size_check_ets1/1,
+	 size_check_ets2/1,
+	 size_check_ets2_bad_file1/1,
+	 size_check_ets3/1,
+	 size_check_ets3_bad_file1/1,
 	 size_check_dets/1,
 	 size_check_mnesia/1,
 	 load_unload/1,
@@ -55,6 +71,7 @@
 
 	]).
 
+
 %%----------------------------------------------------------------------
 %% Internal exports
 %%----------------------------------------------------------------------
@@ -71,18 +88,51 @@
 %% External functions
 %%======================================================================
 
-init_per_testcase(size_check_dets, Config) when is_list(Config) ->
-    Dir = ?config(priv_dir, Config),
-    DetsDir = join(Dir, "dets_dir/"),
-    ?line ok = file:make_dir(DetsDir),
-    [{dets_dir, DetsDir}|Config];
-init_per_testcase(size_check_mnesia, Config) when is_list(Config) ->
-    Dir = ?config(priv_dir, Config),
-    MnesiaDir = join(Dir, "mnesia_dir/"),
-    ?line ok = file:make_dir(MnesiaDir),
-    mnesia_start([{dir, MnesiaDir}]),
-    [{mnesia_dir, MnesiaDir}|Config];
-init_per_testcase(cache_test, Config) when is_list(Config) ->
+init_per_suite(Config0) when is_list(Config0) ->
+
+    ?DBG("init_per_suite -> entry with"
+         "~n   Config0: ~p", [Config0]),
+
+    Config1 = snmp_test_lib:init_suite_top_dir(?MODULE, Config0), 
+
+    ?DBG("init_per_suite -> done when"
+         "~n   Config1: ~p", [Config1]),
+
+    Config1.
+
+end_per_suite(Config) when is_list(Config) ->
+
+    ?DBG("end_per_suite -> entry with"
+         "~n   Config: ~p", [Config]),
+
+    Config.
+
+
+init_per_testcase(Case, Config0) when is_list(Config0) ->
+    Config1    = snmp_test_lib:fix_data_dir(Config0),
+    CaseTopDir = snmp_test_lib:init_testcase_top_dir(Case, Config1), 
+    DbDir      = join(CaseTopDir, "db_dir/"),
+    ?line ok   = file:make_dir(DbDir),
+    init_per_testcase2(Case, [{db_dir,       DbDir}, 
+			      {case_top_dir, CaseTopDir} | Config1]).
+
+init_per_testcase2(size_check_ets2_bad_file1, Config) when is_list(Config) ->
+    DbDir = ?config(db_dir, Config),
+    %% Create a ad file
+    ok = file:write_file(join(DbDir, "snmpa_symbolic_store.db"), 
+			 "calvin and hoppes play chess"),
+    Config;
+init_per_testcase2(size_check_ets3_bad_file1, Config) when is_list(Config) ->
+    DbDir = ?config(db_dir, Config),
+    %% Create a ad file
+    ok = file:write_file(join(DbDir, "snmpa_symbolic_store.db"), 
+			 "calvin and hoppes play chess"),
+    Config;
+init_per_testcase2(size_check_mnesia, Config) when is_list(Config) ->
+    DbDir = ?config(db_dir, Config),
+    mnesia_start([{dir, DbDir}]),
+    Config;
+init_per_testcase2(cache_test, Config) when is_list(Config) ->
     Min = timer:minutes(5), 
     Timeout = 
 	case lists:keysearch(tc_timeout, 1, Config) of
@@ -95,18 +145,26 @@ init_per_testcase(cache_test, Config) when is_list(Config) ->
 	end,
     Dog = test_server:timetrap(Timeout), 
     [{watchdog, Dog} | Config];
-init_per_testcase(_Case, Config) when is_list(Config) ->
+init_per_testcase2(_Case, Config) when is_list(Config) ->
     Config.
 
-end_per_testcase(size_check_dets, Config) when is_list(Config) ->
-    Dir = ?config(dets_dir, Config),
-    ?line ok = ?DEL_DIR(Dir),
-    lists:keydelete(dets_dir, 1, Config);
+%% end_per_testcase(EtsCase, Config) 
+%%   when (is_list(Config) andalso 
+%% 	((EtsCase =:= size_check_ets2) orelse 
+%% 	 (EtsCase =:= size_check_ets3))) ->
+%%     Dir = ?config(ets_dir, Config),
+%%     ?line ok = ?DEL_DIR(Dir),
+%%     lists:keydelete(ets_dir, 1, Config);
+%% end_per_testcase(size_check_dets, Config) when is_list(Config) ->
+%%     Dir = ?config(dets_dir, Config),
+%%     ?line ok = ?DEL_DIR(Dir),
+%%     lists:keydelete(dets_dir, 1, Config);
 end_per_testcase(size_check_mnesia, Config) when is_list(Config) ->
     mnesia_stop(),
-    Dir = ?config(mnesia_dir, Config),
-    ?line ok = ?DEL_DIR(Dir),
-    lists:keydelete(mnesia_dir, 1, Config);
+    %% Dir = ?config(db_dir, Config),
+    %% ?line ok = ?DEL_DIR(Dir),
+    %% lists:keydelete(mnesia_dir, 1, Config);
+    Config;
 end_per_testcase(cache_test, Config) when is_list(Config) ->
     Dog = ?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
@@ -120,33 +178,40 @@ end_per_testcase(_Case, Config) when is_list(Config) ->
 %%======================================================================
 
 all() -> 
-cases().
+    cases().
 
 groups() -> 
     [{size_check, [],
-  [size_check_ets, size_check_dets, size_check_mnesia]}].
+      [
+       size_check_ets1,            % Plain ets
+       size_check_ets2,            % ets with a file
+       size_check_ets2_bad_file1,  % ets with a bad file
+       size_check_ets3,            % ets with a checksummed file
+       size_check_ets3_bad_file1,  % ets with bad file (checksummed) 
+       size_check_dets,            % Plain dets
+       size_check_mnesia           % Plain mnesia
+      ]
+     }].
+
 
-init_per_group(_GroupName, Config) ->
-	Config.
+init_per_group(GroupName, Config) ->
+    snmp_test_lib:init_group_top_dir(GroupName, Config).
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    %% Do we really need to do this?
+    %% lists:keydelete(snmp_group_top_dir, 1, Config).
+    Config.
 
 
 cases() -> 
-[start_and_stop, load_unload, {group, size_check},
- me_lookup, which_mib, cache_test].
-
-init_per_suite(Config) when is_list(Config) ->
-    %% Data dir points wrong
-    DataDir0     = ?config(data_dir, Config),
-    DataDir1     = filename:split(filename:absname(DataDir0)),
-    [_|DataDir2] = lists:reverse(DataDir1),
-    DataDir      = filename:join(lists:reverse(DataDir2) ++ [?snmp_test_data]),
-    [{snmp_data_dir, DataDir ++ "/"}|Config].
-
-end_per_suite(Config) when is_list(Config) ->
-    lists:keydelete(snmp_data_dir, 1, Config).
+    [
+     start_and_stop, 
+     load_unload, 
+     {group, size_check},
+     me_lookup, 
+     which_mib, 
+     cache_test
+    ].
 
 
 %%======================================================================
@@ -175,8 +240,7 @@ load_unload(suite) -> [];
 load_unload(Config) when is_list(Config) ->
     Prio       = normal,
     Verbosity  = log,
-    %% MibStorage = ets,
-    MibDir     = ?config(snmp_data_dir, Config),
+    MibDir     = ?config(data_dir, Config),
 
     ?DBG("load_unload -> start symbolic store", []),
     ?line sym_start(Prio, Verbosity),
@@ -221,30 +285,74 @@ load_unload(Config) when is_list(Config) ->
 %% ---------------------------------------------------------------------
 
 
-size_check_ets(suite) ->
+size_check_ets1(suite) ->
+    [];
+size_check_ets1(Config) when is_list(Config) ->
+    MibStorage = [{module, snmpa_mib_storage_ets}], 
+    do_size_check([{mib_storage, MibStorage}|Config]).
+
+size_check_ets2(suite) ->
+    [];
+size_check_ets2(Config) when is_list(Config) ->
+    Dir = ?config(db_dir, Config),    
+    MibStorage = [{module,  snmpa_mib_storage_ets}, 
+		  {options, [{dir, Dir}]}], 
+    do_size_check([{mib_storage, MibStorage}|Config]).
+
+size_check_ets2_bad_file1(suite) ->
+    [];
+size_check_ets2_bad_file1(Config) when is_list(Config) ->
+    Dir = ?config(db_dir, Config),    
+    %% Ensure that the bad file does not cause any problems (action = clear)
+    MibStorage = [{module,  snmpa_mib_storage_ets}, 
+		  {options, [{dir,    Dir}, 
+			     {action, clear}]}], 
+    do_size_check([{mib_storage, MibStorage}|Config]).
+
+size_check_ets3(suite) ->
     [];
-size_check_ets(Config) when is_list(Config) ->
-    do_size_check([{mib_storage, ets}|Config]).
+size_check_ets3(Config) when is_list(Config) ->
+    Dir = ?config(db_dir, Config),    
+    MibStorage = [{module,  snmpa_mib_storage_ets}, 
+		  {options, [{dir,      Dir}, 
+			     {checksum, true}]}], 
+    do_size_check([{mib_storage, MibStorage}|Config]).
+
+size_check_ets3_bad_file1(suite) ->
+    [];
+size_check_ets3_bad_file1(Config) when is_list(Config) ->
+    Dir = ?config(db_dir, Config),    
+    %% Ensure that the bad file does not cause any problems (action = clear)
+    MibStorage = [{module,  snmpa_mib_storage_ets}, 
+		  {options, [{dir,      Dir}, 
+			     {action,   clear}, 
+			     {checksum, true}]}], 
+    do_size_check([{mib_storage, MibStorage}|Config]).
 
 size_check_dets(suite) ->
     [];
 size_check_dets(Config) when is_list(Config) ->
-    Dir = ?config(dets_dir, Config),
-    do_size_check([{mib_storage, {dets, Dir}}|Config]).
+    Dir = ?config(db_dir, Config),
+    MibStorage = [{module,  snmpa_mib_storage_dets}, 
+		  {options, [{dir, Dir}]}], 
+    do_size_check([{mib_storage, MibStorage}|Config]).
 
 size_check_mnesia(suite) ->
     [];
 size_check_mnesia(Config) when is_list(Config) ->
-    do_size_check([{mib_storage, {mnesia, [node()]}}|Config]).
+    MibStorage = [{module,  snmpa_mib_storage_mnesia}, 
+		  {options, [{nodes, [node()]}]}], 
+    do_size_check([{mib_storage, MibStorage}|Config]).
 
 do_size_check(Config) ->
-    ?DBG("do_size_check -> start", []),
+    ?DBG("do_size_check -> start with"
+	 "~n   Config: ~p", [Config]),
     Prio      = normal,
     Verbosity = trace,
 
     MibStorage = ?config(mib_storage, Config),
     ?DBG("do_size_check -> MibStorage: ~p", [MibStorage]),
-    MibDir     = ?config(snmp_data_dir, Config),
+    MibDir     = ?config(data_dir, Config),
     StdMibDir  = filename:join(code:priv_dir(snmp), "mibs") ++ "/",
     
     ?DBG("do_size_check -> start symbolic store", []),
@@ -294,8 +402,7 @@ me_lookup(suite) -> [];
 me_lookup(Config) when is_list(Config) ->
     Prio       = normal,
     Verbosity  = trace,
-    %% MibStorage = ets,
-    MibDir     = ?config(snmp_data_dir, Config),
+    MibDir     = ?config(data_dir, Config),
     StdMibDir  = filename:join(code:priv_dir(snmp), "mibs") ++ "/",
     Mibs    = ["Test2", "TestTrap", "TestTrapv2"],
     StdMibs = ["OTP-SNMPEA-MIB",
@@ -348,8 +455,7 @@ which_mib(suite) -> [];
 which_mib(Config) when is_list(Config) ->
     Prio       = normal,
     Verbosity  = trace,
-    %% MibStorage = ets,
-    MibDir     = ?config(snmp_data_dir, Config),
+    MibDir     = ?config(data_dir, Config),
     StdMibDir  = filename:join(code:priv_dir(snmp), "mibs") ++ "/",
     Mibs    = ["Test2", "TestTrap", "TestTrapv2"],
     StdMibs = ["OTP-SNMPEA-MIB",
@@ -406,28 +512,28 @@ cache_test(Config) when is_list(Config) ->
     ?DBG("cache_test -> start", []),
     Prio       = normal,
     Verbosity  = trace,
-    MibStorage = ets,
-    MibDir     = ?config(snmp_data_dir, Config),
+    MibStorage = [{module, snmpa_mib_storage_ets}],
+    MibDir     = ?config(data_dir, Config),
     StdMibDir  = filename:join(code:priv_dir(snmp), "mibs") ++ "/",
-    Mibs    = ["Test2", "TestTrap", "TestTrapv2"],
-    StdMibs = ["OTP-SNMPEA-MIB",
-	       "SNMP-COMMUNITY-MIB",
-	       "SNMP-FRAMEWORK-MIB",
-	       "SNMP-MPD-MIB",
-	       "SNMP-NOTIFICATION-MIB",
-	       "SNMP-TARGET-MIB",
-	       %% "SNMP-USER-BASED-SM-MIB",
-	       "SNMP-VIEW-BASED-ACM-MIB",
-	       "SNMPv2-MIB",
-	       "SNMPv2-TC",
-	       "SNMPv2-TM"],
+    Mibs       = ["Test2", "TestTrap", "TestTrapv2"],
+    StdMibs    = ["OTP-SNMPEA-MIB",
+		  "SNMP-COMMUNITY-MIB",
+		  "SNMP-FRAMEWORK-MIB",
+		  "SNMP-MPD-MIB",
+		  "SNMP-NOTIFICATION-MIB",
+		  "SNMP-TARGET-MIB",
+		  %% "SNMP-USER-BASED-SM-MIB",
+		  "SNMP-VIEW-BASED-ACM-MIB",
+		  "SNMPv2-MIB",
+		  "SNMPv2-TC",
+		  "SNMPv2-TM"],
 
     ?DBG("cache_test -> start symbolic store", []),
     ?line sym_start(Prio, MibStorage, Verbosity),
 
     ?DBG("cache_test -> start mib server", []),
-    GcLimit = 2, 
-    Age     = timer:seconds(10), 
+    GcLimit   = 2, 
+    Age       = timer:seconds(10), 
     CacheOpts = [{autogc, false}, {age, Age}, {gclimit, GcLimit}],
     ?line MibsPid = mibs_start(Prio, MibStorage, [], Verbosity, CacheOpts), 
     
@@ -537,7 +643,7 @@ mnesia_stop() ->
 %% - Symbolic Store mini interface
 
 sym_start(Prio, Verbosity) ->
-    sym_start(Prio, ets, Verbosity).
+    sym_start(Prio, mib_storage(), Verbosity).
 
 sym_start(Prio, MibStorage, Verbosity) ->
     Opts = [{mib_storage, MibStorage}, {verbosity,Verbosity}],
@@ -554,7 +660,7 @@ sym_info() ->
 %% -- MIB server mini interface 
 		   
 mibs_start(Prio, Verbosity) when is_atom(Prio) andalso is_atom(Verbosity) ->
-    mibs_start(Prio, ets, [], Verbosity).
+    mibs_start(Prio, mib_storage(), [], Verbosity).
 
 mibs_start(Prio, MibStorage, Verbosity) 
   when is_atom(Prio) andalso is_atom(Verbosity) ->
@@ -671,6 +777,11 @@ which_mib(M1, M2) ->
     {error, {invalid_mib, M1, M2}}.
 
 
+%% Default mib-storage
+mib_storage() ->
+    [{module, snmpa_mib_storage_ets}].
+
+
 %% -- 
 
 display_memory_usage(MibsPid) ->
diff --git a/lib/snmp/test/snmp_agent_test.erl b/lib/snmp/test/snmp_agent_test.erl
index 09e1eb25a9..6fe97ccd25 100644
--- a/lib/snmp/test/snmp_agent_test.erl
+++ b/lib/snmp/test/snmp_agent_test.erl
@@ -2,7 +2,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2003-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -24,7 +24,402 @@
 %% * Test fault-tolerance (kill master etc)
 %%
 
--compile(export_all).
+-export([
+	 all/0, 
+	 groups/0, 
+	 init_per_suite/1,    end_per_suite/1, 
+	 init_per_group/2,    end_per_group/2, 
+	 init_per_testcase/2, end_per_testcase/2, 
+
+	 %% all_tcs - misc
+	 app_info/1, 
+	 info_test/1, 
+
+	 %% all_tcs - test_v1
+	 simple/1, 
+	 db_notify_client/1, 
+	 v1_processing/1, 
+	 big/1, 
+	 big2/1,
+	 loop_mib/1, 
+	 api/1, 
+	 subagent/1, 
+	 mnesia/1, 
+	 sa_register/1, 
+	 v1_trap/1, 
+	 sa_error/1, 
+	 next_across_sa/1, 
+	 undo/1,
+	 sparse_table/1, 
+	 cnt_64/1, 
+	 opaque/1, 
+	 change_target_addr_config/1, 
+
+	 %% all_tcs - test_v1 - multiple_reqs
+	 mul_get/1, 
+	 mul_get_err/1, 
+	 mul_next/1, 
+	 mul_next_err/1,
+	 mul_set/1, 
+	 mul_set_err/1, 
+
+	 %% all_tcs - test_v1 - reported_bugs
+	 otp_1128/1, 
+	 otp_1129/1, 
+	 otp_1131/1, 
+	 otp_1162/1, 
+	 otp_1222/1,
+	 otp_1298/1, 
+	 otp_1331/1, 
+	 otp_1338/1, 
+	 otp_1342/1, 
+	 otp_1366/1, 
+	 otp_2776/1,
+	 otp_2979/1, 
+	 otp_3187/1, 
+	 otp_3725/1, 
+
+	 %% all_tcs - test_v1 - standard_mibs
+	 snmp_standard_mib/1, 
+	 snmp_community_mib/1,
+	 snmp_framework_mib/1, 
+	 snmp_target_mib/1,
+	 snmp_notification_mib/1, 
+	 snmp_view_based_acm_mib/1, 
+
+	 %% all_tcs - test_v2
+	 simple_2/1, 
+	 v2_processing/1, 
+	 big_2/1, 
+	 big2_2/1, 
+	 loop_mib_2/1,
+	 api_2/1, 
+	 subagent_2/1, 
+	 mnesia_2/1, 
+	 sa_register_2/1, 
+	 v2_trap/1, 
+	 sa_error_2/1,
+	 next_across_sa_2/1, 
+	 undo_2/1, 
+	 v2_types/1, 
+	 implied/1,
+	 sparse_table_2/1, 
+	 cnt_64_2/1, 
+	 opaque_2/1, 
+	 v2_caps/1,
+
+	 %% all_tcs - test_v2 - multiple_reqs_2
+	 mul_get_2/1, 
+	 mul_get_err_2/1, 
+	 mul_next_2/1, 
+	 mul_next_err_2/1,
+	 mul_set_2/1, 
+	 mul_set_err_2/1, 
+
+	 %% all_tcs - test_v2 - v2_inform
+	 v2_inform_i/1, 
+
+	 %% all_tcs - test_v2 - reported_bugs_2
+	 otp_1128_2/1, 
+	 otp_1129_2/1, 
+	 otp_1131_2/1, 
+	 otp_1162_2/1,
+	 otp_1222_2/1, 
+	 otp_1298_2/1, 
+	 otp_1331_2/1, 
+	 otp_1338_2/1,
+	 otp_1342_2/1, 
+	 otp_1366_2/1, 
+	 otp_2776_2/1, 
+	 otp_2979_2/1, 
+	 otp_3187_2/1, 
+
+	 %% all_tcs - test_v2 - standard_mibs_2
+	 snmpv2_mib_2/1, 
+	 snmp_community_mib_2/1,
+	 snmp_framework_mib_2/1, 
+	 snmp_target_mib_2/1,
+	 snmp_notification_mib_2/1, 
+	 snmp_view_based_acm_mib_2/1,
+
+	 %% all_tcs - test_v1_v2
+	 simple_bi/1, 
+
+	 %% all_tcs - test_v3
+	 simple_3/1, 
+	 v3_processing/1, 
+	 big_3/1, 
+	 big2_3/1, 
+	 api_3/1,
+	 subagent_3/1, 
+	 mnesia_3/1, 
+	 loop_mib_3/1, 
+	 sa_register_3/1, 
+	 v3_trap/1, 
+	 sa_error_3/1,
+	 next_across_sa_3/1, 
+	 undo_3/1, 
+	 v2_types_3/1, 
+	 implied_3/1, 
+	 sparse_table_3/1, 
+	 cnt_64_3/1,
+	 opaque_3/1, 
+	 v2_caps_3/1, 
+
+	 %% all_tcs - test_v3 - multiple_reqs_3
+	 mul_get_3/1, 
+	 mul_get_err_3/1, 
+	 mul_next_3/1, 
+	 mul_next_err_3/1, 
+	 mul_set_3/1,
+	 mul_set_err_3/1,
+
+	 %% all_tcs - test_v3 - v3_inform
+	 v3_inform_i/1, 
+
+	 %% all_tcs - test_v3 - reported_bugs_3
+	 otp_1128_3/1, 
+	 otp_1129_3/1, 
+	 otp_1131_3/1, 
+	 otp_1162_3/1,
+	 otp_1222_3/1, 
+	 otp_1298_3/1, 
+	 otp_1331_3/1, 
+	 otp_1338_3/1,
+	 otp_1342_3/1, 
+	 otp_1366_3/1, 
+	 otp_2776_3/1, 
+	 otp_2979_3/1, 
+	 otp_3187_3/1,
+	 otp_3542/1,
+
+	 %% all_tcs - test_v3 - standard_mibs_3
+	 snmpv2_mib_3/1, 
+	 snmp_framework_mib_3/1, 
+	 snmp_mpd_mib_3/1,
+	 snmp_target_mib_3/1, 
+	 snmp_notification_mib_3/1,
+	 snmp_view_based_acm_mib_3/1, 
+	 snmp_user_based_sm_mib_3/1,
+
+	 %% all_tcs - test_v3 - v3_security
+	 v3_crypto_basic/1, 
+	 v3_md5_auth/1, 
+	 v3_sha_auth/1,
+	 v3_des_priv/1, 
+
+	 %% all_tcs - test_multi_threaded
+	 multi_threaded/1, 
+	 mt_trap/1, 
+	 
+	 %% all_tcs - mib_storage - mib_storage_ets
+	 mse_simple/1, 
+	 mse_v1_processing/1, 
+	 mse_big/1, 
+	 mse_big2/1,
+	 mse_loop_mib/1, 
+	 mse_api/1, 
+	 mse_sa_register/1, 
+	 mse_v1_trap/1,
+	 mse_sa_error/1, 
+	 mse_next_across_sa/1, 
+	 mse_undo/1,
+	 mse_standard_mib/1, 
+	 mse_community_mib/1, 
+	 mse_framework_mib/1,
+	 mse_target_mib/1, 
+	 mse_notification_mib/1,
+	 mse_view_based_acm_mib/1, 
+	 mse_sparse_table/1, 
+	 mse_me_of/1,
+	 mse_mib_of/1, 
+
+	 %% all_tcs - mib_storage - mib_storage_dets
+	 msd_simple/1, 
+	 msd_v1_processing/1, 
+	 msd_big/1, 
+	 msd_big2/1,
+	 msd_loop_mib/1, 
+	 msd_api/1, 
+	 msd_sa_register/1, 
+	 msd_v1_trap/1,
+	 msd_sa_error/1, 
+	 msd_next_across_sa/1, 
+	 msd_undo/1,
+	 msd_standard_mib/1, 
+	 msd_community_mib/1, 
+	 msd_framework_mib/1,
+	 msd_target_mib/1, 
+	 msd_notification_mib/1,
+	 msd_view_based_acm_mib/1, 
+	 msd_sparse_table/1, 
+	 msd_me_of/1,
+	 msd_mib_of/1, 
+
+	 %% all_tcs - mib_storage - mib_storage_mnesia
+	 msm_simple/1, 
+	 msm_v1_processing/1, 
+	 msm_big/1, 
+	 msm_big2/1,
+	 msm_loop_mib/1, 
+	 msm_api/1, 
+	 msm_sa_register/1, 
+	 msm_v1_trap/1,
+	 msm_sa_error/1, 
+	 msm_next_across_sa/1, 
+	 msm_undo/1,
+	 msm_standard_mib/1, 
+	 msm_community_mib/1, 
+	 msm_framework_mib/1,
+	 msm_target_mib/1, 
+	 msm_notification_mib/1,
+	 msm_view_based_acm_mib/1, 
+	 msm_sparse_table/1, 
+	 msm_me_of/1,
+	 msm_mib_of/1, 
+
+	 %% all_tcs - mib_storage - mse_size_check
+	 mse_size_check/1, 
+
+	 %% all_tcs - mib_storage - msd_size_check
+	 msd_size_check/1, 
+
+	 %% all_tcs - mib_storage - msm_size_check
+	 msm_size_check/1, 
+
+	 %% all_tcs - mib_storage - varm_mib_storage_dets
+	 msd_varm_mib_start/1, 
+
+	 %% all_tcs - mib_storage - varm_mib_storage_mnesia
+	 msm_varm_mib_start/1, 
+
+	 %% all_tcs - tickets1 - otp4394
+	 otp_4394/1, 
+
+	 %% all_tcs - tickets1 - otp7157
+	 otp_7157/1, 
+
+	 %% tickets2
+	 otp8395/1, 
+	 otp9884/1
+
+	]).
+
+%% Internal exports
+-export([dummy_manager_init/2, 
+	 v3_sync/1, 
+	 v3_inform_sync/1, 
+	 v2_caps_i/1, 
+	 v1_proc/0, 
+	 v2_proc/0, 
+	 big_test/0, 
+	 big_test_2/0, 
+	 simple_standard_test/0, 
+	 db_notify_client_test/0, 
+	 notify/2, 
+	 multi_threaded_test/0, 
+	 mt_trap_test/1, 
+	 types_v2_test/0, 
+	 implied_test/1, 
+	 sparse_table_test/0, 
+	 cnt_64_test/1, 
+	 opaque_test/0, 
+	 api_test/1, 
+	 unreg_test/0, 
+	 load_test/0, 
+	 load_test_sa/0, 
+	 api_test2/0, 
+	 api_test3/0, 
+	 do_mul_get/0, 
+	 do_mul_get_err/0, 
+	 do_mul_next/0, 
+	 do_mul_next_err/0, 
+	 do_mul_set/0, 
+	 do_mul_set_err/0, 
+	 sa_mib/0, 
+	 ma_trap1/1, 
+	 ma_trap2/1, 
+	 ma_v2_2_v1_trap/1, 
+	 ma_v2_2_v1_trap2/1, 
+	 sa_trap1/1, 
+	 sa_trap2/1, 
+	 sa_trap3/1, 
+	 ma_v2_trap1/1, 
+	 ma_v2_trap2/1, 
+	 ma_v2_inform1/1, 
+	 ma_v2_inform2/1, 
+	 ma_v2_inform3/1, 
+	 delivery_targets/3,  
+	 delivery_info/4, 
+	 ma_v1_2_v2_trap/1, 
+	 ma_v1_2_v2_trap2/1, 
+	 sa_v1_2_v2_trap1/1, 
+	 sa_v1_2_v2_trap2/1, 
+	 sa_v1_2_v2_trap3/1, 
+	 sa_errs_bad_value/0, 
+	 sa_errs_gen_err/0, 
+	 sa_too_big/0, 
+	 next_across_sa_test/0, 
+	 undo_test/0, 
+	 bad_return/0, 
+	 standard_mib_a/0, 
+	 std_mib_read/0, 
+	 std_mib_write/0, 
+	 std_mib_init/0, 
+	 std_mib_finish/0, 
+	 standard_mib_test_finish/0, 
+	 std_mib_asn_err/0, 
+	 snmpv2_mib_test_finish/0, 
+	 std_mib_a/0, 
+	 std_mib_b/1, 
+	 std_mib_c/1, 
+	 snmpv2_mib_a/0, 
+	 snmp_community_mib_test/0, 
+	 snmp_framework_mib_test/0, 
+	 snmp_mpd_mib_a/0, 
+	 snmp_mpd_mib_b/0, 
+	 snmp_mpd_mib_c/1, 
+	 snmp_target_mib_test/0, 
+	 snmp_notification_mib_test/0, 
+	 do_set/1, 
+	 add_row/1, 
+	 del_row/1, 
+	 use_no_rights/0, 
+	 use_rights/0, 
+	 usm_add_user1/0, 
+	 usm_use_user/0, 
+	 usm_key_change1/2, 
+	 usm_key_change2/4, 
+	 usm_key_change3/4, 
+	 usm_read/0, 
+	 usm_del_user/0, 
+	 usm_bad/0, 
+	 loop_mib_1/0, 
+	 loop_mib_2/0, 
+	 otp_1129_i/1, 
+	 otp_1162_test/0, 
+	 otp_1131_test/0, 
+	 otp_1222_test/0, 
+	 otp_1298_test/0, 
+	 otp_1331_test/0, 
+	 otp_1338_test/0, 
+	 otp_1342_test/0, 
+	 otp_1366_test/0, 
+	 otp_1128_test/0, 
+	 otp_2776_test/0, 
+	 otp_2979_test/0, 
+	 otp_3542_test/0, 
+	 otp_3725_test/1, 
+	 otp_4394_test/0, 
+	 otp_7157_test/1, 
+	 otp9884_backup/4, 
+	 agent_log_validation/0, 
+	 mnesia_init/1, 
+	 mnesia_start/0, 
+	 mnesia_stop/0, 
+	 start_stdalone_agent/1, 
+	 do_info/1
+	]).
 
 -define(application, snmp).
 
@@ -86,6 +481,26 @@
 	       end).
 
 
+-define(expect1(What), 
+	snmp_agent_test_lib:expect(?MODULE, ?LINE, 
+				   What)).
+-define(expect2(What, ExpVBs), 
+	snmp_agent_test_lib:expect(?MODULE, ?LINE, 
+				   What, ExpVBs)).
+-define(expect3(Err, Idx, ExpVBs), 
+	snmp_agent_test_lib:expect(?MODULE, ?LINE, 
+				   Err, Idx, ExpVBs)).
+-define(expect4(Err, Idx, ExpVBs, To), 
+	snmp_agent_test_lib:expect(?MODULE, ?LINE, 
+				   Err, Idx, ExpVBs, To)).
+-define(expect5(Type, Ent, Gen, Spec, ExpVBs), 
+	snmp_agent_test_lib:expect(?MODULE, ?LINE, 
+				   Type, Ent, Gen, Spec, ExpVBs)).
+-define(expect6(Type, Ent, Gen, Spec, ExpVBs, To), 
+	snmp_agent_test_lib:expect(?MODULE, ?LINE, 
+				   Type, Ent, Gen, Spec, ExpVBs, To)).
+
+
 all() -> 
     %% Reqs  = [mnesia, distribution, {local_slave_nodes, 2}, {time, 360}],
     Conf1 = [{group, all_tcs}],
@@ -94,19 +509,8 @@ all() ->
 
 groups() -> 
     [
-     {all_tcs, [], cases()},
-     {mib_storage, [],
-      [
-       {group, mib_storage_ets}, 
-       {group, mib_storage_dets},
-       {group, mib_storage_mnesia},
-       {group, mib_storage_size_check_ets},
-       {group, mib_storage_size_check_dets},
-       {group, mib_storage_size_check_mnesia},
-       {group, mib_storage_varm_dets},
-       {group, mib_storage_varm_mnesia}
-      ]
-     },
+     {all_tcs,                       [], cases()},
+     {mib_storage,                   [], mib_storage_cases()}, 
      {mib_storage_ets,               [], mib_storage_ets_cases()},
      {mib_storage_dets,              [], mib_storage_dets_cases()},
      {mib_storage_mnesia,            [], mib_storage_mnesia_cases()},
@@ -123,109 +527,20 @@ groups() ->
      {test_multi_threaded,           [], mt_cases()},
      {multiple_reqs,                 [], mul_cases()},
      {multiple_reqs_2,               [], mul_cases_2()},
-     {v2_inform, [], 
-      [
-       v2_inform_i
-      ]
-     },
-     {v3_security, [],
-      [
-       v3_crypto_basic, 
-       v3_md5_auth, 
-       v3_sha_auth,
-       v3_des_priv
-      ]
-     },
-     {standard_mibs, [],
-      [
-       snmp_standard_mib, 
-       snmp_community_mib,
-       snmp_framework_mib, 
-       snmp_target_mib,
-       snmp_notification_mib, 
-       snmp_view_based_acm_mib
-      ]
-     },
-     {standard_mibs_2, [],
-      [
-       snmpv2_mib_2, 
-       snmp_community_mib_2,
-       snmp_framework_mib_2, 
-       snmp_target_mib_2,
-       snmp_notification_mib_2, 
-       snmp_view_based_acm_mib_2
-      ]
-     },
-     {standard_mibs_3, [],
-      [
-       snmpv2_mib_3, 
-       snmp_framework_mib_3, 
-       snmp_mpd_mib_3,
-       snmp_target_mib_3, 
-       snmp_notification_mib_3,
-       snmp_view_based_acm_mib_3, 
-       snmp_user_based_sm_mib_3
-      ]
-     },
-     {reported_bugs, [],
-      [
-       otp_1128, 
-       otp_1129, 
-       otp_1131, 
-       otp_1162, 
-       otp_1222,
-       otp_1298, 
-       otp_1331, 
-       otp_1338, 
-       otp_1342, 
-       otp_2776,
-       otp_2979, 
-       otp_3187, 
-       otp_3725
-      ]
-     },
-     {reported_bugs_2, [],
-      [
-       otp_1128_2, 
-       otp_1129_2, 
-       otp_1131_2, 
-       otp_1162_2,
-       otp_1222_2, 
-       otp_1298_2, 
-       otp_1331_2, 
-       otp_1338_2,
-       otp_1342_2, 
-       otp_2776_2, 
-       otp_2979_2, 
-       otp_3187_2
-      ]
-     },
-     {reported_bugs_3, [],
-      [
-       otp_1128_3, 
-       otp_1129_3, 
-       otp_1131_3, 
-       otp_1162_3,
-       otp_1222_3, 
-       otp_1298_3, 
-       otp_1331_3, 
-       otp_1338_3,
-       otp_1342_3, 
-       otp_2776_3, 
-       otp_2979_3, 
-       otp_3187_3,
-       otp_3542
-      ]
-     },
-     {tickets1, [], 
-      [
-       {group, otp_4394}, 
-       {group, otp_7157}
-      ]
-     },
-     {tickets2, [], [otp8395, otp9884]},
-     {otp_4394, [], [otp_4394_test]},
-     {otp_7157, [], [otp_7157_test]}
+     {multiple_reqs_3,               [], mul_cases_3()},
+     {v2_inform,                     [], v2_inform_cases()}, 
+     {v3_inform,                     [], v3_inform_cases()}, 
+     {v3_security,                   [], v3_security_cases()}, 
+     {standard_mibs,                 [], standard_mibs_cases()}, 
+     {standard_mibs_2,               [], standard_mibs2_cases()}, 
+     {standard_mibs_3,               [], standard_mibs3_cases()}, 
+     {reported_bugs,                 [], reported_bugs_cases()}, 
+     {reported_bugs_2,               [], reported_bugs2_cases()}, 
+     {reported_bugs_3,               [], reported_bugs3_cases()}, 
+     {tickets1,                      [], tickets1_cases()}, 
+     {tickets2,                      [], tickets2_cases()}, 
+     {otp4394,                       [], [otp_4394]},
+     {otp7157,                       [], [otp_7157]}
     ].
 
 
@@ -258,15 +573,19 @@ end_per_suite(Config) when is_list(Config) ->
 
 init_per_group(all_tcs = GroupName, Config) ->
     init_all(snmp_test_lib:init_group_top_dir(GroupName, Config));
-init_per_group(otp_7157 = GroupName, Config) -> 
-    init_otp_7157(snmp_test_lib:init_group_top_dir(GroupName, Config));
-init_per_group(otp_4394 = GroupName, Config) -> 
-    init_otp_4394(snmp_test_lib:init_group_top_dir(GroupName, Config));
+init_per_group(otp7157 = GroupName, Config) -> 
+    otp_7157_init(snmp_test_lib:init_group_top_dir(GroupName, Config));
+init_per_group(otp4394 = GroupName, Config) -> 
+    otp_4394_init(snmp_test_lib:init_group_top_dir(GroupName, Config));
 init_per_group(v2_inform = GroupName, Config) -> 
     init_v2_inform(snmp_test_lib:init_group_top_dir(GroupName, Config));
+init_per_group(v3_inform = GroupName, Config) -> 
+    init_v3_inform(snmp_test_lib:init_group_top_dir(GroupName, Config));
+init_per_group(multiple_reqs = GroupName, Config) -> 
+    init_mul(snmp_test_lib:init_group_top_dir(GroupName, Config));
 init_per_group(multiple_reqs_2 = GroupName, Config) -> 
     init_mul(snmp_test_lib:init_group_top_dir(GroupName, Config));
-init_per_group(multiple_reqs = GroupName, Config) -> 
+init_per_group(multiple_reqs_3 = GroupName, Config) -> 
     init_mul(snmp_test_lib:init_group_top_dir(GroupName, Config));
 init_per_group(test_multi_threaded = GroupName, Config) -> 
     init_mt(snmp_test_lib:init_group_top_dir(GroupName, Config));
@@ -284,8 +603,10 @@ init_per_group(mib_storage_varm_mnesia = GroupName, Config) ->
     init_varm_mib_storage_mnesia(snmp_test_lib:init_group_top_dir(GroupName, 
 								  Config));
 init_per_group(mib_storage_varm_dets = GroupName, Config) -> 
-    init_varm_mib_storage_dets(snmp_test_lib:init_group_top_dir(GroupName, 
-								Config));
+    ?DBG("init_per_group(mib_storage_varm_dets) -> entry with"
+	 "~n   Config: ~p", [Config]),    
+    init_varm_mib_storage_dets(
+      snmp_test_lib:init_group_top_dir(GroupName, Config));
 init_per_group(mib_storage_size_check_mnesia = GroupName, Config) -> 
     init_size_check_msm(snmp_test_lib:init_group_top_dir(GroupName, Config));
 init_per_group(mib_storage_size_check_dets = GroupName, Config) -> 
@@ -304,16 +625,20 @@ init_per_group(GroupName, Config) ->
 
 end_per_group(all_tcs, Config) ->
     finish_all(Config);
-end_per_group(otp_7157, Config) -> 
-	finish_otp_7157(Config);
-end_per_group(otp_4394, Config) -> 
-	finish_otp_4394(Config);
+end_per_group(otp7157, Config) -> 
+    otp_7157_finish(Config);
+end_per_group(otp4394, Config) -> 
+    otp_4394_finish(Config);
 end_per_group(v2_inform, Config) -> 
-	finish_v2_inform(Config);
-end_per_group(multiple_reqs_2, Config) -> 
-	finish_mul(Config);
+    finish_v2_inform(Config);
+end_per_group(v3_inform, Config) -> 
+    finish_v3_inform(Config);
 end_per_group(multiple_reqs, Config) -> 
 	finish_mul(Config);
+end_per_group(multiple_reqs_2, Config) -> 
+    finish_mul(Config);
+end_per_group(multiple_reqs_3, Config) -> 
+    finish_mul(Config);
 end_per_group(test_multi_threaded, Config) -> 
 	finish_mt(Config);
 end_per_group(test_v3, Config) -> 
@@ -353,9 +678,6 @@ init_per_testcase(Case, Config) when is_list(Config) ->
     ?DBG("init_per_testcase -> entry with"
 	 "~n   Config: ~p", [Config]),
 
-    p("Agent Info: "
-      "~n   ~p", [snmpa:info()]),
-
     init_per_testcase1(Case, Config).
 
 init_per_testcase1(otp8395 = Case, Config) when is_list(Config) ->
@@ -368,7 +690,7 @@ init_per_testcase1(otp9884 = Case, Config) when is_list(Config) ->
 	 "~n   Case:   ~p"
 	 "~n   Config: ~p", [Case, Config]),
     otp9884({init, init_per_testcase2(Case, Config)});
-init_per_testcase1(otp_7157_test = _Case, Config) when is_list(Config) ->
+init_per_testcase1(otp_7157 = _Case, Config) when is_list(Config) ->
     ?DBG("init_per_testcase1 -> entry with"
 	 "~n   Case:   ~p"
 	 "~n   Config: ~p", [_Case, Config]),
@@ -400,9 +722,6 @@ end_per_testcase(Case, Config) when is_list(Config) ->
     ?DBG("end_per_testcase -> entry with"
 	 "~n   Config: ~p", [Config]),
 
-    p("Agent Info: "
-      "~n   ~p", [snmpa:info()]),
-
     display_log(Config),
     
     end_per_testcase1(Case, Config).
@@ -454,20 +773,20 @@ init_per_testcase2(Case, Config) ->
      {sub_agent_top_dir, SubAgentTopDir}, 
      {manager_top_dir,   ManagerTopDir} | Config].
 
-end_per_testcase2(_Case, Config) ->
-    Config.
+%% end_per_testcase2(_Case, Config) ->
+%%     Config.
 
 
 cases() -> 
     [
-	{group, misc}, 
-	{group, test_v1}, 
-	{group, test_v2},
-	{group, test_v1_v2}, 
-	{group, test_v3},
-	{group, test_multi_threaded}, 
-	{group, mib_storage},
-	{group, tickets1}
+     {group, misc}, 
+     {group, test_v1}, 
+     {group, test_v2},
+     {group, test_v1_v2}, 
+     {group, test_v3},
+     {group, test_multi_threaded}, 
+     {group, mib_storage},
+     {group, tickets1}
     ].
 
 
@@ -553,7 +872,7 @@ delete_tables() ->
     mnesia:delete_table(kompissTable2),
     mnesia:delete_table(snmp_variables).
 
-%% Creation is done in runtime!
+%% Tables are created in runtime!
 delete_mib_storage_mnesia_tables() ->
     mnesia:delete_table(snmpa_mib_data),
     mnesia:delete_table(snmpa_mib_tree),
@@ -576,40 +895,89 @@ delete_mib_storage_mnesia_tables() ->
 %% versions as well, <base>_N.
 %%-----------------------------------------------------------------
 
-
-
-
-
-
-
-
-
+mib_storage_cases() ->
+    [
+     {group, mib_storage_ets}, 
+     {group, mib_storage_dets},
+     {group, mib_storage_mnesia},
+     {group, mib_storage_size_check_ets},
+     {group, mib_storage_size_check_dets},
+     {group, mib_storage_size_check_mnesia},
+     {group, mib_storage_varm_dets},
+     {group, mib_storage_varm_mnesia}
+    ].
+    
 mib_storage_ets_cases() -> 
-[mse_simple, mse_v1_processing, mse_big, mse_big2,
- mse_loop_mib, mse_api, mse_sa_register, mse_v1_trap,
- mse_sa_error, mse_next_across_sa, mse_undo,
- mse_standard_mib, mse_community_mib, mse_framework_mib,
- mse_target_mib, mse_notification_mib,
- mse_view_based_acm_mib, mse_sparse_table, mse_me_of,
- mse_mib_of].
+    [
+     mse_simple, 
+     mse_v1_processing, 
+     mse_big, 
+     mse_big2,
+     mse_loop_mib, 
+     mse_api, 
+     mse_sa_register, 
+     mse_v1_trap,
+     mse_sa_error, 
+     mse_next_across_sa, 
+     mse_undo,
+     mse_standard_mib, 
+     mse_community_mib, 
+     mse_framework_mib,
+     mse_target_mib, 
+     mse_notification_mib,
+     mse_view_based_acm_mib, 
+     mse_sparse_table, 
+     mse_me_of,
+     mse_mib_of
+    ].
 
 mib_storage_dets_cases() -> 
-[msd_simple, msd_v1_processing, msd_big, msd_big2,
- msd_loop_mib, msd_api, msd_sa_register, msd_v1_trap,
- msd_sa_error, msd_next_across_sa, msd_undo,
- msd_standard_mib, msd_community_mib, msd_framework_mib,
- msd_target_mib, msd_notification_mib,
- msd_view_based_acm_mib, msd_sparse_table, msd_me_of,
- msd_mib_of].
+    [
+     msd_simple, 
+     msd_v1_processing, 
+     msd_big, 
+     msd_big2,
+     msd_loop_mib, 
+     msd_api, 
+     msd_sa_register, 
+     msd_v1_trap,
+     msd_sa_error, 
+     msd_next_across_sa, 
+     msd_undo,
+     msd_standard_mib, 
+     msd_community_mib, 
+     msd_framework_mib,
+     msd_target_mib, 
+     msd_notification_mib,
+     msd_view_based_acm_mib, 
+     msd_sparse_table, 
+     msd_me_of,
+     msd_mib_of
+    ].
 
 mib_storage_mnesia_cases() -> 
-[msm_simple, msm_v1_processing, msm_big, msm_big2,
- msm_loop_mib, msm_api, msm_sa_register, msm_v1_trap,
- msm_sa_error, msm_next_across_sa, msm_undo,
- msm_standard_mib, msm_community_mib, msm_framework_mib,
- msm_target_mib, msm_notification_mib,
- msm_view_based_acm_mib, msm_sparse_table, msm_me_of,
- msm_mib_of].
+    [
+     msm_simple, 
+     msm_v1_processing, 
+     msm_big, 
+     msm_big2,
+     msm_loop_mib, 
+     msm_api, 
+     msm_sa_register, 
+     msm_v1_trap,
+     msm_sa_error, 
+     msm_next_across_sa, 
+     msm_undo,
+     msm_standard_mib, 
+     msm_community_mib, 
+     msm_framework_mib,
+     msm_target_mib, 
+     msm_notification_mib,
+     msm_view_based_acm_mib, 
+     msm_sparse_table, 
+     msm_me_of,
+     msm_mib_of
+    ].
 
 mse_size_check_cases() -> 
     [mse_size_check].
@@ -628,22 +996,27 @@ varm_mib_storage_mnesia_cases() ->
 
 init_mib_storage_ets(Config) when is_list(Config) ->
     ?LOG("init_mib_storage_ets -> entry", []),
-    MibStorage = {snmp_mib_storage,ets},
+    MibStorage = {mib_storage, [{module, snmpa_mib_storage_ets}]},
     init_ms(Config, [MibStorage]).
 
 init_mib_storage_dets(Config) when is_list(Config) ->
-    ?LOG("init_mib_storage_ets -> entry", []),
+    ?LOG("init_mib_storage_dets -> entry", []),
     ?line AgentDbDir = ?GCONF(agent_db_dir, Config),
-    MibStorage = {snmp_mib_storage, {dets, AgentDbDir}},
+    MibStorage = {mib_storage, [{module,  snmpa_mib_storage_dets}, 
+				{options, [{dir, AgentDbDir}]}]},
     init_ms(Config, [MibStorage]).
 
 init_mib_storage_mnesia(Config) when is_list(Config) ->
-    ?LOG("init_mib_storage_ets -> entry", []),
-    MibStorage = {snmp_mib_storage, {mnesia,[]}},
+    ?LOG("init_mib_storage_mnesia -> entry", []),
+    ?line AgentNode = ?GCONF(snmp_master, Config),
+    MibStorage = {mib_storage, [{module, snmpa_mib_storage_mnesia}, 
+				{options, [{nodes, [AgentNode]}]}]},
     init_ms(Config, [MibStorage]).
 
 init_ms(Config, Opts) when is_list(Config) ->
-    ?LOG("init_mib_storage_ets -> entry", []),
+    ?LOG("init_ms -> entry with"
+	 "~n   Config: ~p"
+	 "~n   Opts:   ~p", [Config, Opts]),
     ?line SaNode       = ?GCONF(snmp_sa, Config),
     ?line create_tables(SaNode),
     ?line AgentConfDir = ?GCONF(agent_conf_dir, Config),
@@ -651,23 +1024,26 @@ init_ms(Config, Opts) when is_list(Config) ->
     ?line Ip           = ?GCONF(ip, Config),
     ?line config([v1], MgrDir, AgentConfDir, 
 		 tuple_to_list(Ip), tuple_to_list(Ip)),
-    MasterAgentVerbosity = {snmp_master_agent_verbosity,   trace},
-    MibsVerbosity        = {snmp_mibserver_verbosity,      trace},
-    SymStoreVerbosity    = {snmp_symbolic_store_verbosity, trace},
+    MasterAgentVerbosity = {agent_verbosity, trace},
+    MibsVerbosity        = {mib_server,      [{verbosity, trace}]},
+    SymStoreVerbosity    = {symbolic_store,  [{verbosity, trace}]},
     Opts1 = [MasterAgentVerbosity, MibsVerbosity, SymStoreVerbosity | Opts],
     [{vsn, v1} | start_v1_agent(Config, Opts1)].
 
 init_size_check_mse(Config) when is_list(Config) ->
-    MibStorage = {snmp_mib_storage, ets},
+    MibStorage = {mib_storage, [{module, snmpa_mib_storage_ets}]},
     init_size_check_ms(Config, [MibStorage]).
 
 init_size_check_msd(Config) when is_list(Config) ->
     AgentDbDir = ?GCONF(agent_db_dir, Config),
-    MibStorage = {snmp_mib_storage, {dets, AgentDbDir}},
+    MibStorage = {mib_storage, [{module,  snmpa_mib_storage_dets}, 
+				{options, [{dir, AgentDbDir}]}]},
     init_size_check_ms(Config, [MibStorage]).
 
 init_size_check_msm(Config) when is_list(Config) ->
-    MibStorage = {snmp_mib_storage, {mnesia,[]}},
+    ?line AgentNode = ?GCONF(snmp_master, Config),
+    MibStorage = {mib_storage, [{module, snmpa_mib_storage_mnesia}, 
+				{options, [{nodes, [AgentNode]}]}]},
     init_size_check_ms(Config, [MibStorage]).
 
 init_size_check_ms(Config, Opts) when is_list(Config) ->
@@ -702,12 +1078,16 @@ init_varm_mib_storage_dets(Config) when is_list(Config) ->
     ?line Ip           = ?GCONF(ip, Config),
     ?line config([v1], MgrDir, AgentConfDir, 
 		 tuple_to_list(Ip), tuple_to_list(Ip)),
-    MibStorage           = {snmp_mib_storage, {dets, AgentDbDir}},
-    MasterAgentVerbosity = {snmp_master_agent_verbosity,   trace},
-    MibsVerbosity        = {snmp_mibserver_verbosity,      trace},
-    SymStoreVerbosity    = {snmp_symbolic_store_verbosity, trace},
-    Opts = [MibStorage,MasterAgentVerbosity,MibsVerbosity,SymStoreVerbosity],
-    [{vsn, v1}, {agent_opts,Opts} | Config].
+    MibStorage = {mib_storage, [{module,  snmpa_mib_storage_dets}, 
+				{options, [{dir, AgentDbDir}]}]},
+    MasterAgentVerbosity = {agent_verbosity, trace},
+    MibsVerbosity        = {mib_server,      [{verbosity, trace}]},
+    SymStoreVerbosity    = {symbolic_store,  [{verbosity, trace}]},
+    Opts = [MibStorage, 
+	    MasterAgentVerbosity, 
+	    MibsVerbosity, 
+	    SymStoreVerbosity],
+    [{vsn, v1}, {agent_opts, Opts} | Config].
 
 init_varm_mib_storage_mnesia(Config) when is_list(Config) ->
     ?LOG("init_varm_mib_storage_mnesia -> entry", []),
@@ -718,12 +1098,17 @@ init_varm_mib_storage_mnesia(Config) when is_list(Config) ->
     ?line Ip           = ?GCONF(ip, Config),
     ?line config([v1], MgrDir, AgentConfDir, 
 		 tuple_to_list(Ip), tuple_to_list(Ip)),
-    MibStorage           = {snmp_mib_storage,{mnesia,[]}},
-    MasterAgentVerbosity = {snmp_master_agent_verbosity,   trace},
-    MibsVerbosity        = {snmp_mibserver_verbosity,      trace},
-    SymStoreVerbosity    = {snmp_symbolic_store_verbosity, trace},
-    Opts = [MibStorage,MasterAgentVerbosity,MibsVerbosity,SymStoreVerbosity],
-    [{vsn, v1}, {agent_opts,Opts} | Config].
+    ?line AgentNode = ?GCONF(snmp_master, Config),
+    MibStorage = {mib_storage, [{module, snmpa_mib_storage_mnesia}, 
+				{options, [{nodes, [AgentNode]}]}]},
+    MasterAgentVerbosity = {agent_verbosity, trace},
+    MibsVerbosity        = {mib_server,      [{verbosity, trace}]},
+    SymStoreVerbosity    = {symbolic_store,  [{verbosity, trace}]},
+    Opts = [MibStorage,
+	    MasterAgentVerbosity,
+	    MibsVerbosity,
+	    SymStoreVerbosity],
+    [{vsn, v1}, {agent_opts, Opts} | Config].
 
 finish_mib_storage_ets(Config) when is_list(Config) ->
     ?LOG("finish_mib_storage_ets -> entry", []),
@@ -956,10 +1341,10 @@ varm_mib_start(Config) when is_list(Config) ->
 
     %% Perform the test(s)
     ?DBG("varm_mib_start -> perform the tests", []),
-    try_test(snmp_community_mib),
-    try_test(snmp_framework_mib),
-    try_test(snmp_target_mib),
-    try_test(snmp_notification_mib),
+    try_test(snmp_community_mib_test),
+    try_test(snmp_framework_mib_test),
+    try_test(snmp_target_mib_test),
+    try_test(snmp_notification_mib_test),
 
     %% Stop the agent (without deleting the stored files)
     ?DBG("varm_mib_start -> stop the agent", []),
@@ -1119,7 +1504,10 @@ finish_misc(Config) ->
     finish_v1(Config).
 
 misc_cases() -> 
-[app_info, info_test].
+    [
+     app_info, 
+     info_test
+    ].
 
 app_info(suite) -> [];
 app_info(Config) when is_list(Config) ->
@@ -1270,10 +1658,10 @@ v3_cases() ->
      subagent_3, 
      mnesia_3, 
      loop_mib_3, 
-     multiple_reqs_3,
+     {group, multiple_reqs_3},
      sa_register_3, 
      v3_trap, 
-     v3_inform, 
+     {group, v3_inform}, 
      sa_error_3,
      next_across_sa_3, 
      undo_3, 
@@ -1626,7 +2014,7 @@ change_target_addr_config(Config) when is_list(Config) ->
 
 dummy_manager_start(MA) ->
     ?DBG("dummy_manager_start -> entry",[]),
-    Pid = spawn(get(mgr_node), ?MODULE,dummy_manager_init,[self(),MA]),
+    Pid = spawn(get(mgr_node), ?MODULE, dummy_manager_init, [self(), MA]),
     ?DBG("dummy_manager_start -> Pid: ~p",[Pid]),
     await_dummy_manager_started(Pid).
 
@@ -1818,23 +2206,41 @@ mnesia_2(X) -> ?P(mnesia_2), mnesia(X).
 mnesia_3(X) -> ?P(mnesia_3), mnesia(X).
 
 
-
 mul_cases() -> 
-[mul_get, mul_get_err, mul_next, mul_next_err,
- mul_set_err].
-    
+    [
+     mul_get, 
+     mul_get_err, 
+     mul_next, 
+     mul_next_err,
+     mul_set,
+     mul_set_err
+    ].
+
 
-multiple_reqs_3(_X) -> 
-    {req, [], {conf, init_mul, mul_cases_3(), finish_mul}}.
+%% multiple_reqs_3(_X) -> 
+%%     {req, [], {conf, init_mul, mul_cases_3(), finish_mul}}.
 
 
 mul_cases_2() -> 
-[mul_get_2, mul_get_err_2, mul_next_2, mul_next_err_2,
- mul_set_err_2].
-    
+    [
+     mul_get_2, 
+     mul_get_err_2, 
+     mul_next_2, 
+     mul_next_err_2,
+     mul_set_2,
+     mul_set_err_2
+    ].
+
 
 mul_cases_3() ->
-    [mul_get_3, mul_get_err_3, mul_next_3, mul_next_err_3, mul_set_err_3].
+    [
+     mul_get_3, 
+     mul_get_err_3, 
+     mul_next_3, 
+     mul_next_err_3, 
+     mul_set_3,
+     mul_set_err_3
+    ].
     
 
 init_mul(Config) when is_list(Config) ->
@@ -2056,27 +2462,32 @@ v3_trap(Config) when is_list(Config) ->
     trap2(Config).
 
 
-v3_inform(_X) ->
-    %% v2_inform(X).
-    {req, [], {conf, init_v3_inform, [v3_inform_i], finish_v3_inform}}. 
+v3_inform_cases() ->
+    [
+     v3_inform_i
+    ].
+
+init_v3_inform(X) ->
+    init_v2_inform(X).
+
+finish_v3_inform(X) ->
+    finish_v2_inform(X).
+
 
 init_v2_inform(Config) when is_list(Config) ->
     _Dir = ?config(agent_conf_dir, Config),
     %% snmp_internal_mib:configure(Dir),
     Config.
 
-init_v3_inform(X) ->
-    init_v2_inform(X).
-
 finish_v2_inform(Config) when is_list(Config) ->
     _Dir = ?config(agent_conf_dir, Config),
     %% snmp_internal_mib:configure(Dir),
     Config.
 
-finish_v3_inform(X) ->
-    finish_v2_inform(X).
-
-
+v2_inform_cases() ->
+    [
+     v2_inform_i
+    ].
 
 v2_inform_i(suite) -> [];
 v2_inform_i(Config) when is_list(Config) ->
@@ -2176,7 +2587,7 @@ next_across_sa(Config) when is_list(Config) ->
     try_test(load_test_sa),
     
     ?P1("Testing next across subagent (endOfMibView from SA)..."),
-    try_test(next_across_sa),
+    try_test(next_across_sa_test),
 
     ?P1("Unloading mib (Klas1)"),
     snmpa:unload_mibs(SA, [MibDir ++ "Klas1"]),
@@ -2186,7 +2597,7 @@ next_across_sa(Config) when is_list(Config) ->
     ?P1("Starting another subagent (2) "),
     ?line {ok, SA2} = start_subagent(SaNode, ?klas1, "Klas1"),
     ?P1("Testing next across subagent (wrong prefix from SA)..."),
-    try_test(next_across_sa),
+    try_test(next_across_sa_test),
     
     ?P1("stop subagent (1)..."),
     stop_subagent(SA),
@@ -2315,6 +2726,15 @@ v3_processing(Config) when is_list(Config) ->
 %% report, which makes it in sync.  The notification-generating
 %% application times out, and send again.  This time it'll work.
 
+v3_security_cases() ->
+    [
+     v3_crypto_basic, 
+     v3_md5_auth, 
+     v3_sha_auth,
+     v3_des_priv
+    ].
+
+
 v3_crypto_basic(suite) -> [];
 v3_crypto_basic(_Config) ->
     ?P(v3_crypto_basic), 
@@ -2453,9 +2873,9 @@ v3_des_priv(Config) when is_list(Config) ->
 v3_sync(Funcs) ->
     ?DBG("v3_sync -> entry with Funcs: ~p",[Funcs]),
     g([[sysDescr, 0]]),
-    expect(432, report, [{?usmStatsNotInTimeWindows_instance, any}]),
+    ?expect2(report, [{?usmStatsNotInTimeWindows_instance, any}]),
     g([[sysDescr, 0]]),
-    expect(433, [{[sysDescr,0], any}]),
+    ?expect1([{[sysDescr,0], any}]),
     lists:foreach(fun({Func, Args}) -> apply(?MODULE, Func, Args) end, Funcs).
 
 v3_inform_sync(MA) ->
@@ -2466,9 +2886,9 @@ v3_inform_sync(MA) ->
     ?DBG("v3_sync -> wait some time: ",[]),
     ?SLEEP(20000), % more than 1500*10 in target_addr.conf
     ?DBG("v3_sync -> await response",[]),
-    ?line expect(1, {inform, true},
-		 [{[sysUpTime, 0], any},
-		  {[snmpTrapOID, 0], ?system ++ [0,1]}]).
+    ?line ?expect2({inform, true},
+		   [{[sysUpTime, 0], any},
+		    {[snmpTrapOID, 0], ?system ++ [0,1]}]).
 
 
 v2_caps(suite) -> [];
@@ -2484,11 +2904,11 @@ v2_caps_3(X) -> ?P(v2_caps_3), v2_caps(X).
 v2_caps_i(Node) ->
     ?line Idx = rpc:call(Node, snmp, add_agent_caps, [[1,2,3,4,5], "test cap"]),
     g([[sysORID, Idx], [sysORDescr, Idx]]),
-    ?line expect(1, [{[sysORID, Idx], [1,2,3,4,5]},
-		     {[sysORDescr, Idx], "test cap"}]),
+    ?line ?expect1([{[sysORID, Idx], [1,2,3,4,5]}, 
+		    {[sysORDescr, Idx], "test cap"}]),
     ?line rpc:call(Node, snmp, del_agent_caps, [Idx]),
     g([[sysORID, Idx]]),
-    ?line expect(2, [{[sysORID, Idx], noSuchInstance}]).
+    ?line ?expect1([{[sysORID, Idx], noSuchInstance}]).
     
 
 %% Req. Test2
@@ -2504,86 +2924,86 @@ v1_proc() ->
 v1_get_p() ->
     %% 4.1.2:1
     g([[test2]]),
-    ?line expect(10, noSuchName, 1, [{[test2], 'NULL'}]),
+    ?line ?expect3(noSuchName, 1, [{[test2], 'NULL'}]),
     g([[tDescr]]),
-    ?line expect(11, noSuchName, 1, [{[tDescr], 'NULL'}]),
+    ?line ?expect3(noSuchName, 1, [{[tDescr], 'NULL'}]),
     g([[tDescr2,0]]),
-    ?line expect(12, noSuchName, 1, [{[tDescr2,0], 'NULL'}]),
+    ?line ?expect3(noSuchName, 1, [{[tDescr2,0], 'NULL'}]),
     g([[tDescr3,0]]),
-    ?line expect(131, noSuchName, 1, [{[tDescr3,0], 'NULL'}]),
+    ?line ?expect3(noSuchName, 1, [{[tDescr3,0], 'NULL'}]),
     g([[tDescr4,0]]),
-    ?line expect(132, noSuchName, 1, [{[tDescr4,0], 'NULL'}]),
+    ?line ?expect3(noSuchName, 1, [{[tDescr4,0], 'NULL'}]),
     g([[sysDescr, 0], [tDescr,0]]), % Outside mibview
-    ?line expect(14, noSuchName, 2, [{[sysDescr, 0], 'NULL'},
-				     {[tDescr,0], 'NULL'}]),
+    ?line ?expect3(noSuchName, 2, [{[sysDescr, 0], 'NULL'},
+				   {[tDescr,0], 'NULL'}]),
     g([[sysDescr,3]]),
-    ?line expect(15, noSuchName, 1, [{[sysDescr, 3], 'NULL'}]),
+    ?line ?expect3(noSuchName, 1, [{[sysDescr, 3], 'NULL'}]),
     
     %% 4.1.2:2
     g([[tTable]]),
-    ?line expect(20, noSuchName, 1, [{[tTable], 'NULL'}]),
+    ?line ?expect3(noSuchName, 1, [{[tTable], 'NULL'}]),
     g([[tEntry]]),
-    ?line expect(21, noSuchName, 1, [{[tEntry], 'NULL'}]),
+    ?line ?expect3(noSuchName, 1, [{[tEntry], 'NULL'}]),
     
     %% 4.1.2:3
     g([[tTooBig, 0]]),
-    ?line expect(30, tooBig, 0, [{[tTooBig, 0], 'NULL'}]),
+    ?line ?expect3(tooBig, 0, [{[tTooBig, 0], 'NULL'}]),
 
     %% 4.1.2:4
     g([[tGenErr1, 0]]),
-    ?line expect(40, genErr, 1, [{[tGenErr1, 0], 'NULL'}]),
+    ?line ?expect3(genErr, 1, [{[tGenErr1, 0], 'NULL'}]),
     g([[tGenErr2, 0]]),
-    ?line expect(41, genErr, 1, [{[tGenErr2, 0], 'NULL'}]),
+    ?line ?expect3(genErr, 1, [{[tGenErr2, 0], 'NULL'}]),
     g([[sysDescr, 0], [tGenErr3, 0]]),
-    ?line expect(42, genErr, 2, [{[sysDescr, 0], 'NULL'},
-				 {[tGenErr3, 0], 'NULL'}]).
+    ?line ?expect3(genErr, 2, [{[sysDescr, 0], 'NULL'},
+			       {[tGenErr3, 0], 'NULL'}]).
     
     
 v1_get_next_p() ->
     %% 4.1.3:1
     gn([[1,3,7,1]]),
-    ?line expect(10, noSuchName, 1, [{[1,3,7,1], 'NULL'}]),
+    ?line ?expect3(noSuchName, 1, [{[1,3,7,1], 'NULL'}]),
     gn([[tDescr2]]),
-    ?line expect(11, tooBig, 0, any),
+    ?line ?expect3(tooBig, 0, any),
     
     %% 4.1.3:2
     gn([[tTooBig]]),
     io:format("We currently don't handle tooBig correct!!!\n"),
-%    ?line expect(20, tooBig, 0, [{[tTooBig], 'NULL'}]),
-    ?line expect(20, tooBig, 0, any),
+%    ?line ?expect3(tooBig, 0, [{[tTooBig], 'NULL'}]),
+    ?line ?expect3(tooBig, 0, any),
 
     %% 4.1.3:3
     gn([[tGenErr1]]),
 %    ?line expect(40, genErr, 1, [{[tGenErr1], 'NULL'}]),
-    ?line expect(40, genErr, 1, any),
+    ?line ?expect3(genErr, 1, any),
     gn([[tGenErr2]]),
-%    ?line expect(41, genErr, 1, [{[tGenErr2], 'NULL'}]),
-    ?line expect(41, genErr, 1, any),
+%    ?line ?expect3(genErr, 1, [{[tGenErr2], 'NULL'}]),
+    ?line ?expect3(genErr, 1, any),
     gn([[sysDescr], [tGenErr3]]),
-%    ?line expect(42, genErr, 2, [{[sysDescr], 'NULL'},
+%    ?line ?expect3(genErr, 2, [{[sysDescr], 'NULL'},
 %				 {[tGenErr3], 'NULL'}]).
-    ?line expect(42, genErr, 2, any).
+    ?line ?expect3(genErr, 2, any).
     
 v1_set_p() ->
     %% 4.1.5:1
     s([{[1,3,7,0], i, 4}]),
-    ?line expect(10, noSuchName, 1, [{[1,3,7,0], 4}]),
+    ?line ?expect3(noSuchName, 1, [{[1,3,7,0], 4}]),
     s([{[tDescr,0], s, "outside mibview"}]),
-    ?line expect(11, noSuchName, 1, [{[tDescr,0], "outside mibview"}]),
+    ?line ?expect3(noSuchName, 1, [{[tDescr,0], "outside mibview"}]),
     s([{[tDescr3,0], s, "read-only"}]),
-    ?line expect(12, noSuchName, 1, [{[tDescr3,0], "read-only"}]),
+    ?line ?expect3(noSuchName, 1, [{[tDescr3,0], "read-only"}]),
     s([{[tDescr3], s, "noSuchObject"}]),
-    ?line expect(13, noSuchName, 1, [{[tDescr3], "noSuchObject"}]),
+    ?line ?expect3(noSuchName, 1, [{[tDescr3], "noSuchObject"}]),
     s([{[tDescr3,1], s, "noSuchInstance"}]),
-    ?line expect(14, noSuchName, 1, [{[tDescr3,1], "noSuchInstance"}]),
+    ?line ?expect3(noSuchName, 1, [{[tDescr3,1], "noSuchInstance"}]),
     s([{[tDescr2,0], s, "inconsistentName"}]),
-    ?line expect(15, noSuchName, 1, [{[tDescr2,0], "inconsistentName"}]),
+    ?line ?expect3(noSuchName, 1, [{[tDescr2,0], "inconsistentName"}]),
 
     %% 4.1.5:2
     s([{[tDescr2, 0], i, 4}]),
-    ?line expect(20, badValue, 1, [{[tDescr2, 0], 4}]),
+    ?line ?expect3(badValue, 1, [{[tDescr2, 0], 4}]),
     s([{[tDescr2, 0], s, "badValue"}]),
-    ?line expect(21, badValue, 1, [{[tDescr2, 0], "badValue"}]),
+    ?line ?expect3(badValue, 1, [{[tDescr2, 0], "badValue"}]),
     
     %% 4.1.5:3
     %% The standard is quite incorrect here.  The resp pdu was too big.  In
@@ -2593,14 +3013,14 @@ v1_set_p() ->
     %% of the std-like original value.
     s([{[tTooBig, 0], s, ?tooBigStr}]),
     %% according to std:
-%    ?line expect(30, tooBig, 0, [{[tTooBig, 0], ?tooBigStr}]),
-    ?line expect(30, tooBig, 0, [{[tTooBig, 0], 'NULL'}]),
+%    ?line ?expect3(tooBig, 0, [{[tTooBig, 0], ?tooBigStr}]),
+    ?line ?expect3(tooBig, 0, [{[tTooBig, 0], 'NULL'}]),
     
     %% 4.1.5:4
     s([{[tDescr2, 0], s, "is_set_ok_fail"}]),
-    ?line expect(40, genErr, 1, [{[tDescr2, 0], "is_set_ok_fail"}]),
+    ?line ?expect3(genErr, 1, [{[tDescr2, 0], "is_set_ok_fail"}]),
     s([{[tDescr2, 0], s, "commit_fail"}]),
-    ?line expect(41, genErr, 1, [{[tDescr2, 0], "commit_fail"}]).
+    ?line ?expect3(genErr, 1, [{[tDescr2, 0], "commit_fail"}]).
     
 %% Req. Test2
 v2_proc() ->
@@ -2616,183 +3036,183 @@ v2_get_p() ->
     %% 4.2.1:2
     ?DBG("v2_get_p -> entry",[]),
     g([[test2]]),
-    ?line expect(10, [{[test2], noSuchObject}]),
+    ?line ?expect1([{[test2], noSuchObject}]),
     g([[tDescr]]),
-    ?line expect(11, [{[tDescr], noSuchObject}]),
+    ?line ?expect1([{[tDescr], noSuchObject}]),
     g([[tDescr4,0]]),
-    ?line expect(12, [{[tDescr4,0], noSuchObject}]),
+    ?line ?expect1([{[tDescr4,0], noSuchObject}]),
     g([[sysDescr, 0], [tDescr,0]]), % Outside mibview
-    ?line expect(13, [{[sysDescr,0], "Erlang SNMP agent"},
-		      {[tDescr,0], noSuchObject}]),
+    ?line ?expect1([{[sysDescr,0], "Erlang SNMP agent"},
+		    {[tDescr,0], noSuchObject}]),
     g([[tTable]]),
-    ?line expect(14, [{[tTable], noSuchObject}]),
+    ?line ?expect1([{[tTable], noSuchObject}]),
     g([[tEntry]]),
-    ?line expect(15, [{[tEntry], noSuchObject}]),
+    ?line ?expect1([{[tEntry], noSuchObject}]),
     
     %% 4.2.1:3
     g([[tDescr2,0]]), %% instrum ret noSuchName!!!
-    ?line expect(20, [{[tDescr2,0], noSuchInstance}]), 
+    ?line ?expect1([{[tDescr2,0], noSuchInstance}]), 
     g([[tDescr3,0]]),
-    ?line expect(21, [{[tDescr3,0], noSuchInstance}]),
+    ?line ?expect1([{[tDescr3,0], noSuchInstance}]),
     g([[sysDescr,3]]),
-    ?line expect(22, [{[sysDescr, 3], noSuchInstance}]),
+    ?line ?expect1([{[sysDescr, 3], noSuchInstance}]),
     g([[tIndex,1]]),
-    ?line expect(23, [{[tIndex, 1], noSuchInstance}]),
+    ?line ?expect1([{[tIndex, 1], noSuchInstance}]),
 
     %% 4.2.1 - any other error: genErr
     g([[tGenErr1, 0]]),
-    ?line expect(30, genErr, 1, [{[tGenErr1, 0], 'NULL'}]),
+    ?line ?expect3(genErr, 1, [{[tGenErr1, 0], 'NULL'}]),
     g([[tGenErr2, 0]]),
-    ?line expect(31, genErr, 1, [{[tGenErr2, 0], 'NULL'}]),
+    ?line ?expect3(genErr, 1, [{[tGenErr2, 0], 'NULL'}]),
     g([[sysDescr, 0], [tGenErr3, 0]]),
-    ?line expect(32, genErr, 2, [{[sysDescr, 0], 'NULL'},
-				 {[tGenErr3, 0], 'NULL'}]),
+    ?line ?expect3(genErr, 2, [{[sysDescr, 0], 'NULL'},
+			       {[tGenErr3, 0], 'NULL'}]),
     
     %% 4.2.1 - tooBig
     g([[tTooBig, 0]]),
-    ?line expect(40, tooBig, 0, []).
+    ?line ?expect3(tooBig, 0, []).
 
     
 v2_get_next_p() ->
     %% 4.2.2:2
     ?DBG("v2_get_next_p -> entry",[]),
     gn([[1,3,7,1]]),
-    ?line expect(10, [{[1,3,7,1], endOfMibView}]),
+    ?line ?expect1([{[1,3,7,1], endOfMibView}]),
     gn([[sysDescr], [1,3,7,1]]),
-    ?line expect(11, [{[sysDescr, 0], "Erlang SNMP agent"},
-		      {[1,3,7,1], endOfMibView}]),
+    ?line ?expect1([{[sysDescr, 0], "Erlang SNMP agent"},
+		    {[1,3,7,1], endOfMibView}]),
     gn([[tCnt2, 1]]),
-    ?line expect(12, [{[tCnt2,2], 100}]),
+    ?line ?expect1([{[tCnt2,2], 100}]),
     gn([[tCnt2, 2]]),
-    ?line expect(12, [{[tCnt2,2], endOfMibView}]),
+    ?line ?expect1([{[tCnt2,2], endOfMibView}]),
     
     %% 4.2.2 - any other error: genErr
     gn([[tGenErr1]]),
-    ?line expect(20, genErr, 1, [{[tGenErr1], 'NULL'}]),
+    ?line ?expect3(genErr, 1, [{[tGenErr1], 'NULL'}]),
     gn([[tGenErr2]]),
-    ?line expect(21, genErr, 1, [{[tGenErr2], 'NULL'}]),
+    ?line ?expect3(genErr, 1, [{[tGenErr2], 'NULL'}]),
     gn([[sysDescr], [tGenErr3]]),
-    ?line expect(22, genErr, 2, [{[sysDescr], 'NULL'},
-				 {[tGenErr3], 'NULL'}]),
+    ?line ?expect3(genErr, 2, [{[sysDescr], 'NULL'},
+			       {[tGenErr3], 'NULL'}]),
     
     %% 4.2.2 - tooBig
     gn([[tTooBig]]),
-    ?line expect(20, tooBig, 0, []).
+    ?line ?expect3(tooBig, 0, []).
 
 v2_get_bulk_p() ->
     %% 4.2.3
     ?DBG("v2_get_bulk_p -> entry",[]),
     gb(1, 1, []),
-    ?line expect(10, []),
+    ?line ?expect1([]),
     gb(-1, 1, []),
-    ?line expect(11, []),
+    ?line ?expect1([]),
     gb(-1, -1, []),
-    ?line expect(12, []),
+    ?line ?expect1([]),
     gb(-1, -1, []),
-    ?line expect(13, []),
+    ?line ?expect1([]),
     gb(2, 0, [[sysDescr], [1,3,7,1]]),
-    ?line expect(14, [{[sysDescr, 0], "Erlang SNMP agent"},
-		      {[1,3,7,1], endOfMibView}]),
+    ?line ?expect1([{[sysDescr, 0], "Erlang SNMP agent"},
+		    {[1,3,7,1], endOfMibView}]),
     gb(1, 2, [[sysDescr], [1,3,7,1]]),
-    ?line expect(15, [{[sysDescr, 0], "Erlang SNMP agent"},
-		      {[1,3,7,1], endOfMibView}]),
+    ?line ?expect1([{[sysDescr, 0], "Erlang SNMP agent"},
+		    {[1,3,7,1], endOfMibView}]),
     gb(0, 2, [[sysDescr], [1,3,7,1]]),
-    ?line expect(16, [{[sysDescr, 0], "Erlang SNMP agent"},
-		      {[1,3,7,1], endOfMibView},
-		      {[sysObjectID, 0], [1,2,3]},
-		      {[1,3,7,1], endOfMibView}]),
+    ?line ?expect1([{[sysDescr, 0], "Erlang SNMP agent"},
+		    {[1,3,7,1], endOfMibView},
+		    {[sysObjectID, 0], [1,2,3]},
+		    {[1,3,7,1], endOfMibView}]),
     
     gb(2, 2, [[sysDescr], [1,3,7,1], [sysDescr], [1,3,7,1]]),
-    ?line expect(17, [{[sysDescr, 0], "Erlang SNMP agent"},
-		      {[1,3,7,1], endOfMibView},
-		      {[sysDescr, 0], "Erlang SNMP agent"},		      
-		      {[1,3,7,1], endOfMibView},
-		      {[sysObjectID, 0], [1,2,3]},
-		      {[1,3,7,1], endOfMibView}]),
+    ?line ?expect1([{[sysDescr, 0], "Erlang SNMP agent"},
+		    {[1,3,7,1], endOfMibView},
+		    {[sysDescr, 0], "Erlang SNMP agent"},		      
+		    {[1,3,7,1], endOfMibView},
+		    {[sysObjectID, 0], [1,2,3]},
+		    {[1,3,7,1], endOfMibView}]),
     
     gb(1, 2, [[sysDescr], [sysDescr], [tTooBig]]),
-    ?line expect(18, [{[sysDescr, 0], "Erlang SNMP agent"},
-		      {[sysDescr, 0], "Erlang SNMP agent"}]),
+    ?line ?expect1([{[sysDescr, 0], "Erlang SNMP agent"},
+		    {[sysDescr, 0], "Erlang SNMP agent"}]),
     
     gb(1,12, [[tDescr2], [sysDescr]]), % next one after tDescr2 is tTooBig.
-    ?line expect(19, []),
+    ?line ?expect1([]),
     
     gb(2,2, [[sysDescr], [sysObjectID], [tGenErr1], [sysDescr]]),
-    ?line expect(20, genErr, 3, [{[sysDescr], 'NULL'},
-				 {[sysObjectID], 'NULL'},
-				 {[tGenErr1], 'NULL'},
-				 {[sysDescr], 'NULL'}]),
+    ?line ?expect3(genErr, 3, [{[sysDescr], 'NULL'},
+			       {[sysObjectID], 'NULL'},
+			       {[tGenErr1], 'NULL'},
+			       {[sysDescr], 'NULL'}]),
     gb(0, 2, [[tCnt2, 1]]),
-    ?line expect(21, [{[tCnt2,2], 100},
-		      {[tCnt2,2], endOfMibView}]).
+    ?line ?expect1([{[tCnt2,2], 100},
+		    {[tCnt2,2], endOfMibView}]).
     
     
 v2_set_p() ->
     %% 4.2.5:1
     ?DBG("v2_set_p -> entry",[]),
     s([{[1,3,7,0], i, 4}]),
-    ?line expect(10, noAccess, 1, [{[1,3,7,0], 4}]),
+    ?line ?expect3(noAccess, 1, [{[1,3,7,0], 4}]),
     s([{[tDescr,0], s, "outside mibview"}]),
-    ?line expect(11, noAccess, 1, [{[tDescr,0], "outside mibview"}]),
+    ?line ?expect3(noAccess, 1, [{[tDescr,0], "outside mibview"}]),
     
     %% 4.2.5:2
     s([{[1,3,6,1,0], s, "noSuchObject"}]),
-    ?line expect(20, notWritable, 1, [{[1,3,6,1,0], "noSuchObject"}]),
+    ?line ?expect3(notWritable, 1, [{[1,3,6,1,0], "noSuchObject"}]),
     
     %% 4.2.5:3
     s([{[tDescr2, 0], i, 4}]),
-    ?line expect(30, wrongType, 1, [{[tDescr2, 0], 4}]),
+    ?line ?expect3(wrongType, 1, [{[tDescr2, 0], 4}]),
     s([{[tDescr2, 0], s, "badValue"}]),
-    ?line expect(31, badValue, 1, [{[tDescr2, 0], "badValue"}]),
+    ?line ?expect3(badValue, 1, [{[tDescr2, 0], "badValue"}]),
 
     %% 4.2.5:4
     s([{[tStr, 0], s, ""}]),
-    ?line expect(40, wrongLength, 1, [{[tStr, 0], ""}]),
+    ?line ?expect3(wrongLength, 1, [{[tStr, 0], ""}]),
     s([{[tStr, 0], s, "12345"}]),
-    ?line expect(40, wrongLength, 1, [{[tStr, 0], "12345"}]),
+    ?line ?expect3(wrongLength, 1, [{[tStr, 0], "12345"}]),
     
     %% 4.2.5:5 - N/A
 
     %% 4.2.5:6
     s([{[tInt1, 0], i, 0}]),
-    ?line expect(60, wrongValue, 1, [{[tInt1, 0], 0}]),
+    ?line ?expect3(wrongValue, 1, [{[tInt1, 0], 0}]),
     s([{[tInt1, 0], i, 5}]),
-    ?line expect(61, wrongValue, 1, [{[tInt1, 0], 5}]),
+    ?line ?expect3(wrongValue, 1, [{[tInt1, 0], 5}]),
     s([{[tInt2, 0], i, 0}]),
-    ?line expect(62, wrongValue, 1, [{[tInt2, 0], 0}]),
+    ?line ?expect3(wrongValue, 1, [{[tInt2, 0], 0}]),
     s([{[tInt2, 0], i, 5}]),
-    ?line expect(63, wrongValue, 1, [{[tInt2, 0], 5}]),
+    ?line ?expect3(wrongValue, 1, [{[tInt2, 0], 5}]),
     s([{[tInt3, 0], i, 5}]),
-    ?line expect(64, wrongValue, 1, [{[tInt3, 0], 5}]),
+    ?line ?expect3(wrongValue, 1, [{[tInt3, 0], 5}]),
     
     %% 4.2.5:7
     s([{[tDescrX, 1, 1], s, "noCreation"}]),
-    ?line expect(70, noCreation, 1, [{[tDescrX, 1, 1], "noCreation"}]),
+    ?line ?expect3(noCreation, 1, [{[tDescrX, 1, 1], "noCreation"}]),
 
     %% 4.2.5:8
     s([{[tDescrX, 1, 2], s, "inconsistentName"}]),
-    ?line expect(80, inconsistentName, 1,
-		 [{[tDescrX, 1, 2], "inconsistentName"}]),
+    ?line ?expect3(inconsistentName, 1,
+		   [{[tDescrX, 1, 2], "inconsistentName"}]),
     
     %% 4.2.5:9
     s([{[tCnt, 1, 2], i, 5}]),
-    ?line expect(90, notWritable, 1, [{[tCnt, 1, 2], 5}]),
+    ?line ?expect3(notWritable, 1, [{[tCnt, 1, 2], 5}]),
     s([{[tDescr3,0], s, "read-only"}]),
-    ?line expect(90, notWritable, 1, [{[tDescr3,0], "read-only"}]),
+    ?line ?expect3(notWritable, 1, [{[tDescr3,0], "read-only"}]),
 
     %% 4.2.5:10
     s([{[tDescr2,0], s, "inconsistentValue"}]),
-    ?line expect(100, inconsistentValue, 1,
-		 [{[tDescr2,0], "inconsistentValue"}]),
+    ?line ?expect3(inconsistentValue, 1,
+		   [{[tDescr2,0], "inconsistentValue"}]),
     
     %% 4.2.5:11
     s([{[tDescr2,0], s, "resourceUnavailable"}]),
-    ?line expect(110, resourceUnavailable, 1,
-		 [{[tDescr2,0],"resourceUnavailable"}]),
+    ?line ?expect3(resourceUnavailable, 1,
+		   [{[tDescr2,0],"resourceUnavailable"}]),
     
     %% 4.2.5:12
     s([{[tDescr2, 0], s, "is_set_ok_fail"}]),
-    ?line expect(120, genErr, 1, [{[tDescr2, 0], "is_set_ok_fail"}]).
+    ?line ?expect3(genErr, 1, [{[tDescr2, 0], "is_set_ok_fail"}]).
     
     %% commitFailed and undoFailed is tested by the 'undo' case.
     
@@ -2807,101 +3227,101 @@ table_test() ->
     Key1c4 = [intCommunityAccess,get(mip),is("public")],
     EndKey = [intCommunityEntry,[9],get(mip),is("public")],
     gn([[intCommunityEntry]]),
-    ?line expect(7, [{Key1c3, 2}]),
+    ?line ?expect1([{Key1c3, 2}]),
     gn([[intCommunityTable]]),
-    ?line expect(71, [{Key1c3, 2}]),
+    ?line ?expect1([{Key1c3, 2}]),
     gn([[community]]),
-    ?line expect(72, [{Key1c3, 2}]),
+    ?line ?expect1([{Key1c3, 2}]),
     gn([[otpSnmpeaMIB]]),
-    ?line expect(73, [{Key1c3, 2}]),
+    ?line ?expect1([{Key1c3, 2}]),
     gn([[ericsson]]),
-    ?line expect(74, [{Key1c3, 2}]),
+    ?line ?expect1([{Key1c3, 2}]),
     gn([Key1c3]),
-    ?line expect(8, [{Key2c3, 2}]),
+    ?line ?expect1([{Key2c3, 2}]),
     gn([Key2c3]),
-    ?line expect(9, [{Key1c4, 2}]),
+    ?line ?expect1([{Key1c4, 2}]),
     gn([EndKey]),
     AgentIp = [intAgentIpAddress,0], 
-    ?line expect(10, [{AgentIp, any}]),
+    ?line ?expect1([{AgentIp, any}]),
     g([Key1c3]),
-    ?line expect(11, [{Key1c3, 2}]),
+    ?line ?expect1([{Key1c3, 2}]),
     g([EndKey]),
-    ?line ?v1_2(expect(12, noSuchName, 1, any),
-		expect(12, [{EndKey, noSuchObject}])),
+    ?line ?v1_2(?expect3(noSuchName, 1, any),
+		?expect1([{EndKey, noSuchObject}])),
 
     io:format("Testing row creation/deletion on communityTable...~n"),
     NewKeyc3 = [intCommunityViewIndex,get(mip),is("test")],
     NewKeyc4 = [intCommunityAccess,get(mip),is("test")],
     NewKeyc5 = [intCommunityStatus,get(mip),is("test")],
     s([{NewKeyc5, ?createAndGo}]),
-    ?line expect(14, ?v1_2(badValue, inconsistentValue), 1,any),
+    ?line ?expect3(?v1_2(badValue, inconsistentValue), 1, any),
     s([{NewKeyc5, ?createAndGo}, {NewKeyc3, 2}, {NewKeyc4, 2}]),
-    ?line expect(15, [{NewKeyc5, ?createAndGo},{NewKeyc3, 2}, {NewKeyc4, 2}]),
+    ?line ?expect1([{NewKeyc5, ?createAndGo},{NewKeyc3, 2}, {NewKeyc4, 2}]),
     g([NewKeyc4]),
-    ?line expect(16, [{NewKeyc4, 2}]),
+    ?line ?expect1([{NewKeyc4, 2}]),
     s([{NewKeyc5, ?destroy}]),
-    ?line expect(17, [{NewKeyc5, ?destroy}]),
+    ?line ?expect1([{NewKeyc5, ?destroy}]),
     s([{NewKeyc4, 2}]),
-    ?line expect(18, ?v1_2(noSuchName, inconsistentName), 1,[{NewKeyc4, 2}]),
+    ?line ?expect3(?v1_2(noSuchName, inconsistentName), 1, [{NewKeyc4, 2}]),
     s([{NewKeyc5, ?createAndWait}]),
-    ?line expect(19, [{NewKeyc5, ?createAndWait}]),
+    ?line ?expect1([{NewKeyc5, ?createAndWait}]),
     g([NewKeyc5]),
-    ?line expect(20, [{NewKeyc5, ?notReady}]),
+    ?line ?expect1([{NewKeyc5, ?notReady}]),
     s([{NewKeyc4, 2}]),
-    ?line expect(21, [{NewKeyc4, 2}]),
+    ?line ?expect1([{NewKeyc4, 2}]),
     g([NewKeyc5]),
-    ?line expect(22, [{NewKeyc5, ?notReady}]),
+    ?line ?expect1([{NewKeyc5, ?notReady}]),
     s([{NewKeyc3, 2}]),
-    ?line expect(23, [{NewKeyc3, 2}]),
+    ?line ?expect1([{NewKeyc3, 2}]),
     g([NewKeyc5]),
-    ?line expect(24, [{NewKeyc5, ?notInService}]),
+    ?line ?expect1([{NewKeyc5, ?notInService}]),
     s([{NewKeyc5, ?active}]),
-    ?line expect(25, [{NewKeyc5, ?active}]),
+    ?line ?expect1([{NewKeyc5, ?active}]),
     s([{NewKeyc5, ?destroy}]),
-    ?line expect(26, [{NewKeyc5, ?destroy}]),
+    ?line ?expect1([{NewKeyc5, ?destroy}]),
     s([{NewKeyc3, 3}]),
-    ?line expect(27, ?v1_2(noSuchName, inconsistentName), 1,[{NewKeyc3, 3}]),
-    otp_1128().
+    ?line ?expect3(?v1_2(noSuchName, inconsistentName), 1, [{NewKeyc3, 3}]),
+    otp_1128_test().
 
 %% Req. system group
 simple_standard_test() ->
     ?DBG("simple_standard_test -> entry",[]),
     gn([[1,1]]),
-    ?line expect(1, [{[sysDescr,0], "Erlang SNMP agent"}]),
+    ?line ?expect1([{[sysDescr,0], "Erlang SNMP agent"}]),
     gn([[1,3]]),
-    ?line expect(11, [{[sysDescr,0], "Erlang SNMP agent"}]),
+    ?line ?expect1([{[sysDescr,0], "Erlang SNMP agent"}]),
     gn([[1,3,6]]),
-    ?line expect(12, [{[sysDescr,0], "Erlang SNMP agent"}]),
+    ?line ?expect1([{[sysDescr,0], "Erlang SNMP agent"}]),
     gn([[1,3,6,1]]),
-    ?line expect(13, [{[sysDescr,0], "Erlang SNMP agent"}]),
+    ?line ?expect1([{[sysDescr,0], "Erlang SNMP agent"}]),
     gn([[1,3,6,1,2]]),
-    ?line expect(14, [{[sysDescr,0], "Erlang SNMP agent"}]),
+    ?line ?expect1([{[sysDescr,0], "Erlang SNMP agent"}]),
     gn([[1,3,6,1,2,1]]),
-    ?line expect(15, [{[sysDescr,0], "Erlang SNMP agent"}]),
+    ?line ?expect1([{[sysDescr,0], "Erlang SNMP agent"}]),
     gn([[1,3,6,1,2,1,1]]),
-    ?line expect(16, [{[sysDescr,0], "Erlang SNMP agent"}]),
+    ?line ?expect1([{[sysDescr,0], "Erlang SNMP agent"}]),
     gn([[sysDescr]]),
-    ?line expect(17, [{[sysDescr,0], "Erlang SNMP agent"}]),
+    ?line ?expect1([{[sysDescr,0], "Erlang SNMP agent"}]),
     g([[sysDescr,0]]),
-    ?line expect(2, [{[sysDescr,0], "Erlang SNMP agent"}]),
+    ?line ?expect1([{[sysDescr,0], "Erlang SNMP agent"}]),
     g([[sysDescr]]),
-    ?line ?v1_2(expect(3, noSuchName, 1, any),
-		expect(3, [{[sysDescr], noSuchObject}])),
+    ?line ?v1_2(?expect3(noSuchName, 1, any),
+		?expect1([{[sysDescr], noSuchObject}])),
     g([[1,6,7,0]]),
-    ?line ?v1_2(expect(41, noSuchName, 1, any),
-		expect(3, [{[1,6,7,0], noSuchObject}])),
+    ?line ?v1_2(?expect3(noSuchName, 1, any),
+		?expect1([{[1,6,7,0], noSuchObject}])),
     gn([[1,13]]),
-    ?line ?v1_2(expect(4, noSuchName,1, any),
-		expect(4, [{[1,13], endOfMibView}])),
+    ?line ?v1_2(?expect3(noSuchName,1, any),
+		?expect1([{[1,13], endOfMibView}])),
     s([{[sysLocation, 0], "new_value"}]),
-    ?line expect(5, [{[sysLocation, 0], "new_value"}]),
+    ?line ?expect1([{[sysLocation, 0], "new_value"}]),
     g([[sysLocation, 0]]),
-    ?line expect(6, [{[sysLocation, 0], "new_value"}]),
+    ?line ?expect1([{[sysLocation, 0], "new_value"}]),
     io:format("Testing noSuchName and badValue...~n"),
     s([{[sysServices,0], 3}]),
-    ?line expect(61, ?v1_2(noSuchName, notWritable), 1, any),
+    ?line ?expect3(?v1_2(noSuchName, notWritable), 1, any),
     s([{[sysLocation, 0], i, 3}]),
-    ?line expect(62, ?v1_2(badValue, wrongType), 1, any),
+    ?line ?expect3(?v1_2(badValue, wrongType), 1, any),
     ?DBG("simple_standard_test -> done",[]),
     ok.
 
@@ -2918,7 +3338,7 @@ db_notify_client(Config) when is_list(Config) ->
     snmpa_local_db:verbosity(trace),
     Self = self(), 
     ?DBG("db_notify_client -> register self (~p) notify client", [Self]),
-    snmpa_local_db:register_notify_client(self(),?MODULE),
+    snmpa_local_db:register_notify_client(Self, ?MODULE),
 
     %% This call (to the manager) will issue to set operations, so
     %% we expect to receive to notify(insert) calls.
@@ -2943,7 +3363,7 @@ db_notify_client(Config) when is_list(Config) ->
     end,
 
     ?DBG("db_notify_client -> unregister self (~p) notify client", [Self]),
-    snmpa_local_db:unregister_notify_client(self()),
+    snmpa_local_db:unregister_notify_client(Self),
     ?DBG("db_notify_client -> minimize verbosity", []),
     snmpa_local_db:verbosity(silence),
 
@@ -2955,12 +3375,13 @@ db_notify_client(Config) when is_list(Config) ->
 db_notify_client_test() ->
     ?DBG("set first new sysLocation",[]),
     s([{[sysLocation, 0], "new_value"}]),
-    ?line expect(5, [{[sysLocation, 0], "new_value"}]),
+    ?line ?expect1([{[sysLocation, 0], "new_value"}]),
 
     ?DBG("set second new sysLocation",[]),
     s([{[sysLocation, 0], "new_value"}]),
-    ?line expect(5, [{[sysLocation, 0], "new_value"}]).
+    ?line ?expect1([{[sysLocation, 0], "new_value"}]).
 
+%% Callback function
 notify(Pid, What) -> 
     ?DBG("notify(~p,~p) -> called",[Pid,What]),
     Pid ! {db_notify_test_reply, What}.
@@ -2976,24 +3397,23 @@ big_test() ->
     
     ?DBG("big_test -> testing simple next/get/set @ subagent...",[]),
     gn([[klas1]]),
-    ?line expect(1, [{[fname,0], ""}]),
+    ?line ?expect1([{[fname,0], ""}]),
     g([[fname,0]]),
-    ?line expect(2, [{[fname,0], ""}]),
+    ?line ?expect1([{[fname,0], ""}]),
     s([{[fname,0], s, "test set"}]),
-    ?line expect(3, [{[fname,0], "test set"}]),
+    ?line ?expect1([{[fname,0], "test set"}]),
     g([[fname,0]]),
-    ?line expect(4, [{[fname,0], "test set"}]),
+    ?line ?expect1([{[fname,0], "test set"}]),
     
     ?DBG("big_test -> "
 	"testing next from last instance in master to subagent...",[]),
     gn([[?v1_2(sysServices, sysORLastChange),0]]),
-    ?line expect(5, [{[fname,0], "test set"}]),
-    gn([[1,1],
-	[?v1_2(sysServices, sysORLastChange),0]]),
-    ?line expect(51, [{[sysDescr,0], "Erlang SNMP agent"},
-		{[fname,0], "test set"}]),
+    ?line ?expect1([{[fname,0], "test set"}]),
+    gn([[1,1], [?v1_2(sysServices, sysORLastChange),0]]),
+    ?line ?expect1([{[sysDescr,0], "Erlang SNMP agent"},
+		    {[fname,0], "test set"}]),
     s([{[fname,0], s, ""}]),
-    ?line expect(52, [{[fname,0], ""}]),
+    ?line ?expect1([{[fname,0], ""}]),
     
     table_test(),
 
@@ -3001,43 +3421,43 @@ big_test() ->
     _FTab = [friendsEntry],
     s([{[friendsEntry, [2, 3]], s, "kompis3"},
        {[friendsEntry, [3, 3]], i, ?createAndGo}]),
-    ?line expect(6, [{[friendsEntry, [2, 3]], "kompis3"},
-	       {[friendsEntry, [3, 3]], ?createAndGo}]),
+    ?line ?expect1([{[friendsEntry, [2, 3]], "kompis3"},
+		    {[friendsEntry, [3, 3]], ?createAndGo}]),
     g([[friendsEntry, [2, 3]],
        [friendsEntry, [3, 3]]]),
-    ?line expect(7, [{[friendsEntry, [2, 3]], "kompis3"},
-	       {[friendsEntry, [3, 3]], ?active}]),
+    ?line ?expect1([{[friendsEntry, [2, 3]], "kompis3"},
+		    {[friendsEntry, [3, 3]], ?active}]),
     s([{[friendsEntry, [3, 3]], i, ?destroy}]),
-    ?line expect(8, [{[friendsEntry, [3, 3]], ?destroy}]),
+    ?line ?expect1([{[friendsEntry, [3, 3]], ?destroy}]),
     
-    otp_1131(),
+    otp_1131_test(),
 
     ?DBG("big_test -> adding two rows in subagent table with special INDEX",
        []),
     s([{[kompissEntry, [1, 3]], s, "kompis3"},
        {[kompissEntry, [2, 3]], i, ?createAndGo}]),
-    ?line expect(9, [{[kompissEntry, [1, 3]], "kompis3"},
-	       {[kompissEntry, [2, 3]], ?createAndGo}]),
+    ?line ?expect1([{[kompissEntry, [1, 3]], "kompis3"},
+		    {[kompissEntry, [2, 3]], ?createAndGo}]),
     g([[kompissEntry, [1, 3]],
        [kompissEntry, [2, 3]]]),
-    ?line expect(10, [{[kompissEntry, [1, 3]], "kompis3"},
-		{[kompissEntry, [2, 3]], ?active}]),
+    ?line ?expect1([{[kompissEntry, [1, 3]], "kompis3"},
+		    {[kompissEntry, [2, 3]], ?active}]),
     gn([[kompissEntry, [1]],
 	[kompissEntry, [2]]]),
-    ?line expect(11, [{[kompissEntry, [1, 3]], "kompis3"},
-		{[kompissEntry, [2, 3]], ?active}]),
+    ?line ?expect1([{[kompissEntry, [1, 3]], "kompis3"},
+		    {[kompissEntry, [2, 3]], ?active}]),
     s([{[kompissEntry, [1, 2]], s, "kompis3"},
        {[kompissEntry, [2, 2]], i, ?createAndGo}]),
-    ?line expect(12, [{[kompissEntry, [1, 2]], "kompis3"},
-		{[kompissEntry, [2, 2]], ?createAndGo}]),
+    ?line ?expect1([{[kompissEntry, [1, 2]], "kompis3"},
+		    {[kompissEntry, [2, 2]], ?createAndGo}]),
     gn([[kompissEntry, [1, 1]],
 	[kompissEntry, [2, 1]]]),
-    ?line expect(13, [{[kompissEntry, [1, 2]], "kompis3"},
-		{[kompissEntry, [2, 2]], ?active}]),
+    ?line ?expect1([{[kompissEntry, [1, 2]], "kompis3"},
+		    {[kompissEntry, [2, 2]], ?active}]),
     s([{[kompissEntry, [2, 3]], i, ?destroy}]),
-    ?line expect(14, [{[kompissEntry, [2, 3]], ?destroy}]),
+    ?line ?expect1([{[kompissEntry, [2, 3]], ?destroy}]),
     s([{[kompissEntry, [2, 2]], i, ?destroy}]),
-    ?line expect(15, [{[kompissEntry, [2, 2]], ?destroy}]),
+    ?line ?expect1([{[kompissEntry, [2, 2]], ?destroy}]),
     ?DBG("big_test -> done",[]),
     ok.
 
@@ -3048,23 +3468,22 @@ big_test_2() ->
     
     ?P1("Testing simple next/get/set @ subagent (2)..."),
     gn([[klas2]]),
-    ?line expect(1, [{[fname2,0], ""}]),
+    ?line ?expect1([{[fname2,0], ""}]),
     g([[fname2,0]]),
-    ?line expect(2, [{[fname2,0], ""}]),
+    ?line ?expect1([{[fname2,0], ""}]),
     s([{[fname2,0], s, "test set"}]),
-    ?line expect(3, [{[fname2,0], "test set"}]),
+    ?line ?expect1([{[fname2,0], "test set"}]),
     g([[fname2,0]]),
-    ?line expect(4, [{[fname2,0], "test set"}]),
+    ?line ?expect1([{[fname2,0], "test set"}]),
 
-    otp_1298(),
+    otp_1298_test(),
 
     ?P1("Testing next from last object in master to subagent (2)..."),
     gn([[?v1_2(sysServices, sysORLastChange),0]]),
-    ?line expect(5, [{[fname2,0], "test set"}]),
-    gn([[1,1],
-	[?v1_2(sysServices, sysORLastChange),0]]),
-    ?line expect(51, [{[sysDescr,0], "Erlang SNMP agent"},
-		{[fname2,0], "test set"}]),
+    ?line ?expect1([{[fname2,0], "test set"}]),
+    gn([[1,1], [?v1_2(sysServices, sysORLastChange),0]]),
+    ?line ?expect1([{[sysDescr,0], "Erlang SNMP agent"},
+		    {[fname2,0], "test set"}]),
     
     table_test(),
     
@@ -3072,40 +3491,40 @@ big_test_2() ->
     _FTab = [friendsEntry2],
     s([{[friendsEntry2, [2, 3]], s, "kompis3"},
        {[friendsEntry2, [3, 3]], i, ?createAndGo}]),
-    ?line expect(6, [{[friendsEntry2, [2, 3]], "kompis3"},
-	       {[friendsEntry2, [3, 3]], ?createAndGo}]),
+    ?line ?expect1([{[friendsEntry2, [2, 3]], "kompis3"},
+		    {[friendsEntry2, [3, 3]], ?createAndGo}]),
     g([[friendsEntry2, [2, 3]],
        [friendsEntry2, [3, 3]]]),
-    ?line expect(7, [{[friendsEntry2, [2, 3]], "kompis3"},
-	       {[friendsEntry2, [3, 3]], ?active}]),
+    ?line ?expect1([{[friendsEntry2, [2, 3]], "kompis3"},
+		    {[friendsEntry2, [3, 3]], ?active}]),
     s([{[friendsEntry2, [3, 3]], i, ?destroy}]),
-    ?line expect(8, [{[friendsEntry2, [3, 3]], ?destroy}]),
+    ?line ?expect1([{[friendsEntry2, [3, 3]], ?destroy}]),
     
     ?P1("Adding two rows in subagent table with special INDEX (2)"),
     s([{[kompissEntry2, [1, 3]], s, "kompis3"},
        {[kompissEntry2, [2, 3]], i, ?createAndGo}]),
-    ?line expect(9, [{[kompissEntry2, [1, 3]], "kompis3"},
-	       {[kompissEntry2, [2, 3]], ?createAndGo}]),
+    ?line ?expect1([{[kompissEntry2, [1, 3]], "kompis3"},
+		    {[kompissEntry2, [2, 3]], ?createAndGo}]),
     g([[kompissEntry2, [1, 3]],
        [kompissEntry2, [2, 3]]]),
-    ?line expect(10, [{[kompissEntry2, [1, 3]], "kompis3"},
-		{[kompissEntry2, [2, 3]], ?active}]),
+    ?line ?expect1([{[kompissEntry2, [1, 3]], "kompis3"},
+		    {[kompissEntry2, [2, 3]], ?active}]),
     gn([[kompissEntry2, [1]],
 	[kompissEntry2, [2]]]),
-    ?line expect(11, [{[kompissEntry2, [1, 3]], "kompis3"},
-		{[kompissEntry2, [2, 3]], ?active}]),
+    ?line ?expect1([{[kompissEntry2, [1, 3]], "kompis3"},
+		    {[kompissEntry2, [2, 3]], ?active}]),
     s([{[kompissEntry2, [1, 2]], s, "kompis3"},
        {[kompissEntry2, [2, 2]], i, ?createAndGo}]),
-    ?line expect(12, [{[kompissEntry2, [1, 2]], "kompis3"},
-		{[kompissEntry2, [2, 2]], ?createAndGo}]),
+    ?line ?expect1([{[kompissEntry2, [1, 2]], "kompis3"},
+		    {[kompissEntry2, [2, 2]], ?createAndGo}]),
     gn([[kompissEntry2, [1, 1]],
 	[kompissEntry2, [2, 1]]]),
-    ?line expect(13, [{[kompissEntry2, [1, 2]], "kompis3"},
-		{[kompissEntry2, [2, 2]], ?active}]),
+    ?line ?expect1([{[kompissEntry2, [1, 2]], "kompis3"},
+		    {[kompissEntry2, [2, 2]], ?active}]),
     s([{[kompissEntry2, [2, 3]], i, ?destroy}]),
-    ?line expect(14, [{[kompissEntry2, [2, 3]], ?destroy}]),
+    ?line ?expect1([{[kompissEntry2, [2, 3]], ?destroy}]),
     s([{[kompissEntry2, [2, 2]], i, ?destroy}]),
-    ?line expect(15, [{[kompissEntry2, [2, 2]], ?destroy}]),
+    ?line ?expect1([{[kompissEntry2, [2, 2]], ?destroy}]),
     ok.
 
 %% Req. Test1
@@ -3114,26 +3533,26 @@ multi_threaded_test() ->
     g([[multiStr,0]]),
     Pid = get_multi_pid(),
     g([[sysUpTime,0]]),
-    ?line expect(1, [{[sysUpTime,0], any}]),
+    ?line ?expect1([{[sysUpTime,0], any}]),
     s([{[sysLocation, 0], s, "pelle"}]),
-    ?line expect(2, [{[sysLocation, 0], "pelle"}]),
+    ?line ?expect1([{[sysLocation, 0], "pelle"}]),
     Pid ! continue,
-    ?line expect(3, [{[multiStr,0], "ok"}]),
+    ?line ?expect1([{[multiStr,0], "ok"}]),
     
     s([{[multiStr, 0], s, "block"}]),
     Pid2 = get_multi_pid(),    
     g([[sysUpTime,0]]),
-    ?line expect(4, [{[sysUpTime,0], any}]),
+    ?line ?expect1([{[sysUpTime,0], any}]),
     g([[multiStr,0]]),
     Pid3 = get_multi_pid(),
     g([[sysUpTime,0]]),
-    ?line expect(5, [{[sysUpTime,0], any}]),
+    ?line ?expect1([{[sysUpTime,0], any}]),
     s([{[sysLocation, 0], s, "kalle"}]),
     Pid3 ! continue,
-    ?line expect(6, [{[multiStr,0], "ok"}]),
+    ?line ?expect1([{[multiStr,0], "ok"}]),
     Pid2 ! continue,
-    ?line expect(7, [{[multiStr,0], "block"}]),
-    ?line expect(8, [{[sysLocation,0], "kalle"}]).
+    ?line ?expect1([{[multiStr,0], "block"}]),
+    ?line ?expect1([{[sysLocation,0], "kalle"}]).
 
 %% Req. Test1, TestTrapv2
 mt_trap_test(MA) ->
@@ -3141,9 +3560,8 @@ mt_trap_test(MA) ->
     ?DBG("mt_trap_test(01) -> issue testTrapv22 (standard trap)", []),
     snmpa:send_trap(MA, testTrapv22, "standard trap"),
     ?DBG("mt_trap_test(02) -> await v2trap", []),
-    ?line expect(mt_trap_test_1, v2trap, 
-		 [{[sysUpTime, 0],   any},
-		  {[snmpTrapOID, 0], ?system ++ [0,1]}]),
+    ?line ?expect2(v2trap, [{[sysUpTime, 0],   any},
+			    {[snmpTrapOID, 0], ?system ++ [0,1]}]),
 
     ?DBG("mt_trap_test(03) -> issue mtTrap (standard trap)", []),
     snmpa:send_trap(MA, mtTrap, "standard trap"),
@@ -3152,21 +3570,21 @@ mt_trap_test(MA) ->
     g([[sysUpTime,0]]),
 
     ?DBG("mt_trap_test(06) -> await sysUpTime", []),
-    ?line expect(mt_trap_test_2, [{[sysUpTime,0], any}]),
+    ?line ?expect1([{[sysUpTime,0], any}]),
     ?DBG("mt_trap_test(07) -> issue testTrapv22 (standard trap)", []),
     snmpa:send_trap(MA, testTrapv22, "standard trap"),
     ?DBG("mt_trap_test(08) -> await v2trap", []),
-    ?line expect(mt_trap_test_3, v2trap, 
-		 [{[sysUpTime, 0],   any}, 
-		  {[snmpTrapOID, 0], ?system ++ [0,1]}]),
+    ?line ?expect2(v2trap, 
+		   [{[sysUpTime, 0],   any}, 
+		    {[snmpTrapOID, 0], ?system ++ [0,1]}]),
 
     ?DBG("mt_trap_test(09) -> send continue to multi-pid", []),
     Pid ! continue,
 
     ?DBG("mt_trap_test(10) -> await v2trap", []),
-    ?line expect(mt_trap_test_4, v2trap, [{[sysUpTime, 0], any},
-					  {[snmpTrapOID, 0], ?testTrap ++ [2]},
-					  {[multiStr,0], "ok"}]),
+    ?line ?expect2(v2trap, [{[sysUpTime, 0], any},
+			    {[snmpTrapOID, 0], ?testTrap ++ [2]},
+			    {[multiStr,0], "ok"}]),
     ?DBG("mt_trap_test(11) -> done", []),
     ok.
 
@@ -3187,26 +3605,26 @@ types_v2_test() ->
     ?P1("Testing v2 types..."),
 
     s([{[bits1,0], 2#10}]),
-    ?line expect(1, [{[bits1,0], ?str(2#10)}]),
+    ?line ?expect1([{[bits1,0], ?str(2#10)}]),
     g([[bits1,0]]),
-    ?line expect(2, [{[bits1,0], ?str(2#101)}]),
+    ?line ?expect1([{[bits1,0], ?str(2#101)}]),
     
     s([{[bits2,0], 2#11000000110}]),
-    ?line expect(3, [{[bits2,0], ?str(2#11000000110)}]),
+    ?line ?expect1([{[bits2,0], ?str(2#11000000110)}]),
     g([[bits2,0]]),
-    ?line expect(4, [{[bits2,0], ?str(2#11000000110)}]),
+    ?line ?expect1([{[bits2,0], ?str(2#11000000110)}]),
     
     g([[bits3,0]]),
-    ?line expect(50, genErr, 1, any),
+    ?line ?expect3(genErr, 1, any),
     
     g([[bits4,0]]),
-    ?line expect(51, genErr, 1, any),
+    ?line ?expect3(genErr, 1, any),
     
     s([{[bits1,0], s, [2#10]}]),
-    ?line expect(6, ?v1_2(badValue, wrongValue), 1, any),
+    ?line ?expect3(?v1_2(badValue, wrongValue), 1, any),
 
     s([{[bits2,0], 2#11001001101010011}]),
-    ?line expect(7, ?v1_2(badValue, wrongValue), 1, any).
+    ?line ?expect3(?v1_2(badValue, wrongValue), 1, any).
     
 
 %% Req. Test1
@@ -3214,64 +3632,63 @@ implied_test(MA) ->
     ?LOG("implied_test -> start",[]),
     ?P1("Testing IMPLIED..."),
 
-    snmpa:verbosity(MA,trace),
-    snmpa:verbosity(MA,trace),
+    snmpa:verbosity(MA, trace),
 
     %% Create two rows, check that they are get-nexted in correct order.
     Idx1 = "apa",
     Idx2 = "qq",
     ?DBG("implied_test -> (send) create row 1 '~s' in table 1",[Idx1]),
     s([{[testStatus, Idx1], i, ?createAndGo}, {[testDescr, Idx1],s,"row 1"}]),
-    ?line expect(1, [{[testStatus, Idx1], ?createAndGo},
-		     {[testDescr, Idx1], "row 1"}]),
+    ?line ?expect1([{[testStatus, Idx1], ?createAndGo},
+		    {[testDescr, Idx1], "row 1"}]),
     ?DBG("implied_test -> (send) create row 2 '~s' in table 1",[Idx2]),
     s([{[testStatus, Idx2], i, ?createAndGo}, {[testDescr, Idx2],s,"row 2"}]),
-    ?line expect(2, [{[testStatus, Idx2], ?createAndGo},
-		     {[testDescr, Idx2], "row 2"}]),
+    ?line ?expect1([{[testStatus, Idx2], ?createAndGo},
+		    {[testDescr, Idx2], "row 2"}]),
     ?DBG("implied_test -> get-next(testDescr)",[]),
     gn([[testDescr]]),
-    ?line expect(3, [{[testDescr,Idx1], "row 1"}]),
+    ?line ?expect1([{[testDescr,Idx1], "row 1"}]),
     ?DBG("implied_test -> get-next(testDescr) of row 1",[]),
     gn([[testDescr,Idx1]]),
-    ?line expect(4, [{[testDescr,Idx2], "row 2"}]),
+    ?line ?expect1([{[testDescr,Idx2], "row 2"}]),
 
     % Delete the rows
     ?DBG("implied_test -> (send) delete row 1 '~s' from table 1",[Idx1]),
     s([{[testStatus, Idx1], i, ?destroy}]),
-    ?line expect(5, [{[testStatus, Idx1], ?destroy}]),
+    ?line ?expect1([{[testStatus, Idx1], ?destroy}]),
     ?DBG("implied_test -> (send) delete row 2 '~s' from table 1",[Idx2]),
     s([{[testStatus, Idx2], i, ?destroy}]),
-    ?line expect(6, [{[testStatus, Idx2], ?destroy}]),
+    ?line ?expect1([{[testStatus, Idx2], ?destroy}]),
 
     %% Try the same in other table
     Idx3 = [1, "apa"],
     Idx4 = [1, "qq"],
     ?DBG("implied_test -> (send) create row 1 '~s' in table 2",[Idx3]),
     s([{[testStatus2, Idx3], i, ?createAndGo}, {[testDescr2,Idx3],s,"row 1"}]),
-    ?line expect(1, [{[testStatus2, Idx3], ?createAndGo},
-		     {[testDescr2, Idx3], "row 1"}]),
+    ?line ?expect1([{[testStatus2, Idx3], ?createAndGo},
+		    {[testDescr2, Idx3], "row 1"}]),
     ?DBG("implied_test -> (send) create row 2 '~s' in table 2",[Idx4]),
     s([{[testStatus2, Idx4], i, ?createAndGo}, {[testDescr2,Idx4],s,"row 2"}]),
-    ?line expect(2, [{[testStatus2, Idx4], ?createAndGo},
-		     {[testDescr2, Idx4], "row 2"}]),
+    ?line ?expect1([{[testStatus2, Idx4], ?createAndGo},
+		    {[testDescr2, Idx4], "row 2"}]),
     ?DBG("implied_test -> get-next(testDescr2)",[]),
     gn([[testDescr2]]),
-    ?line expect(3, [{[testDescr2,Idx3], "row 1"}]),
+    ?line ?expect1([{[testDescr2,Idx3], "row 1"}]),
     ?DBG("implied_test -> get-next(testDescr2) of row 1",[]),
     gn([[testDescr2,Idx3]]),
-    ?line expect(4, [{[testDescr2,Idx4], "row 2"}]),
+    ?line ?expect1([{[testDescr2,Idx4], "row 2"}]),
 
     % Delete the rows
     ?DBG("implied_test -> (send) delete row 1 '~s' from table 2",[Idx3]),
     s([{[testStatus2, Idx3], i, ?destroy}]),
-    ?line expect(5, [{[testStatus2, Idx3], ?destroy}]),
+    ?line ?expect1([{[testStatus2, Idx3], ?destroy}]),
     ?DBG("implied_test -> (send) delete row 2 '~s' from table 2",[Idx4]),
     s([{[testStatus2, Idx4], i, ?destroy}]),
-    ?line expect(6, [{[testStatus2, Idx4], ?destroy}]),
+    ?line ?expect1([{[testStatus2, Idx4], ?destroy}]),
 
-    snmpa:verbosity(MA,log),
+    snmpa:verbosity(MA, log),
 
-    ?LOG("implied_test -> done",[]).
+    ?LOG("implied_test -> done", []).
     
     
 
@@ -3284,25 +3701,25 @@ sparse_table_test() ->
     Idx2 = 2,
     s([{[sparseStatus, Idx1], i, ?createAndGo},
        {[sparseDescr, Idx1], s, "row 1"}]),
-    ?line expect(1, [{[sparseStatus, Idx1], ?createAndGo},
-		     {[sparseDescr, Idx1], "row 1"}]),
+    ?line ?expect1([{[sparseStatus, Idx1], ?createAndGo},
+		    {[sparseDescr, Idx1], "row 1"}]),
     s([{[sparseStatus, Idx2], i, ?createAndGo},
        {[sparseDescr, Idx2], s, "row 2"}]),
-    ?line expect(2, [{[sparseStatus, Idx2], ?createAndGo},
-		     {[sparseDescr, Idx2], "row 2"}]),
+    ?line ?expect1([{[sparseStatus, Idx2], ?createAndGo},
+		    {[sparseDescr, Idx2], "row 2"}]),
     ?v1_2(gn([[sparseIndex], [sparseDescr,Idx1], [sparseDescr,Idx2],
 	      [sparseStatus,Idx1], [sparseStatus,Idx2]]),
 	  gb(0,5,[[sparseIndex]])),
-    ?line expect(3, [{[sparseDescr,Idx1], "row 1"},
-		     {[sparseDescr,Idx2], "row 2"},
-		     {[sparseStatus,Idx1], ?active},
-		     {[sparseStatus,Idx2], ?active},
-		     {[sparseStr,0], "slut"}]),
-    % Delete the rows
+    ?line ?expect1([{[sparseDescr,Idx1], "row 1"},
+		    {[sparseDescr,Idx2], "row 2"},
+		    {[sparseStatus,Idx1], ?active},
+		    {[sparseStatus,Idx2], ?active},
+		    {[sparseStr,0], "slut"}]),
+    %% Delete the rows
     s([{[sparseStatus, Idx1], i, ?destroy}]),
-    ?line expect(4, [{[sparseStatus, Idx1], ?destroy}]),
+    ?line ?expect1([{[sparseStatus, Idx1], ?destroy}]),
     s([{[sparseStatus, Idx2], i, ?destroy}]),
-    ?line expect(5, [{[sparseStatus, Idx2], ?destroy}]).
+    ?line ?expect1([{[sparseStatus, Idx2], ?destroy}]).
 
 
 %% Req. Test1
@@ -3316,13 +3733,13 @@ cnt_64_test(MA) ->
     ?DBG("get cnt64",[]),
     g([[cnt64,0]]),
     ?DBG("await response",[]),
-    ?line ?v1_2(expect(1, noSuchName, 1, any),
-		expect(1, [{[cnt64,0],18446744073709551615}])),
+    ?line ?v1_2(?expect3(noSuchName, 1, any),
+		?expect1([{[cnt64,0],18446744073709551615}])),
     ?DBG("get-next cnt64",[]),
     gn([[cnt64]]),
     ?DBG("await response",[]),
-    ?line ?v1_2(expect(2, [{[cnt64Str,0], "after cnt64"}]),
-		expect(2, [{[cnt64,0],18446744073709551615}])),
+    ?line ?v1_2(?expect1([{[cnt64Str,0], "after cnt64"}]),
+		?expect1([{[cnt64,0],18446744073709551615}])),
     ?DBG("send cntTrap",[]),
     snmpa:send_trap(MA,cntTrap,"standard trap",[
 						{sysContact,  "pelle"},
@@ -3330,13 +3747,13 @@ cnt_64_test(MA) ->
 						{sysLocation, "here"}
 					       ]),
     ?DBG("await response",[]),
-    ?line ?v1_2(expect(3, trap, [test], 6, 1, [{[sysContact,0], "pelle"},
-					       {[sysLocation,0], "here"}]),
-		expect(3, v2trap, [{[sysUpTime, 0], any},
-				   {[snmpTrapOID, 0], ?testTrap ++ [1]},
-				   {[sysContact,0], "pelle"},
-				   {[cnt64,0], 10},
-				   {[sysLocation,0], "here"}])),
+    ?line ?v1_2(?expect5(trap, [test], 6, 1, [{[sysContact,0], "pelle"},
+					      {[sysLocation,0], "here"}]),
+		?expect2(v2trap, [{[sysUpTime, 0], any},
+				  {[snmpTrapOID, 0], ?testTrap ++ [1]},
+				  {[sysContact,0], "pelle"},
+				  {[cnt64,0], 10},
+				  {[sysLocation,0], "here"}])),
     
     %% Create two rows, check that they are get-nexted in correct order.
     Idx1 = 1,
@@ -3344,27 +3761,27 @@ cnt_64_test(MA) ->
     ?DBG("create row (cntStatus): ~p",[Idx1]),
     s([{[cntStatus, Idx1], i, ?createAndGo}]),
     ?DBG("await response",[]),
-    ?line expect(1, [{[cntStatus, Idx1], ?createAndGo}]),
+    ?line ?expect1([{[cntStatus, Idx1], ?createAndGo}]),
     ?DBG("create row (cntStatus): ~p",[Idx2]),
     s([{[cntStatus, Idx2], i, ?createAndGo}]),
     ?DBG("await response",[]),
-    ?line expect(2, [{[cntStatus, Idx2], ?createAndGo}]),
+    ?line ?expect1([{[cntStatus, Idx2], ?createAndGo}]),
 
     ?DBG("get-next (cntIndex)",[]),
     gn([[cntIndex]]),
     ?DBG("await response",[]),
-    ?line ?v1_2(expect(3, [{[cntStatus,Idx1], ?active}]),
-		expect(3, [{[cntCnt,Idx1], 0}])),
+    ?line ?v1_2(?expect1([{[cntStatus,Idx1], ?active}]),
+		?expect1([{[cntCnt,Idx1], 0}])),
     % Delete the rows
     ?DBG("delete row (cntStatus): ~p",[Idx1]),
     s([{[cntStatus, Idx1], i, ?destroy}]),
     ?DBG("await response",[]),
-    ?line expect(4, [{[cntStatus, Idx1], ?destroy}]),
+    ?line ?expect1([{[cntStatus, Idx1], ?destroy}]),
     ?DBG("delete row (cntStatus): ~p",[Idx2]),
     s([{[cntStatus, Idx2], i, ?destroy}]),
     ?DBG("await response",[]),
-    ?line expect(5, [{[cntStatus, Idx2], ?destroy}]),
-    catch snmpa:verbosity(MA,log),
+    ?line ?expect1([{[cntStatus, Idx2], ?destroy}]),
+    catch snmpa:verbosity(MA, log),
     ?DBG("done",[]),
     ok.
 
@@ -3372,7 +3789,7 @@ cnt_64_test(MA) ->
 opaque_test() ->
     ?P1("Testing Opaque datatype..."),
     g([[opaqueObj,0]]),
-    ?line expect(1, [{[opaqueObj,0], "opaque-data"}]).
+    ?line ?expect1([{[opaqueObj,0], "opaque-data"}]).
     
 %% Req. OLD-SNMPEA-MIB
 api_test(MaNode) ->
@@ -3413,70 +3830,69 @@ api_test(MaNode) ->
 %% Req. Klas3
 api_test2() ->
     g([[fname3,0]]),
-    ?line expect(1, [{[fname3,0], "ok"}]),
+    ?line ?expect1([{[fname3,0], "ok"}]),
     g([[fname4,0]]),
-    ?line expect(2, [{[fname4,0], 1}]).
+    ?line ?expect1([{[fname4,0], 1}]).
 
 api_test3() ->
     g([[fname3,0]]),
-    ?line expect(1, [{[fname3,0], "ok"}]).
+    ?line ?expect1([{[fname3,0], "ok"}]).
     
     
 unreg_test() ->
     gn([[?v1_2(sysServices, sysORLastChange),0]]),
-    ?line expect(1, [{[snmpInPkts, 0], any}]).
+    ?line ?expect1([{[snmpInPkts, 0], any}]).
 
 load_test() ->
     gn([[?v1_2(sysServices, sysORLastChange),0]]),
-    ?line expect(1, [{[fname,0], ""}]).
+    ?line ?expect1([{[fname,0], ""}]).
 
 %% Req. Klas1
 load_test_sa() ->
     gn([[?v1_2(sysServices,sysORLastChange), 0]]),
-    ?line expect(1, [{[fname,0], any}]).
+    ?line ?expect1([{[fname,0], any}]).
     
 %% Req. system group, Klas1, OLD-SNMPEA-MIB
 do_mul_get() ->
     Key1c3 = [intCommunityEntry,[3],get(mip),is("public")],
     Key1c4 = [intCommunityEntry,[4],get(mip),is("public")],
     s([{[fname,0], s, "test set"}]),
-    ?line expect(3, [{[fname,0], "test set"}]),
-    g([[sysDescr,0], Key1c4, [fname,0],Key1c3,
-	       [sysName,0]]),
-    ?line expect(1, [{[sysDescr,0], "Erlang SNMP agent"},
-		     {Key1c4, 2},
-		     {[fname,0], "test set"},
-		     {Key1c3, 2},
-		     {[sysName,0], "test"}]),
+    ?line ?expect1([{[fname,0], "test set"}]),
+    g([[sysDescr,0], Key1c4, [fname,0],Key1c3,[sysName,0]]),
+    ?line ?expect1([{[sysDescr,0], "Erlang SNMP agent"},
+		    {Key1c4, 2},
+		    {[fname,0], "test set"},
+		    {Key1c3, 2},
+		    {[sysName,0], "test"}]),
     g([[1,3,7,1], Key1c4, [sysDescr,0], [1,3,7,2], Key1c3, [sysDescr,0]]),
-    ?line ?v1_2(expect(2, noSuchName, [1,4], any),
-		expect(2, [{[1,3,7,1], noSuchObject},
-			   {Key1c4, 2},
-			   {[sysDescr,0], "Erlang SNMP agent"},
-			   {[1,3,7,2], noSuchObject},
-			   {Key1c3, 2},
-			   {[sysDescr,0], "Erlang SNMP agent"}])).
+    ?line ?v1_2(?expect3(noSuchName, [1,4], any),
+		?expect1([{[1,3,7,1], noSuchObject},
+			  {Key1c4, 2},
+			  {[sysDescr,0], "Erlang SNMP agent"},
+			  {[1,3,7,2], noSuchObject},
+			  {Key1c3, 2},
+			  {[sysDescr,0], "Erlang SNMP agent"}])).
 
 %% Req. v1, system group, Klas1, OLD-SNMPEA-MIB, *ej* Klas3.
 do_mul_get_err() ->
     Key1c3 = [intCommunityEntry,[3],get(mip),is("public")],
     Key1c4 = [intCommunityEntry,[4],get(mip),is("public")],
     s([{[fname,0], s, "test set"}]),
-    ?line expect(3, [{[fname,0], "test set"}]),
+    ?line ?expect1([{[fname,0], "test set"}]),
     g([[sysDescr,0],Key1c4,[fname,0], Key1c3, [sysName,2]]),
-    ?line ?v1_2(expect(1, noSuchName, 5, any),
-		expect(1, [{[sysDescr,0], "Erlang SNMP agent"},
-			   {Key1c4, 2},
-			   {[fname,0], "test set"},
-			   {Key1c3, 2},
-			   {[sysName,2], noSuchInstance}])),
+    ?line ?v1_2(?expect3(noSuchName, 5, any),
+		?expect1([{[sysDescr,0], "Erlang SNMP agent"},
+			  {Key1c4, 2},
+			  {[fname,0], "test set"},
+			  {Key1c3, 2},
+			  {[sysName,2], noSuchInstance}])),
     g([[sysDescr,0],Key1c4,[fname3,0], Key1c3, [sysName,1]]),
-    ?line ?v1_2(expect(1, noSuchName, [3,5], any),
-		expect(1, [{[sysDescr,0], "Erlang SNMP agent"},
-			   {Key1c4, 2},
-			   {[fname3,0], noSuchObject},
-			   {Key1c3, 2},
-			   {[sysName,1], noSuchInstance}])).
+    ?line ?v1_2(?expect3(noSuchName, [3,5], any),
+		?expect1([{[sysDescr,0], "Erlang SNMP agent"},
+			  {Key1c4, 2},
+			  {[fname3,0], noSuchObject},
+			  {Key1c3, 2},
+			  {[sysName,1], noSuchInstance}])).
 
 
 %% Req. system group, Klas1, OLD-SNMPEA-MIB
@@ -3486,11 +3902,11 @@ do_mul_next() ->
     Key1c3 = [intCommunityEntry,[3],get(mip),is("public")],
     Key1c4 = [intCommunityEntry,[4],get(mip),is("public")],
     s([{[fname,0], s, "test set"}]),
-    ?line expect(3, [{[fname,0], "test set"}]),
+    ?line ?expect1([{[fname,0], "test set"}]),
     gn([[sysDescr], Key1c4s, [fname],Key1c3s,[sysName]]),
-    ?line expect(1, [{[sysDescr,0], "Erlang SNMP agent"},
-	       {Key1c4, 2}, {[fname,0], "test set"},
-	       {Key1c3, 2}, {[sysName,0], "test"}]).
+    ?line ?expect1([{[sysDescr,0], "Erlang SNMP agent"},
+		    {Key1c4, 2}, {[fname,0], "test set"},
+		    {Key1c3, 2}, {[sysName,0], "test"}]).
 
 %% Req. system group, Klas1, OLD-SNMPEA-MIB
 do_mul_next_err() ->
@@ -3499,17 +3915,17 @@ do_mul_next_err() ->
     Key1c3 = [intCommunityEntry,[3],get(mip),is("public")],
     Key1c4 = [intCommunityEntry,[4],get(mip),is("public")],
     s([{[fname,0], s, "test set"}]),
-    ?line expect(3, [{[fname,0], "test set"}]),
+    ?line ?expect1([{[fname,0], "test set"}]),
     gn([[sysDescr], Key1c4s, [1,3,6,999], [fname],[1,3,90], Key1c3s,[sysName]]),
-    ?line ?v1_2(expect(1, noSuchName, [3,5], any),
-		expect(1, [{[sysDescr,0], "Erlang SNMP agent"},
-			   {Key1c4, 2},
-			   {[1,3,6,999], endOfMibView},
-			   {[fname,0], "test set"},
-			   {[1,3,90], endOfMibView},
-			   {Key1c3, 2},
-			   {[sysName,0], "test"}])).
-		
+    ?line ?v1_2(?expect3(noSuchName, [3,5], any),
+		?expect1([{[sysDescr,0], "Erlang SNMP agent"},
+			  {Key1c4, 2},
+			  {[1,3,6,999], endOfMibView},
+			  {[fname,0], "test set"},
+			  {[1,3,90], endOfMibView},
+			  {Key1c3, 2},
+			  {[sysName,0], "test"}])).
+
 
 %% Req. system group, Klas1, OLD-SNMPEA-MIB
 do_mul_set() ->
@@ -3523,24 +3939,24 @@ do_mul_set() ->
        {NewKeyc5, ?createAndGo},
        {NewKeyc4, 2},
        {[friendsEntry, [3, 3]], ?createAndGo}]),
-    ?line expect(1, [{[friendsEntry, [2, 3]], "kompis3"},
-	       {NewKeyc3, 2},
-	       {[sysLocation,0], "new_value"},
-	       {NewKeyc5, ?createAndGo},
-	       {NewKeyc4, 2},
-	       {[friendsEntry, [3, 3]], ?createAndGo}]),
+    ?line ?expect1([{[friendsEntry, [2, 3]], "kompis3"},
+		    {NewKeyc3, 2},
+		    {[sysLocation,0], "new_value"},
+		    {NewKeyc5, ?createAndGo},
+		    {NewKeyc4, 2},
+		    {[friendsEntry, [3, 3]], ?createAndGo}]),
     g([[friendsEntry, [2, 3]],
-	       [sysLocation,0],
-	       [friendsEntry, [3, 3]]]),
-    ?line expect(2, [{[friendsEntry, [2, 3]], "kompis3"},
-	       {[sysLocation,0], "new_value"},
-	       {[friendsEntry, [3, 3]], ?active}]),
+       [sysLocation,0],
+       [friendsEntry, [3, 3]]]),
+    ?line ?expect1([{[friendsEntry, [2, 3]], "kompis3"},
+		    {[sysLocation,0], "new_value"},
+		    {[friendsEntry, [3, 3]], ?active}]),
     g([NewKeyc4]),
-    ?line expect(3, [{NewKeyc4, 2}]),
+    ?line ?expect1([{NewKeyc4, 2}]),
     s([{[friendsEntry, [3, 3]], ?destroy},
        {NewKeyc5, ?destroy}]),
-    ?line expect(4, [{[friendsEntry, [3, 3]], ?destroy},
-	       {NewKeyc5, ?destroy}]).
+    ?line ?expect1([{[friendsEntry, [3, 3]], ?destroy},
+		    {NewKeyc5, ?destroy}]).
 
 %% Req. system group, Klas1, OLD-SNMPEA-MIB
 do_mul_set_err() ->
@@ -3554,53 +3970,48 @@ do_mul_set_err() ->
        {NewKeyc5, ?createAndGo},
        {NewKeyc4, 2},
        {[friendsEntry, [3, 3]], ?createAndGo}]),
-    ?line expect(1, ?v1_2(noSuchName, notWritable), 3, any),
+    ?line ?expect3(?v1_2(noSuchName, notWritable), 3, any),
     g([[friendsEntry, [2, 3]]]),
-    ?line ?v1_2(expect(2, noSuchName, 1, any),
-		expect(2, [{[friendsEntry, [2,3]], noSuchInstance}])),
+    ?line ?v1_2(?expect3(noSuchName, 1, any),
+		?expect1([{[friendsEntry, [2,3]], noSuchInstance}])),
     g([NewKeyc4]),
-    ?line ?v1_2(expect(3, noSuchName, 1, any), 
-		expect(3, [{NewKeyc4, noSuchInstance}])).
+    ?line ?v1_2(?expect3(noSuchName, 1, any), 
+		?expect1([{NewKeyc4, noSuchInstance}])).
 
 %% Req. SA-MIB
 sa_mib() ->
     g([[sa, [2,0]]]),
-    ?line expect(sa_mib_1, [{[sa, [2,0]], 3}]),
+    ?line ?expect1([{[sa, [2,0]], 3}]),
     s([{[sa, [1,0]], s, "sa_test"}]),
-    ?line expect(sa_mib_2, [{[sa, [1,0]], "sa_test"}]),
+    ?line ?expect1([{[sa, [1,0]], "sa_test"}]),
     ok.
 
 ma_trap1(MA) ->
     ok = snmpa:send_trap(MA, testTrap2, "standard trap"), 
-    ?line expect(ma_trap1_1, 
-		 trap, [system], 6, 1, [{[system, [4,0]],
-					 "{mbj,eklas}@erlang.ericsson.se"}]),
+    ?line ?expect5(trap, [system], 6, 1, [{[system, [4,0]],
+					   "{mbj,eklas}@erlang.ericsson.se"}]),
     ok = snmpa:send_trap(MA, testTrap1, "standard trap"),
-    ?line expect(ma_trap1_2, 
-		 trap, [1,2,3] , 1, 0, [{[system, [4,0]],
-					 "{mbj,eklas}@erlang.ericsson.se"}]),
+    ?line ?expect5(trap, [1,2,3] , 1, 0, [{[system, [4,0]],
+					   "{mbj,eklas}@erlang.ericsson.se"}]),
     ok.
 
 ma_trap2(MA) ->
     snmpa:send_trap(MA,testTrap2,"standard trap",[{sysContact,"pelle"}]),
-    ?line expect(ma_trap2_3, 
-		 trap, [system], 6, 1, [{[system, [4,0]], "pelle"}]),
+    ?line ?expect5(trap, [system], 6, 1, [{[system, [4,0]], "pelle"}]),
     ok.
 
 ma_v2_2_v1_trap(MA) ->
     snmpa:send_trap(MA,testTrapv22,"standard trap",[{sysContact,"pelle"}]),
-    ?line expect(ma_v2_2_v1_trap_3, 
-		 trap, [system], 6, 1, [{[system, [4,0]], "pelle"}]),
+    ?line ?expect5(trap, [system], 6, 1, [{[system, [4,0]], "pelle"}]),
     ok.    
 
 ma_v2_2_v1_trap2(MA) ->
     snmpa:send_trap(MA,linkUp,"standard trap",[{ifIndex, [1], 1},
 					      {ifAdminStatus, [1], 1},
 					      {ifOperStatus, [1], 2}]),
-    ?line expect(ma_v2_2_v1_trap2_3, 
-		 trap, [1,2,3], 3, 0, [{[ifIndex, 1], 1},
-				       {[ifAdminStatus, 1], 1},
-				       {[ifOperStatus, 1], 2}]),
+    ?line ?expect5(trap, [1,2,3], 3, 0, [{[ifIndex, 1], 1},
+					 {[ifAdminStatus, 1], 1},
+					 {[ifOperStatus, 1], 2}]),
     ok.
 
 sa_trap1(SA) ->
@@ -3618,47 +4029,44 @@ sa_trap1(SA) ->
     %% io:format("sa_trap1 -> SA trap send: "
     %% 	      "~n   TSRes: ~p"
     %% 	      "~n", [TSRes]),
-    ?line expect(sa_trap1_4, 
-		 trap, [ericsson], 6, 1, [{[system, [4,0]],
-					   "{mbj,eklas}@erlang.ericsson.se"},
-					  {[sa, [1,0]], "sa_test"}]),
+    ?line ?expect5(trap, [ericsson], 6, 1, [{[system, [4,0]],
+					     "{mbj,eklas}@erlang.ericsson.se"},
+					    {[sa, [1,0]], "sa_test"}]),
     snmpa:verbosity(SA, {subagents, silence}),
     ok.
 
 sa_trap2(SA) ->
     snmpa:send_trap(SA, saTrap, "standard trap",[{sysContact,"pelle"}]),
-    ?line expect(sa_trap2_5, 
-		 trap, [ericsson], 6, 1, [{[system, [4,0]], "pelle"},
-					  {[sa, [1,0]], "sa_test"}]),
+    ?line ?expect5(trap, [ericsson], 6, 1, [{[system, [4,0]], "pelle"},
+					    {[sa, [1,0]], "sa_test"}]),
     ok.
 
 sa_trap3(SA) ->
     snmpa:send_trap(SA, saTrap2, "standard trap",
 			 [{intViewSubtree, [4], [1,2,3,4]}]),
-    ?line expect(sa_trap3_6, 
-		 trap, [ericsson], 6, 2, [{[system, [4,0]],
-					   "{mbj,eklas}@erlang.ericsson.se"},
-					  {[sa, [1,0]], "sa_test"},
-					  {[intViewSubtree,4],[1,2,3,4]}]),
+    ?line ?expect5(trap, [ericsson], 6, 2, [{[system, [4,0]],
+					     "{mbj,eklas}@erlang.ericsson.se"},
+					    {[sa, [1,0]], "sa_test"},
+					    {[intViewSubtree,4],[1,2,3,4]}]),
     ok.
 
 ma_v2_trap1(MA) ->
     ?DBG("ma_v2_traps -> entry with MA = ~p => "
 	   "send standard trap: testTrapv22",[MA]),
     snmpa:send_trap(MA, testTrapv22, "standard trap"),
-    ?line expect(1, v2trap, [{[sysUpTime, 0], any},
-			     {[snmpTrapOID, 0], ?system ++ [0,1]}]),
+    ?line ?expect2(v2trap, [{[sysUpTime, 0], any},
+			    {[snmpTrapOID, 0], ?system ++ [0,1]}]),
     ?DBG("ma_v2_traps -> send standard trap: testTrapv21",[]),
     snmpa:send_trap(MA, testTrapv21, "standard trap"),
-    ?line expect(2, v2trap, [{[sysUpTime, 0], any},
-			     {[snmpTrapOID, 0], ?snmp ++ [1]}]),
+    ?line ?expect2(v2trap, [{[sysUpTime, 0], any},
+			    {[snmpTrapOID, 0], ?snmp ++ [1]}]),
     ok.
 
 ma_v2_trap2(MA) ->
     snmpa:send_trap(MA,testTrapv22,"standard trap",[{sysContact,"pelle"}]),
-    ?line expect(3, v2trap, [{[sysUpTime, 0], any},
-			     {[snmpTrapOID, 0], ?system ++ [0,1]},
-			     {[system, [4,0]], "pelle"}]).
+    ?line ?expect2(v2trap, [{[sysUpTime, 0], any},
+			    {[snmpTrapOID, 0], ?system ++ [0,1]},
+			    {[system, [4,0]], "pelle"}]).
 
 %% Note: This test case takes a while... actually a couple of minutes.
 ma_v2_inform1(MA) ->
@@ -3667,11 +4075,10 @@ ma_v2_inform1(MA) ->
 	 "~n   send notification: testTrapv22", [MA]),
 
     CmdExpectInform = 
-	fun(No, Response) ->
-		expect(No, 
-		       {inform, Response},
-		       [{[sysUpTime, 0], any}, 
-			{[snmpTrapOID, 0], ?system ++ [0,1]}])
+	fun(_No, Response) ->
+		?expect2({inform, Response},
+			 [{[sysUpTime, 0], any}, 
+			  {[snmpTrapOID, 0], ?system ++ [0,1]}])
 	end,
 
     CmdExp = 
@@ -3817,11 +4224,10 @@ ma_v2_inform2(MA) ->
 	 "~n   send notification: testTrapv22", [MA]),
 
     CmdExpectInform = 
-	fun(No, Response) ->
-		expect(No, 
-		       {inform, Response},
-		       [{[sysUpTime, 0], any}, 
-			{[snmpTrapOID, 0], ?system ++ [0,1]}])
+	fun(_No, Response) ->
+		?expect2({inform, Response},
+			 [{[sysUpTime, 0], any}, 
+			  {[snmpTrapOID, 0], ?system ++ [0,1]}])
 	end,
 
     CmdExp = 
@@ -3909,17 +4315,17 @@ ma_v2_inform3(MA) ->
 
     CmdExpectInform = 
 	fun(No, Response) ->
-		expect(No, 
-		       {inform, Response},
-		       [{[sysUpTime, 0], any}, 
-			{[snmpTrapOID, 0], ?system ++ [0,1]}])
+		?DBG("CmdExpectInform -> ~p: ~n~p", [No, Response]),
+		?expect2({inform, Response},
+			 [{[sysUpTime, 0], any}, 
+			  {[snmpTrapOID, 0], ?system ++ [0,1]}])
 	end,
 
     CmdExp = 
 	fun(ok) -> 
 		ok;
 	   ({ok, Val}) ->
-		?DBG("ma_v2_inform3 -> [cmd2] Val: ~p", [Val]),
+		?DBG("CmdExp -> Val: ~p", [Val]),
 		ok;
 	   ({error, Id, Extra}) ->
 		{error, {unexpected, Id, Extra}};
@@ -3983,15 +4389,16 @@ ma_v2_inform3(MA) ->
     
     Commands = 
 	[
-	 {15, "Send notification [tag31]",                    Cmd15},
-	 {16, "Expect notification message [tag31]",          Cmd16}, 
-	 {17, "Expect targets message [tag31]",               Cmd17}, 
-	 {18, "Expect notification (no) response message [tag31]", Cmd18}
+	 {15, "Send notification [" ++ atom_to_list(Tag15) ++ "]", Cmd15},
+	 {16, "Expect notification message [" ++ atom_to_list(Tag15) ++ "]", Cmd16}, 
+	 {17, "Expect targets message [" ++ atom_to_list(Tag15) ++ "]", Cmd17}, 
+	 {18, "Expect notification (no) response message [" ++ atom_to_list(Tag15) ++ "]", Cmd18}
 	],
 
     command_handler(Commands).
 		   
-    
+
+%% snmpa_notification_delivery_info_receiver callback function
 delivery_targets(Tag, Addresses, Extra) ->
     io:format("~w:delivery_targets -> entry with"
 	      "~n   Tag:       ~p"
@@ -4008,6 +4415,7 @@ delivery_targets(Tag, Addresses, Extra) ->
     end,
     ok.
 
+%% snmpa_notification_delivery_info_receiver callback function
 delivery_info(Tag, Address, DeliveryResult, Extra) ->
     io:format("~w:delivery_info -> entry with"
 	      "~n   Tag:            ~p"
@@ -4045,40 +4453,40 @@ command_handler([{No, Desc, Cmd}|Rest]) ->
 
 ma_v1_2_v2_trap(MA) ->
     snmpa:send_trap(MA,linkDown,"standard trap",[{ifIndex, [1], 1}]),
-    ?line expect(2, v2trap, [{[sysUpTime, 0], any},
-			     {[snmpTrapOID, 0], ?snmpTraps ++ [3]},
-			     {[ifIndex, 1], 1},
-			     {[snmpTrapEnterprise, 0], [1,2,3]}]).
+    ?line ?expect2(v2trap, [{[sysUpTime, 0], any},
+			    {[snmpTrapOID, 0], ?snmpTraps ++ [3]},
+			    {[ifIndex, 1], 1},
+			    {[snmpTrapEnterprise, 0], [1,2,3]}]).
 
     
 ma_v1_2_v2_trap2(MA) ->
     snmpa:send_trap(MA,testTrap2,"standard trap",[{sysContact,"pelle"}]),
-    ?line expect(3, v2trap, [{[sysUpTime, 0], any},
-			     {[snmpTrapOID, 0], ?system ++ [0,1]},
-			     {[system, [4,0]], "pelle"},
-			     {[snmpTrapEnterprise, 0], ?system}]).
+    ?line ?expect2(v2trap, [{[sysUpTime, 0], any},
+			    {[snmpTrapOID, 0], ?system ++ [0,1]},
+			    {[system, [4,0]], "pelle"},
+			    {[snmpTrapEnterprise, 0], ?system}]).
     
 
 sa_v1_2_v2_trap1(SA) ->
     snmpa:verbosity(SA, {subagents, trace}),
     snmpa:send_trap(SA, saTrap, "standard trap"),
-    ?line expect(trap1_4, v2trap, [{[sysUpTime, 0], any},
-				   {[snmpTrapOID, 0], ?ericsson ++ [0, 1]},
-				   {[system, [4,0]],
-				    "{mbj,eklas}@erlang.ericsson.se"},
-				   {[sa, [1,0]], "sa_test"},
-				   {[snmpTrapEnterprise, 0], ?ericsson}]),
+    ?line ?expect2(v2trap, [{[sysUpTime, 0], any},
+			    {[snmpTrapOID, 0], ?ericsson ++ [0, 1]},
+			    {[system, [4,0]],
+			     "{mbj,eklas}@erlang.ericsson.se"},
+			    {[sa, [1,0]], "sa_test"},
+			    {[snmpTrapEnterprise, 0], ?ericsson}]),
     snmpa:verbosity(SA, {subagents, silence}),
     ok.
 
 sa_v1_2_v2_trap2(SA) ->
     snmpa:verbosity(SA, {subagents, trace}),
     snmpa:send_trap(SA, saTrap, "standard trap",[{sysContact,"pelle"}]),
-    ?line expect(trap2_4, v2trap, [{[sysUpTime, 0], any},
-				   {[snmpTrapOID, 0], ?ericsson ++ [0, 1]},
-				   {[system, [4,0]], "pelle"},
-				   {[sa, [1,0]], "sa_test"},
-				   {[snmpTrapEnterprise, 0], ?ericsson}]),
+    ?line ?expect2(v2trap, [{[sysUpTime, 0], any},
+			    {[snmpTrapOID, 0], ?ericsson ++ [0, 1]},
+			    {[system, [4,0]], "pelle"},
+			    {[sa, [1,0]], "sa_test"},
+			    {[snmpTrapEnterprise, 0], ?ericsson}]),
     snmpa:verbosity(SA, {subagents, silence}),
     ok.
 
@@ -4087,13 +4495,13 @@ sa_v1_2_v2_trap3(SA) ->
     snmpa:verbosity(SA, {subagents, trace}),
     snmpa:send_trap(SA, saTrap2, "standard trap",
 			 [{intViewSubtree, [4], [1,2,3,4]}]),
-    ?line expect(trap3_4, v2trap, [{[sysUpTime, 0], any},
-				   {[snmpTrapOID, 0], ?ericsson ++ [0, 2]},
-				   {[system, [4,0]],
-				    "{mbj,eklas}@erlang.ericsson.se"},
-				   {[sa, [1,0]], "sa_test"},
-				   {[intViewSubtree,4],[1,2,3,4]},
-				   {[snmpTrapEnterprise, 0], ?ericsson}]),
+    ?line ?expect2(v2trap, [{[sysUpTime, 0], any},
+			    {[snmpTrapOID, 0], ?ericsson ++ [0, 2]},
+			    {[system, [4,0]],
+			     "{mbj,eklas}@erlang.ericsson.se"},
+			    {[sa, [1,0]], "sa_test"},
+			    {[intViewSubtree,4],[1,2,3,4]},
+			    {[snmpTrapEnterprise, 0], ?ericsson}]),
     snmpa:verbosity(SA, {subagents, silence}),
     ok.
 			     
@@ -4107,15 +4515,15 @@ sa_errs_bad_value() ->
        {[sa, [2,0]], 5}, % badValue (i is_set_ok)
        {NewKeyc5, ?createAndGo},
        {NewKeyc4, 2}]),
-    ?line expect(1, badValue, 2, any),   
+    ?line ?expect3(badValue, 2, any),   
     s([{NewKeyc3, 2},
        {[sa, [2,0]], 6}, % wrongValue (i is_set_ok)
        {NewKeyc5, ?createAndGo},
        {NewKeyc4, 2}]),
-    ?line expect(1, ?v1_2(badValue, wrongValue), 2, any),   
+    ?line ?expect3(?v1_2(badValue, wrongValue), 2, any),   
     g([NewKeyc4]),
-    ?line ?v1_2(expect(2, noSuchName, 1, any),
-		expect(2, [{NewKeyc4, noSuchInstance}])).
+    ?line ?v1_2(?expect3(noSuchName, 1, any),
+		?expect1([{NewKeyc4, noSuchInstance}])).
 
 %% Req. SA-MIB, OLD-SNMPEA-MIB
 sa_errs_gen_err() ->
@@ -4124,23 +4532,23 @@ sa_errs_gen_err() ->
     NewKeyc5 = [intCommunityEntry,[5],get(mip),is("test")],
     s([{NewKeyc3, 2},{NewKeyc4, 2},
        {NewKeyc5, ?createAndGo}, {[sa, [3,0]], 5}]),
-    ?line expect(1, genErr, 4, any),
+    ?line ?expect3(genErr, 4, any),
 % The row might have been added; we don't know.
 % (as a matter of fact we do - it is added, because the agent
 % first sets its own vars, and then th SAs. Lets destroy it.
     s([{NewKeyc5, ?destroy}]),
-    ?line expect(2, [{NewKeyc5, ?destroy}]).
+    ?line ?expect1([{NewKeyc5, ?destroy}]).
 
 %% Req. SA-MIB, OLD-SNMPEA-MIB
 sa_too_big() ->
     g([[sa, [4,0]]]),
-    ?line expect(1, tooBig).
+    ?line ?expect1(tooBig).
 
 %% Req. Klas1, system group, snmp group (v1/v2)
-next_across_sa() ->
+next_across_sa_test() ->
     gn([[sysDescr],[klas1,5]]),
-    ?line expect(1, [{[sysDescr,0], "Erlang SNMP agent"},
-	       {[snmpInPkts, 0], any}]).
+    ?line ?expect1([{[sysDescr,0], "Erlang SNMP agent"},
+		    {[snmpInPkts, 0], any}]).
 
 %% snmp_test_mgr:s([{[fStatus3, 1], 4}, {[fname3,0], "ok"}]). -> noError
 %% snmp_test_mgr:s([{[fStatus3, 1], 4}, {[fname3,0], "hoj"}]). -> {badValue, 2}
@@ -4151,40 +4559,40 @@ next_across_sa() ->
 %% Req. Klas3, Klas4
 undo_test() ->
     s([{[fStatus3, 1], 4}, {[fname3,0], "ok"}]),
-    ?line expect(1, [{[fStatus3, 1], 4}, {[fname3,0], "ok"}]),
+    ?line ?expect1([{[fStatus3, 1], 4}, {[fname3,0], "ok"}]),
     s([{[fStatus3, 1], 4}, {[fname3,0], "hoj"}]),
-    ?line expect(2, ?v1_2(badValue, inconsistentValue), 2, any), 
+    ?line ?expect3(?v1_2(badValue, inconsistentValue), 2, any), 
     s([{[fStatus3, 3], 4}, {[fname3,0], "hoj"}]),
-    ?line expect(3, ?v1_2(genErr, undoFailed), 1, any), 
+    ?line ?expect3(?v1_2(genErr, undoFailed), 1, any), 
     s([{[fStatus3, 4], 4}, {[fname3,0], "ok"}]),
-    ?line expect(4, ?v1_2(genErr, commitFailed), 1, any), 
+    ?line ?expect3(?v1_2(genErr, commitFailed), 1, any), 
 % unfortunatly we don't know if we'll get undoFailed or commitFailed.
 % it depends on which order the agent traverses the varbind list.
 %    s([{[fStatus3, 4], 4}, {[fname3,0], "ufail"}]),
 %    ?line expect(5, ?v1_2(genErr, undoFailed), 1, any),
     s([{[fStatus3, 1], 4}, {[fname3,0], "xfail"}]),
-    ?line expect(6, genErr, 2, any).
+    ?line ?expect3(genErr, 2, any).
     
 %% Req. Klas3, Klas4
 bad_return() ->
     g([[fStatus4,4],
        [fName4,4]]),
-    ?line expect(4, genErr, 2, any),
+    ?line ?expect3(genErr, 2, any),
     g([[fStatus4,5],
        [fName4,5]]),
-    ?line expect(5, genErr, 1, any),
+    ?line ?expect3(genErr, 1, any),
     g([[fStatus4,6],
        [fName4,6]]),
-    ?line expect(6, genErr, 2, any),
+    ?line ?expect3(genErr, 2, any),
     gn([[fStatus4,7],
        [fName4,7]]),
-    ?line expect(7, genErr, 2, any),
+    ?line ?expect3(genErr, 2, any),
     gn([[fStatus4,8],
        [fName4,8]]),
-    ?line expect(8, genErr, 1, any),
+    ?line ?expect3(genErr, 1, any),
     gn([[fStatus4,9],
        [fName4,9]]),
-    ?line expect(9, genErr, 2, any).
+    ?line ?expect3(genErr, 2, any).
 
 
 %%%-----------------------------------------------------------------
@@ -4195,7 +4603,16 @@ bad_return() ->
 %%% already tested by the normal tests.
 %%%-----------------------------------------------------------------
 
-
+standard_mibs_cases() ->
+    [
+     snmp_standard_mib, 
+     snmp_community_mib,
+     snmp_framework_mib, 
+     snmp_target_mib,
+     snmp_notification_mib, 
+     snmp_view_based_acm_mib
+    ].
+    
 
 %%-----------------------------------------------------------------
 %% For this test, the agent is configured for v1.
@@ -4247,27 +4664,27 @@ std_mib_init() ->
     %% disable authentication failure traps.  (otherwise w'd get many of
     %% them - this is also a test to see that it works).
     s([{[snmpEnableAuthenTraps,0], 2}]),
-    ?line expect(std_mib_init_1, [{[snmpEnableAuthenTraps, 0], 2}]).
+    ?line ?expect1([{[snmpEnableAuthenTraps, 0], 2}]).
 
 %% Req. SNMP-STANDARD-MIB | SNMPv2-MIB
 std_mib_finish() ->
     %% enable again
     s([{[snmpEnableAuthenTraps,0], 1}]),
-    ?line expect(std_mib_finish_1, [{[snmpEnableAuthenTraps, 0], 1}]).
+    ?line ?expect1([{[snmpEnableAuthenTraps, 0], 1}]).
 
 %% Req. SNMP-STANDARD-MIB
 standard_mib_test_finish() ->
     %% force a authenticationFailure (should result in a trap)
     std_mib_write(),
     %% check that we got a trap
-    ?line expect(standard_mib_test_finish_2, trap, [1,2,3], 4, 0, []).
+    ?line ?expect5(trap, [1,2,3], 4, 0, []).
 
 %% Req. SNMP-STANDARD-MIB | SNMPv2-MIB
 std_mib_read() ->
     ?DBG("std_mib_read -> entry", []),
     g([[sysUpTime,0]]), % try a bad <something>; msg dropped, no reply
     ?DBG("std_mib_read -> await timeout (i.e. no reply)", []),
-    ?line expect(std_mib_read_1, timeout). % make sure we don't get a trap!
+    ?line ?expect1(timeout). % make sure we don't get a trap!
 
 
 %% Req. SNMP-STANDARD-MIB | SNMPv2-MIB
@@ -4279,6 +4696,18 @@ std_mib_write() ->
 std_mib_asn_err() ->
     snmp_test_mgr:send_bytes([48,99,67,12,0,0,0,0,0,0,5]).
 
+
+standard_mibs2_cases() ->
+    [
+     snmpv2_mib_2, 
+     snmp_community_mib_2,
+     snmp_framework_mib_2, 
+     snmp_target_mib_2,
+     snmp_notification_mib_2, 
+     snmp_view_based_acm_mib_2
+    ].
+    
+
 %%-----------------------------------------------------------------
 %% For this test, the agent is configured for v2 and v3.
 %% o  Test the counters and control objects in SNMPv2-MIB
@@ -4327,6 +4756,19 @@ snmpv2_mib_2(Config) when is_list(Config) ->
     
     ?LOG("snmpv2_mib_2 -> done",[]).
     
+
+standard_mibs3_cases() ->
+    [
+     snmpv2_mib_3, 
+     snmp_framework_mib_3, 
+     snmp_mpd_mib_3,
+     snmp_target_mib_3, 
+     snmp_notification_mib_3,
+     snmp_view_based_acm_mib_3, 
+     snmp_user_based_sm_mib_3
+    ].
+
+    
 %% Req. SNMPv2-MIB
 snmpv2_mib_3(suite) -> [];
 snmpv2_mib_3(Config) when is_list(Config) ->
@@ -4358,13 +4800,13 @@ snmpv2_mib_test_finish() ->
 
     %% check that we got a trap
     ?DBG("ma_v2_inform -> await trap",[]),
-    ?line expect(2, v2trap, [{[sysUpTime,0], any},
-			     {[snmpTrapOID,0], ?authenticationFailure}]),
+    ?line ?expect2(v2trap, [{[sysUpTime,0], any},
+			    {[snmpTrapOID,0], ?authenticationFailure}]),
 
     %% and the the inform
     ?DBG("ma_v2_inform -> await inform",[]),
-    ?line expect(2, {inform,true}, [{[sysUpTime,0], any},
-				    {[snmpTrapOID,0],?authenticationFailure}]).
+    ?line ?expect2({inform,true}, [{[sysUpTime,0], any},
+				   {[snmpTrapOID,0],?authenticationFailure}]).
 
 %% Req. SNMP-STANDARD-MIB | SNMPv2-MIB
 std_mib_a() ->
@@ -4402,12 +4844,12 @@ std_mib_c({InBadCommunityNames, InBadCommunityUses, InASNErrs}) ->
 snmpv2_mib_a() ->
     ?line [SetSerial] = get_req(2, [[snmpSetSerialNo,0]]),
     s([{[snmpSetSerialNo,0], SetSerial}, {[sysLocation, 0], "val2"}]),
-    ?line expect(snmpv2_mib_a_3, [{[snmpSetSerialNo,0], SetSerial},
-				  {[sysLocation, 0], "val2"}]),
+    ?line ?expect1([{[snmpSetSerialNo,0], SetSerial},
+		    {[sysLocation, 0], "val2"}]),
     s([{[sysLocation, 0], "val3"}, {[snmpSetSerialNo,0], SetSerial}]),
-    ?line expect(snmpv2_mib_a_4, inconsistentValue, 2,
-		 [{[sysLocation, 0], "val3"},
-		  {[snmpSetSerialNo,0], SetSerial}]),
+    ?line ?expect3(inconsistentValue, 2,
+		   [{[sysLocation, 0], "val3"},
+		    {[snmpSetSerialNo,0], SetSerial}]),
     ?line ["val2"] = get_req(5, [[sysLocation,0]]).
     
     
@@ -4421,13 +4863,13 @@ snmp_community_mib(Config) when is_list(Config) ->
     ?P(snmp_community_mib), 
     init_case(Config),
     ?line load_master_std("SNMP-COMMUNITY-MIB"),
-    try_test(snmp_community_mib),
+    try_test(snmp_community_mib_test),
     ?line unload_master("SNMP-COMMUNITY-MIB").
 
 snmp_community_mib_2(X) -> ?P(snmp_community_mib_2), snmp_community_mib(X).
 
 %% Req. SNMP-COMMUNITY-MIB
-snmp_community_mib() ->
+snmp_community_mib_test() ->
     ?INF("NOT YET IMPLEMENTED", []),
     nyi.
 
@@ -4439,7 +4881,7 @@ snmp_framework_mib(Config) when is_list(Config) ->
     ?P(snmp_framework_mib), 
     init_case(Config),
     ?line load_master_std("SNMP-FRAMEWORK-MIB"),
-    try_test(snmp_framework_mib),
+    try_test(snmp_framework_mib_test),
     ?line unload_master("SNMP-FRAMEWORK-MIB").
 
 snmp_framework_mib_2(X) -> ?P(snmp_framework_mib_2), snmp_framework_mib(X).
@@ -4448,11 +4890,11 @@ snmp_framework_mib_3(suite) -> [];
 snmp_framework_mib_3(Config) when is_list(Config) ->
     ?P(snmp_framework_mib_3), 
     init_case(Config),
-    try_test(snmp_framework_mib).
+    try_test(snmp_framework_mib_test).
 
 
 %% Req. SNMP-FRAMEWORK-MIB
-snmp_framework_mib() ->
+snmp_framework_mib_test() ->
     ?line ["agentEngine"] = get_req(1, [[snmpEngineID,0]]),
     ?line [EngineTime] = get_req(2, [[snmpEngineTime,0]]),
     ?SLEEP(5000),
@@ -4538,7 +4980,7 @@ snmp_mpd_mib_a() ->
 -define(snmpUnknownPDUHandlers_instance, [1,3,6,1,6,3,11,2,1,3,0]).
 snmp_mpd_mib_b() ->
     g([[sysUpTime,0]]),
-    ?line expect(1, report, [{?snmpUnknownPDUHandlers_instance, any}]).
+    ?line ?expect2(report, [{?snmpUnknownPDUHandlers_instance, any}]).
     
 
 snmp_mpd_mib_c(UnknownPDUHs) ->
@@ -4551,14 +4993,14 @@ snmp_target_mib(Config) when is_list(Config) ->
     ?P(snmp_target_mib), 
     init_case(Config),
     ?line load_master_std("SNMP-TARGET-MIB"),
-    try_test(snmp_target_mib),
+    try_test(snmp_target_mib_test),
     ?line unload_master("SNMP-TARGET-MIB").
 
 snmp_target_mib_2(X) -> ?P(snmp_target_mib_2), snmp_target_mib(X).
 
 snmp_target_mib_3(X) -> ?P(snmp_target_mib_3), snmp_target_mib(X).
 
-snmp_target_mib() ->
+snmp_target_mib_test() ->
     ?INF("NOT YET IMPLEMENTED", []),
     nyi.
 
@@ -4567,7 +5009,7 @@ snmp_notification_mib(Config) when is_list(Config) ->
     ?P(snmp_notification_mib), 
     init_case(Config),
     ?line load_master_std("SNMP-NOTIFICATION-MIB"),
-    try_test(snmp_notification_mib),
+    try_test(snmp_notification_mib_test),
     ?line unload_master("SNMP-NOTIFICATION-MIB").
 
 snmp_notification_mib_2(X) -> ?P(snmp_notification_mib_2), 
@@ -4576,7 +5018,7 @@ snmp_notification_mib_2(X) -> ?P(snmp_notification_mib_2),
 snmp_notification_mib_3(X) -> ?P(snmp_notification_mib_3), 
 			      snmp_notification_mib(X).
 
-snmp_notification_mib() ->
+snmp_notification_mib_test() ->
     ?INF("NOT YET IMPLEMENTED", []),
     nyi.
 
@@ -4728,50 +5170,51 @@ snmp_view_based_acm_mib() ->
 
 do_set(Row) ->
     s(Row),
-    expect(do_set_1, Row).
+    ?expect1(Row).
     
 add_row(RowStatus) ->
     s([{RowStatus, ?createAndGo}]),
-    expect(add_row_1, [{RowStatus, ?createAndGo}]).
+    ?expect1([{RowStatus, ?createAndGo}]).
 
 del_row(RowStatus) ->
     s([{RowStatus, ?destroy}]),
-    expect(del_row_1, [{RowStatus, ?destroy}]).
+    ?expect1([{RowStatus, ?destroy}]).
     
     
 
 use_no_rights() ->
     g([[xDescr,0]]),
-    ?v1_2_3(expect(use_no_rights_11, noSuchName, 1, any),
-	    expect(use_no_rights_12, [{[xDescr,0], noSuchObject}]),
-	    expect(use_no_rights_13, authorizationError, 1, any)),
+    ?v1_2_3(?expect3(noSuchName, 1, any),
+	    ?expect1([{[xDescr,0], noSuchObject}]),
+	    ?expect3(authorizationError, 1, any)),
     g([[xDescr2,0]]),
-    ?v1_2_3(expect(use_no_rights_21, noSuchName, 1, any),
-	    expect(use_no_rights_22, [{[xDescr2,0], noSuchObject}]),
-	    expect(use_no_rights_23, authorizationError, 1, any)),
+    ?v1_2_3(?expect3(noSuchName, 1, any),
+	    ?expect1([{[xDescr2,0], noSuchObject}]),
+	    ?expect3(authorizationError, 1, any)),
     gn([[xDescr]]),
-    ?v1_2_3(expect(use_no_rights_31, noSuchName, 1, any),
-	    expect(use_no_rights_32, [{[xDescr], endOfMibView}]),
-	    expect(use_no_rights_33, authorizationError, 1, any)),
+    ?v1_2_3(?expect3(noSuchName, 1, any),
+	    ?expect1([{[xDescr], endOfMibView}]),
+	    ?expect3(authorizationError, 1, any)),
     s([{[xDescr,0], "tryit"}]),
-    ?v1_2_3(expect(use_no_rights_41, noSuchName, 1, any),
-	    expect(use_no_rights_42, noAccess, 1, any),
-	    expect(use_no_rights_43, authorizationError, 1, any)).
+    ?v1_2_3(?expect3(noSuchName, 1, any),
+	    ?expect3(noAccess, 1, any),
+	    ?expect3(authorizationError, 1, any)).
 
 
 use_rights() ->
     g([[xDescr,0]]),
-    expect(use_rights_1, [{[xDescr,0], any}]),
+    ?expect1([{[xDescr,0], any}]),
     g([[xDescr2,0]]),
-    expect(use_rights_2, [{[xDescr2,0], any}]),
+    ?expect1([{[xDescr2,0], any}]),
     s([{[xDescr,0], "tryit"}]),
-    expect(use_rights_3, noError, 0, any),
+    ?expect3(noError, 0, any),
     g([[xDescr,0]]),
-    expect(use_rights_4, [{[xDescr,0], "tryit"}]).
+    ?expect1([{[xDescr,0], "tryit"}]).
 
 mk_ln(X) ->
     [length(X) | X].
 
+
 %%-----------------------------------------------------------------
 %% o  add/delete users and try them
 %% o  test all secLevels
@@ -4851,15 +5294,15 @@ snmp_user_based_sm_mib_3(Config) when is_list(Config) ->
 
     %% Try some read requests
     ?line try_test(v3_sync, [[{usm_read, []}]],
-	      [{sec_level, authPriv}, {user, "privDES"}]),
+		   [{sec_level, authPriv}, {user, "privDES"}]),
 
     %% Delete the new user
     ?line try_test(v3_sync, [[{usm_del_user, []}]],
-	      [{sec_level, authPriv}, {user, "privDES"}]),
+		   [{sec_level, authPriv}, {user, "privDES"}]),
 
     %% Try some bad requests
     ?line try_test(v3_sync, [[{usm_bad, []}]],
-	      [{sec_level, authPriv}, {user, "privDES"}]),
+		   [{sec_level, authPriv}, {user, "privDES"}]),
 
     ?line unload_master("SNMP-USER-BASED-SM-MIB").
 
@@ -4871,7 +5314,7 @@ usm_add_user1() ->
     Vbs1  = [{[usmUserCloneFrom, NewRowIndex], RowPointer},
 	     {[usmUserStatus, NewRowIndex], ?createAndGo}],
     ?line s(Vbs1),
-    ?line expect(1, Vbs1),
+    ?line ?expect1(Vbs1),
     ok.
     
 usm_use_user() ->
@@ -4890,7 +5333,7 @@ usm_key_change1(ShaKey, DesKey) ->
     Vbs1 = [{[usmUserAuthKeyChange, NewRowIndex], ShaKeyChange},
 	    {[usmUserPrivKeyChange, NewRowIndex], DesKeyChange}],
     s(Vbs1),
-    ?line expect(1, Vbs1).
+    ?line ?expect1(Vbs1).
     
 %% Change own private keys
 usm_key_change2(OldShaKey, OldDesKey, ShaKey, DesKey) ->
@@ -4904,7 +5347,7 @@ usm_key_change2(OldShaKey, OldDesKey, ShaKey, DesKey) ->
     Vbs1 = [{[usmUserOwnAuthKeyChange, NewRowIndex], ShaKeyChange},
 	    {[usmUserOwnPrivKeyChange, NewRowIndex], DesKeyChange}],
     s(Vbs1),
-    ?line expect(1, Vbs1).
+    ?line ?expect1(Vbs1).
     
 %% Change other's public keys
 usm_key_change3(OldShaKey, OldDesKey, ShaKey, DesKey) ->
@@ -4917,16 +5360,16 @@ usm_key_change3(OldShaKey, OldDesKey, ShaKey, DesKey) ->
 							DesKey),
     Vbs1 = [{[usmUserOwnAuthKeyChange, NewRowIndex], ShaKeyChange}],
     s(Vbs1),
-    ?line expect(1, noAccess, 1, any),
+    ?line ?expect3(noAccess, 1, any),
     Vbs2 = [{[usmUserOwnPrivKeyChange, NewRowIndex], DesKeyChange}],
     s(Vbs2),
-    ?line expect(2, noAccess, 1, any),
+    ?line ?expect3(noAccess, 1, any),
     
     
     Vbs3 = [{[usmUserAuthKeyChange, NewRowIndex], ShaKeyChange},
 	    {[usmUserPrivKeyChange, NewRowIndex], DesKeyChange}],
     s(Vbs3),
-    ?line expect(1, Vbs3).
+    ?line ?expect1(Vbs3).
 
 usm_read() ->
     NewRowIndex = [11,"agentEngine", 7, "newUser"],
@@ -4936,13 +5379,12 @@ usm_read() ->
 	     [usmUserOwnAuthKeyChange, NewRowIndex],
 	     [usmUserPrivKeyChange, NewRowIndex],
 	     [usmUserOwnPrivKeyChange, NewRowIndex]]),
-    ?line expect(1, 
-		 [{[usmUserSecurityName, NewRowIndex], "newUser"},
-		  {[usmUserCloneFrom, NewRowIndex], [0,0]},
-		  {[usmUserAuthKeyChange, NewRowIndex], ""},
-		  {[usmUserOwnAuthKeyChange, NewRowIndex], ""},
-		  {[usmUserPrivKeyChange, NewRowIndex], ""},
-		  {[usmUserOwnPrivKeyChange, NewRowIndex], ""}]),
+    ?line ?expect1([{[usmUserSecurityName, NewRowIndex], "newUser"},
+		    {[usmUserCloneFrom, NewRowIndex], [0,0]},
+		    {[usmUserAuthKeyChange, NewRowIndex], ""},
+		    {[usmUserOwnAuthKeyChange, NewRowIndex], ""},
+		    {[usmUserPrivKeyChange, NewRowIndex], ""},
+		    {[usmUserOwnPrivKeyChange, NewRowIndex], ""}]),
     ok.
     
     
@@ -4951,7 +5393,7 @@ usm_del_user() ->
     NewRowIndex = [11,"agentEngine", 7, "newUser"],
     Vbs1  = [{[usmUserStatus, NewRowIndex], ?destroy}],
     ?line s(Vbs1),
-    ?line expect(1, Vbs1),
+    ?line ?expect1(Vbs1),
     ok.
 
 -define(usmUserCloneFrom, [1,3,6,1,6,3,15,1,2,2,1,4]).
@@ -4972,32 +5414,31 @@ usm_bad() ->
     Vbs1  = [{[usmUserCloneFrom, NewRowIndex], RowPointer1},
 	     {[usmUserStatus, NewRowIndex], ?createAndGo}],
     ?line s(Vbs1),
-    ?line expect(1, inconsistentName, 1, any),
+    ?line ?expect3(inconsistentName, 1, any),
 
     RowPointer2 = ?usmUserCloneFrom ++ [11|"agentEngine"] ++ [7|"privDES"],
     Vbs2  = [{[usmUserCloneFrom, NewRowIndex], RowPointer2},
 	     {[usmUserStatus, NewRowIndex], ?createAndGo}],
     ?line s(Vbs2),
-    ?line expect(2, wrongValue, 1, any),
+    ?line ?expect3(wrongValue, 1, any),
 
     RowPointer3 = ?usmUserSecurityName ++ [11|"agentEngine"] ++ [7|"privDES"],
     Vbs3  = [{[usmUserCloneFrom, NewRowIndex], RowPointer3},
 	     {[usmUserStatus, NewRowIndex], ?createAndGo}],
     ?line s(Vbs3),
-    ?line expect(3, Vbs3),
+    ?line ?expect1(Vbs3),
     ?line s([{[usmUserAuthProtocol, NewRowIndex], ?usmNoAuthProtocol}]),
-    ?line expect(4, inconsistentValue, 1, any),
+    ?line ?expect3(inconsistentValue, 1, any),
     ?line s([{[usmUserAuthProtocol, NewRowIndex], ?usmHMACMD5AuthProtocol}]),
-    ?line expect(5, inconsistentValue, 1, any),
+    ?line ?expect3(inconsistentValue, 1, any),
     ?line s([{[usmUserAuthProtocol, NewRowIndex], ?usmDESPrivProtocol}]),
-    ?line expect(6, wrongValue, 1, any),
+    ?line ?expect3(wrongValue, 1, any),
     ?line s([{[usmUserPrivProtocol, NewRowIndex], ?usmHMACSHAAuthProtocol}]),
-    ?line expect(7, wrongValue, 1, any),
+    ?line ?expect3(wrongValue, 1, any),
 
     Vbs4  = [{[usmUserStatus, NewRowIndex], ?destroy}],
     ?line s(Vbs4),
-    ?line expect(1, Vbs4),
-
+    ?line ?expect1(Vbs4),
     ok.
     
 
@@ -5239,7 +5680,60 @@ loop_it_2(Oid, N) ->
 %%% Testing of reported bugs and other tickets.
 %%%-----------------------------------------------------------------
 
+reported_bugs_cases() ->
+    [
+     otp_1128, 
+     otp_1129, 
+     otp_1131, 
+     otp_1162, 
+     otp_1222,
+     otp_1298, 
+     otp_1331, 
+     otp_1338, 
+     otp_1342, 
+     otp_1366, 
+     otp_2776,
+     otp_2979, 
+     otp_3187, 
+     otp_3725
+    ].
+
+reported_bugs2_cases() ->
+    [
+     otp_1128_2, 
+     otp_1129_2, 
+     otp_1131_2, 
+     otp_1162_2,
+     otp_1222_2, 
+     otp_1298_2, 
+     otp_1331_2, 
+     otp_1338_2,
+     otp_1342_2, 
+     otp_1366_2, 
+     otp_2776_2, 
+     otp_2979_2, 
+     otp_3187_2
+    ].
 
+reported_bugs3_cases() ->
+    [
+     otp_1128_3, 
+     otp_1129_3, 
+     otp_1131_3, 
+     otp_1162_3,
+     otp_1222_3, 
+     otp_1298_3, 
+     otp_1331_3, 
+     otp_1338_3,
+     otp_1342_3, 
+     otp_1366_3, 
+     otp_2776_3, 
+     otp_2979_3, 
+     otp_3187_3,
+     otp_3542
+    ].
+   
+    
 %%-----------------------------------------------------------------
 %% Ticket: OTP-1128
 %% Slogan: Bug in handling of createAndWait set-requests.
@@ -5251,14 +5745,14 @@ otp_1128(Config) when is_list(Config) ->
 
     ?line load_master("OLD-SNMPEA-MIB"),
     ?line init_old(),
-    try_test(otp_1128),
+    try_test(otp_1128_test),
     ?line unload_master("OLD-SNMPEA-MIB").
 
 otp_1128_2(X) -> ?P(otp_1128_2), otp_1128(X).
 
 otp_1128_3(X) -> ?P(otp_1128_3), otp_1128(X).
 
-otp_1128() ->
+otp_1128_test() ->
     io:format("Testing bug reported in ticket OTP-1128...~n"),
 
     NewKeyc3 = [intCommunityViewIndex,get(mip),is("test")],
@@ -5266,15 +5760,16 @@ otp_1128() ->
     NewKeyc5 = [intCommunityStatus,get(mip),is("test")],
 
     s([{NewKeyc5, ?createAndWait}, {NewKeyc4, 2}]),
-    ?line expect(28, [{NewKeyc5, ?createAndWait}, {NewKeyc4, 2}]),
+    ?line ?expect1([{NewKeyc5, ?createAndWait}, {NewKeyc4, 2}]),
     g([NewKeyc5]),
-    ?line expect(29, [{NewKeyc5, ?notReady}]),
+    ?line ?expect1([{NewKeyc5, ?notReady}]),
     s([{NewKeyc5, ?active}, {NewKeyc3, 2}]),
-    ?line expect(30, [{NewKeyc5, ?active}, {NewKeyc3, 2}]),
+    ?line ?expect1([{NewKeyc5, ?active}, {NewKeyc3, 2}]),
     g([NewKeyc5]),
-    ?line expect(31, [{NewKeyc5, ?active}]),
+    ?line ?expect1([{NewKeyc5, ?active}]),
     s([{NewKeyc5, ?destroy}]),
-    ?line expect(32, [{NewKeyc5, ?destroy}]).
+    ?line ?expect1([{NewKeyc5, ?destroy}]).
+
 
 %%-----------------------------------------------------------------
 %% Ticket: OTP-1129, OTP-1169
@@ -5297,6 +5792,7 @@ otp_1129_i(MaNode) ->
     false = rpc:call(MaNode, snmp, int_to_enum, [iso, 1]),
     false = rpc:call(MaNode, snmp, int_to_enum, [isox, 1]).
 
+
 %%-----------------------------------------------------------------
 %% Ticket: OTP-1131
 %% Slogan: Agent crashes / erlang node halts if RowIndex in a
@@ -5309,7 +5805,7 @@ otp_1131(Config) when is_list(Config) ->
     init_case(Config),
 
     ?line load_master("Klas1"),
-    try_test(otp_1131),
+    try_test(otp_1131_test),
     ?line unload_master("Klas1").
 
 otp_1131_2(X) -> ?P(otp_1131_2), otp_1131(X).
@@ -5352,11 +5848,11 @@ otp_1131_3(X) ->
     ?P(otp_1131_3), 
     otp_1131(X).
 
-otp_1131() ->
+otp_1131_test() ->
     io:format("Testing bug reported in ticket OTP-1131...~n"),
     s([{[friendsEntry, [2, 3, 1]], s, "kompis3"},
        {[friendsEntry, [3, 3, 1]], i, ?createAndGo}]),
-    ?line expect(1, ?v1_2(noSuchName, noCreation), 2, any).
+    ?line ?expect3(?v1_2(noSuchName, noCreation), 2, any).
 
 
 %%-----------------------------------------------------------------
@@ -5368,16 +5864,16 @@ otp_1162(Config) when is_list(Config) ->
     ?P(otp_1162), 
     {SaNode, _MgrNode, _MibDir} = init_case(Config),
     ?line {ok, SA} = start_subagent(SaNode, ?sa, "SA-MIB"),
-    try_test(otp_1162),
+    try_test(otp_1162_test),
     stop_subagent(SA).
 
 otp_1162_2(X) -> ?P(otp_1162_2), otp_1162(X).
 
 otp_1162_3(X) -> ?P(otp_1162_3), otp_1162(X).
 
-otp_1162() ->
+otp_1162_test() ->
     s([{[sa, [2,0]], 6}]), % wrongValue (i is_set_ok)
-    ?line expect(1, ?v1_2(badValue, wrongValue), 1, any).
+    ?line ?expect3(?v1_2(badValue, wrongValue), 1, any).
 
 
 %%-----------------------------------------------------------------
@@ -5390,7 +5886,7 @@ otp_1222(Config) when is_list(Config) ->
     init_case(Config),
     ?line load_master("Klas3"),
     ?line load_master("Klas4"),
-    try_test(otp_1222),
+    try_test(otp_1222_test),
     ?line unload_master("Klas3"),
     ?line unload_master("Klas4").
 
@@ -5398,12 +5894,13 @@ otp_1222_2(X) -> ?P(otp_1222_2), otp_1222(X).
 
 otp_1222_3(X) -> ?P(otp_1222_3), otp_1222(X).
 
-otp_1222() ->
+otp_1222_test() ->
     io:format("Testing bug reported in ticket OTP-1222...~n"),
     s([{[fStatus4,1], 4}, {[fName4,1], 1}]),
-    ?line expect(1, genErr, 0, any),
+    ?line ?expect3(genErr, 0, any),
     s([{[fStatus4,2], 4}, {[fName4,2], 1}]),
-    ?line expect(2, genErr, 0, any).
+    ?line ?expect3(genErr, 0, any).
+
 
 %%-----------------------------------------------------------------
 %% Ticket: OTP-1298
@@ -5415,17 +5912,17 @@ otp_1298(Config) when is_list(Config) ->
     init_case(Config),
 
     ?line load_master("Klas2"),
-    try_test(otp_1298),
+    try_test(otp_1298_test),
     ?line unload_master("Klas2").
 
 otp_1298_2(X) -> ?P(otp_1298_2), otp_1298(X).
 
 otp_1298_3(X) -> ?P(otp_1298_3), otp_1298(X).
 
-otp_1298() ->
+otp_1298_test() ->
     io:format("Testing bug reported in ticket OTP-1298...~n"),
     s([{[fint,0], -1}]),
-    ?line expect(1298, [{[fint,0], -1}]).
+    ?line ?expect1([{[fint,0], -1}]).
     
 
 %%-----------------------------------------------------------------
@@ -5438,17 +5935,17 @@ otp_1331(Config) when is_list(Config) ->
     init_case(Config),
     ?line load_master("OLD-SNMPEA-MIB"),
     ?line init_old(),
-    try_test(otp_1331),
+    try_test(otp_1331_test),
     ?line unload_master("OLD-SNMPEA-MIB").
 
 otp_1331_2(X) -> ?P(otp_1331_2), otp_1331(X).
 
 otp_1331_3(X) -> ?P(otp_1331_3), otp_1331(X).
 
-otp_1331() ->
+otp_1331_test() ->
     NewKeyc5 = [intCommunityStatus,[127,32,0,0],is("test")],
     s([{NewKeyc5, ?destroy}]),
-    ?line expect(1, [{NewKeyc5, ?destroy}]).
+    ?line ?expect1([{NewKeyc5, ?destroy}]).
 
 
 %%-----------------------------------------------------------------
@@ -5461,18 +5958,19 @@ otp_1338(Config) when is_list(Config) ->
     init_case(Config),
 
     ?line load_master("Klas2"),
-    try_test(otp_1338),
+    try_test(otp_1338_test),
     ?line unload_master("Klas2").
 
 otp_1338_2(X) -> ?P(otp_1338_2), otp_1338(X).
 
 otp_1338_3(X) -> ?P(otp_1338_3), otp_1338(X).
 
-otp_1338() ->
+otp_1338_test() ->
     s([{[kStatus2, 7], i, ?createAndGo}]),
-    ?line expect(1, [{[kStatus2, 7], ?createAndGo}]),
+    ?line ?expect1([{[kStatus2, 7], ?createAndGo}]),
     g([[kName2, 7]]),
-    ?line expect(2, [{[kName2, 7], "JJJ"}]).
+    ?line ?expect1([{[kName2, 7], "JJJ"}]).
+
 
 %%-----------------------------------------------------------------
 %% Ticket: OTP-1342
@@ -5484,18 +5982,18 @@ otp_1342(Config) when is_list(Config) ->
     ?P(otp_1342), 
     init_case(Config),
     ?line load_master("Klas4"),
-    try_test(otp_1342),
+    try_test(otp_1342_test),
     ?line unload_master("Klas4").
 
 otp_1342_2(X) -> ?P(otp_1342_2), otp_1342(X).
 
 otp_1342_3(X) -> ?P(otp_1342_3), otp_1342(X).
 
-otp_1342() ->
+otp_1342_test() ->
     s([{[fIndex5, 1], i, 1},
        {[fName5, 1], i, 3},
        {[fStatus5, 1], i, ?createAndGo}]),
-    ?line expect(1, ?v1_2(noSuchName, noCreation), 3, any).
+    ?line ?expect3(?v1_2(noSuchName, noCreation), 3, any).
 
 
 %%-----------------------------------------------------------------
@@ -5510,17 +6008,18 @@ otp_1366(Config) when is_list(Config) ->
     init_case(Config),
     ?line load_master("OLD-SNMPEA-MIB"),
     ?line init_old(),
-    try_test(otp_1366),
+    try_test(otp_1366_test),
     ?line unload_master("OLD-SNMPEA-MIB").
 
 otp_1366_2(X) -> ?P(otp_1366_2), otp_1366(X).
 
 otp_1366_3(X) -> ?P(otp_1366_3), otp_1366(X).
 
-otp_1366() ->
+otp_1366_test() ->
     ?INF("NOT YET IMPLEMENTED", []),
     'NYI'.
 
+
 %%-----------------------------------------------------------------
 %% Ticket: OTP-2776
 %% Slogan: snmp:validate_date_and_time() fails when time is 00:00
@@ -5529,13 +6028,13 @@ otp_2776(suite) -> [];
 otp_2776(Config) when is_list(Config) ->
     ?P(otp_2776), 
     init_case(Config),
-    try_test(otp_2776).
+    try_test(otp_2776_test).
  
 otp_2776_2(X) -> ?P(otp_2776_2), otp_2776(X).
 
 otp_2776_3(X) -> ?P(otp_2776_3), otp_2776(X).
  
-otp_2776() ->
+otp_2776_test() ->
   io:format("Testing bug reported in ticket OTP-2776...~n"),
  
   Dt01_valid   = [19,98,9,1,1,0,23,0,43,0,0],
@@ -5598,17 +6097,18 @@ otp_2979(Config) when is_list(Config) ->
     init_case(Config),
     ?line load_master("Test1"),
     ?line init_old(),
-    try_test(otp_2979),
+    try_test(otp_2979_test),
     ?line unload_master("Test1").
 
 otp_2979_2(X) -> ?P(otp_2979_2), otp_2979(X).
 
 otp_2979_3(X) -> ?P(otp_2979_3), otp_2979(X).
 
-otp_2979() ->
+otp_2979_test() ->
     gn([[sparseDescr], [sparseStatus]]),
-    ?line expect(1, [{[sparseStr,0], "slut"},
-		     {[sparseStr,0], "slut"}]).
+    ?line ?expect1([{[sparseStr,0], "slut"},
+		    {[sparseStr,0], "slut"}]).
+
 
 %%-----------------------------------------------------------------
 %% Ticket: OTP-3187
@@ -5620,14 +6120,14 @@ otp_3187(Config) when is_list(Config) ->
     ?P(otp_3187), 
     init_case(Config),
     ?line load_master_std("SNMP-VIEW-BASED-ACM-MIB"),
-    otp_3187(),
+    otp_3187_test(),
     ?line unload_master("SNMP-VIEW-BASED-ACM-MIB").
 
 otp_3187_2(X) -> ?P(otp_3187_2), otp_3187(X).
 
 otp_3187_3(X) -> ?P(otp_3187_3), otp_3187(X).
 
-otp_3187() ->
+otp_3187_test() ->
     ?line Elements =
        snmp_view_based_acm_mib:vacmAccessTable(get_next,[],[4,5,6]),
     lists:foreach(fun(E) ->
@@ -5645,9 +6145,9 @@ otp_3542(suite) -> [];
 otp_3542(Config) when is_list(Config) ->
     ?P(otp_3542), 
     init_case(Config),
-    try_test(otp_3542).
+    try_test(otp_3542_test).
 
-otp_3542() ->
+otp_3542_test() ->
     io:format("SNMP v3 discovery...~n"),
     ?line Res = snmp_test_mgr:d(),
     io:format("SNMP v3 discovery result: ~p~n",[Res]).
@@ -5716,10 +6216,15 @@ otp_3725_test(MaNode) ->
 %% Slogan: Target mib tag list check invalid
 %%-----------------------------------------------------------------
 
+tickets1_cases() ->
+    [
+     {group, otp4394}, 
+     {group, otp7157}
+    ].
+    
 
-
-init_otp_4394(Config) when is_list(Config) ->
-    ?DBG("init_otp_4394 -> entry with"
+otp_4394_init(Config) when is_list(Config) ->
+    ?DBG("otp_4394_init -> entry with"
 	   "~n   Config: ~p", [Config]),
     ?line AgentConfDir = ?config(agent_conf_dir, Config),
     ?line MgrDir       = ?config(mgr_dir,        Config),
@@ -5772,35 +6277,35 @@ otp_4394_config(AgentConfDir, MgrDir, Ip0) ->
     
 
 
-finish_otp_4394(Config) when is_list(Config) ->
+otp_4394_finish(Config) when is_list(Config) ->
     ?DBG("finish_otp_4394 -> entry", []),
     C1 = stop_agent(Config),
     delete_files(C1),
     erase(mgr_node),
     lists:keydelete(vsn, 1, C1).
 
-otp_4394_test(suite) -> [];
-otp_4394_test(Config) ->
-    ?P(otp_4394_test), 
-    ?DBG("otp_4394_test -> entry", []),
+otp_4394(suite) -> [];
+otp_4394(Config) ->
+    ?P(otp_4394), 
+    ?DBG("otp_4394 -> entry", []),
     init_case(Config),
-    try_test(otp_4394_test1),
-    ?DBG("otp_4394_test -> done", []),
+    try_test(otp_4394_test),
+    ?DBG("otp_4394 -> done", []),
     ok.
 
-otp_4394_test1() ->
-    ?DBG("otp_4394_test1 -> entry", []),
+otp_4394_test() ->
+    ?DBG("otp_4394_test -> entry", []),
     gn([[1,1]]),
     Res = 
 	case snmp_test_mgr:expect(1, [{[sysDescr,0],  "Erlang SNMP agent"}]) of
 	    %% {error, 1, {"?",[]}, {"~w",[timeout]}}
 	    {error, 1, _, {_, [timeout]}} ->
-		?DBG("otp_4394_test1 -> expected result: timeout", []),
+		?DBG("otp_4394_test -> expected result: timeout", []),
 		ok;
 	    Else ->
 		Else
 	end,
-    ?DBG("otp_4394_test1 -> done with: ~p", [Res]),
+    ?DBG("otp_4394_test -> done with: ~p", [Res]),
     Res.
 
 
@@ -5811,7 +6316,7 @@ otp_4394_test1() ->
 
 
 
-init_otp_7157(Config) when is_list(Config) ->
+otp_7157_init(Config) when is_list(Config) ->
     %% <CONDITIONAL-SKIP>
     Skippable = [win32],
     Condition = fun() -> ?OS_BASED_SKIP(Skippable) end,
@@ -5831,30 +6336,30 @@ init_otp_7157(Config) when is_list(Config) ->
     [{vsn, v2} | start_v2_agent(Config, Opts)].
 
 
-finish_otp_7157(Config) when is_list(Config) ->
+otp_7157_finish(Config) when is_list(Config) ->
     ?DBG("finish_otp_7157 -> entry", []),
     C1 = stop_agent(Config),
     delete_files(C1),
     erase(mgr_node),
     lists:keydelete(vsn, 1, C1).
 
-otp_7157_test(suite) -> [];
-otp_7157_test(Config) ->
-    ?P(otp_7157_test), 
-    ?DBG("otp_7157_test -> entry", []),
+otp_7157(suite) -> [];
+otp_7157(Config) ->
+    ?P(otp_7157), 
+    ?DBG("otp_7157 -> entry", []),
     init_case(Config),
     MA = whereis(snmp_master_agent),
     ?line load_master("Test1"),
-    try_test(otp_7157_test1, [MA]),
+    try_test(otp_7157_test, [MA]),
     ?line unload_master("Test1"),
-    ?DBG("otp_7157_test -> done", []),
+    ?DBG("otp_7157 -> done", []),
     ok.
 
 %% ts:run(snmp, snmp_agent_test, [batch]).
-otp_7157_test1(MA) ->
-    ?LOG("start otp_7157_test1 test (~p)",[MA]),
+otp_7157_test(MA) ->
+    ?LOG("start otp_7157_test test (~p)",[MA]),
     snmpa:verbosity(MA, trace),
-    ?LOG("start otp_7157_test1 test",[]),
+    ?LOG("start otp_7157_test test",[]),
     ?P1("Testing that varbinds in traps/notifications are not reordered"),
     
     ?DBG("send cntTrap",[]),
@@ -5862,11 +6367,11 @@ otp_7157_test1(MA) ->
 
     ?DBG("await response",[]),
     %% We don't really care about the values, just the vb order.
-    ?line ok = expect(1, v2trap, [{[sysUpTime,   0], any},
-				  {[snmpTrapOID, 0], any},
-				  {[sysContact,  0], any},
-				  {[cnt64,       0], any},
-				  {[sysLocation, 0], any}]),
+    ?line ok = ?expect2(v2trap, [{[sysUpTime,   0], any},
+				 {[snmpTrapOID, 0], any},
+				 {[sysContact,  0], any},
+				 {[cnt64,       0], any},
+				 {[sysLocation, 0], any}]),
 
     ?DBG("done", []),
     ok.
@@ -5878,6 +6383,13 @@ otp_7157_test1(MA) ->
 %% These cases are started in the new way
 %%-----------------------------------------------------------------
 
+tickets2_cases() ->
+    [
+     otp8395, 
+     otp9884
+    ].
+
+
 otp8395({init, Config}) when is_list(Config) ->
     ?DBG("otp8395(init) -> entry with"
 	 "~n   Config: ~p", [Config]),
@@ -6336,13 +6848,13 @@ process_options(Defaults, _Opts) ->
 %% 	{value, {Key, Value}} when is_list->
 	    
 
-snmp_app_env_init(Node, Entity, Conf) ->
-    rpc:call(Node, snmp_app_env_init, [Entity, Conf]).
+%% snmp_app_env_init(Node, Entity, Conf) ->
+%%     rpc:call(Node, snmp_app_env_init, [Entity, Conf]).
 
-snmp_app_env_init(Entity, Conf) ->
-    application:unload(snmp),
-    application:load(snmp),
-    application:set_env(snmp, Entity, Conf).
+%% snmp_app_env_init(Entity, Conf) ->
+%%     application:unload(snmp),
+%%     application:load(snmp),
+%%     application:set_env(snmp, Entity, Conf).
 
 start_stdalone_agent(Node, Config)  ->
     rpc:call(Node, ?MODULE, start_stdalone_agent, [Config]).
@@ -6403,10 +6915,10 @@ info_test(Config) when is_list(Config) ->
 
     ?line load_master("OLD-SNMPEA-MIB"),
     ?line init_old(),
-    try_test(info_test1, [node()]),
+    try_test(do_info, [node()]),
     ?line unload_master("OLD-SNMPEA-MIB").
     
-info_test1(MaNode) ->
+do_info(MaNode) ->
     ?line Info = rpc:call(MaNode, snmpa, info, []),
     ?DBG("info_test1 -> Info: ~n~p", [Info]),
     Keys = [vsns, 
@@ -6482,7 +6994,7 @@ verify_old_info([Key|Keys], Info) ->
 	    ?FAIL({missing_old_info, Key})
     end.
    
-%% string used in index
+%% Index String - string used in index
 is(S) -> [length(S) | S].
 
 try_test(Func) ->
@@ -6500,16 +7012,11 @@ try_test(Func, A, Opts) ->
 
 %% Test manager wrapperfunctions:
 g(Oids)          -> snmp_test_mgr:g(Oids).
-gn()             -> snmp_test_mgr:gn().
+%%gn()             -> snmp_test_mgr:gn().
 gn(OidsOrN)      -> snmp_test_mgr:gn(OidsOrN).
 gb(NR, MR, Oids) -> snmp_test_mgr:gb(NR, MR, Oids).
 s(VAV)           -> snmp_test_mgr:s(VAV).
    
-expect(A, B)             -> snmp_agent_test_lib:expect(A, B).
-expect(A, B, C)          -> snmp_agent_test_lib:expect(A, B, C).
-expect(A, B, C, D)       -> snmp_agent_test_lib:expect(A, B, C, D).
-expect(A, B, C, D, E, F) -> snmp_agent_test_lib:expect(A, B, C, D, E, F).
-
 get_req(Id, Vars) ->
     snmp_agent_test_lib:get_req(Id, Vars).
 
@@ -6545,8 +7052,8 @@ rewrite_usm_mgr(Dir, ShaKey, DesKey) ->
 reset_usm_mgr(Dir) ->
     snmp_agent_test_lib:reset_usm_mgr(Dir).
 
-update_community(Vsns, DIr) ->
-    snmp_agent_test_lib:update_community(Vsns, DIr).
+%% update_community(Vsns, Dir) ->
+%%     snmp_agent_test_lib:update_community(Vsns, Dir).
 
 update_vacm(Vsn, Dir) ->
     snmp_agent_test_lib:update_vacm(Vsn, Dir).
@@ -6579,8 +7086,8 @@ reset_target_params_conf(Dir) ->
 write_notify_conf(Dir) -> 
     snmp_agent_test_lib:write_notify_conf(Dir).
 
-write_view_conf(Dir) -> 
-    snmp_agent_test_lib:write_view_conf(Dir).
+%% write_view_conf(Dir) -> 
+%%     snmp_agent_test_lib:write_view_conf(Dir).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -6742,8 +7249,8 @@ lists_key1search(Key, List) when is_atom(Key) ->
     end.
 
 
-regs() ->
-    lists:sort(registered()).
+%% regs() ->
+%%     lists:sort(registered()).
 
 
 %% ------
diff --git a/lib/snmp/test/snmp_agent_test_lib.erl b/lib/snmp/test/snmp_agent_test_lib.erl
index 757aebfa9b..11c05fc1db 100644
--- a/lib/snmp/test/snmp_agent_test_lib.erl
+++ b/lib/snmp/test/snmp_agent_test_lib.erl
@@ -28,7 +28,7 @@
 	 start_mt_agent/1,        start_mt_agent/2, 
 	 stop_agent/1,
 
-	 start_sup/0,      stop_sup/2,
+	 %% start_sup/0,      stop_sup/2,
 	 start_subagent/3, stop_subagent/1, 
 	 start_sub_sup/1,  start_sub_sup/2, 
 
@@ -58,7 +58,7 @@
 	 init_all/1, finish_all/1,
 	 init_case/1,
 	 try_test/2, try_test/3, try_test/4,
-	 expect/2, expect/3, expect/4, expect/6, 
+	 expect/3, expect/4, expect/5, expect/7, 
 	 
 	 regs/0,
 	 rpc/3
@@ -418,10 +418,10 @@ start_bilingual_agent(Config, Opts)
     start_agent(Config, [v1,v2], Opts).
  
 start_mt_agent(Config) when is_list(Config) ->
-    start_agent(Config, [v2], [{snmp_multi_threaded, true}]).
+    start_agent(Config, [v2], [{multi_threaded, true}]).
  
 start_mt_agent(Config, Opts) when is_list(Config) andalso is_list(Opts) ->
-    start_agent(Config, [v2], [{snmp_multi_threaded, true}|Opts]).
+    start_agent(Config, [v2], [{multi_threaded, true}|Opts]).
  
 start_agent(Config, Vsns) ->
     start_agent(Config, Vsns, []).
@@ -437,79 +437,231 @@ start_agent(Config, Vsns, Opts) ->
     ?line AgentDbDir   = ?config(agent_db_dir,   Config),
     ?line SaNode       = ?config(snmp_sa,        Config),
 
-    app_env_init(vsn_init(Vsns) ++ 
-		 [{audit_trail_log,               read_write_log},
-		  {audit_trail_log_dir,           AgentLogDir},
-		  {audit_trail_log_size,          {10240, 10}},
-		  {force_config_reload,           false},
-		  {snmp_agent_type,               master},
-		  {snmp_config_dir,               AgentConfDir},
-		  {snmp_db_dir,                   AgentDbDir},
-		  {snmp_local_db_auto_repair,     true},
-		  {snmp_local_db_verbosity,       log},
-		  {snmp_master_agent_verbosity,   trace},
-		  {snmp_supervisor_verbosity,     trace},
-		  {snmp_mibserver_verbosity,      log},
-		  {snmp_symbolic_store_verbosity, log},
-		  {snmp_note_store_verbosity,     log},
-		  {snmp_net_if_verbosity,         trace}],
-		 Opts),
-
+    Env = app_agent_env_init(
+	    [{versions,         Vsns}, 
+	     {agent_type,       master},
+	     {agent_verbosity,  trace},
+	     {db_dir,           AgentDbDir},
+	     {audit_trail_log,  [{type, read_write},
+				 {dir,  AgentLogDir},
+				 {size, {10240, 10}}]},
+	     {config,           [{dir, AgentConfDir},
+				 {force_load, false}, 
+				 {verbosity,  trace}]}, 
+	     {local_db,         [{repair,    true},
+				 {verbosity, log}]}, 
+	     {mib_server,       [{verbosity, log}]},
+	     {symbolic_store,   [{verbosity, log}]},
+	     {note_store,       [{verbosity, log}]},
+	     {net_if,           [{verbosity, trace}]}],
+	    Opts),
+    
 
     process_flag(trap_exit,true),
 
     {ok, AppSup} = snmp_app_sup:start_link(),
     unlink(AppSup),
-    ?DBG("start_agent -> snmp app supervisor: ~p",[AppSup]),
+    ?DBG("start_agent -> snmp app supervisor: ~p", [AppSup]),
 
-    ?DBG("start_agent -> start master agent (old style)",[]),
-    ?line Sup = start_sup(), 
+    ?DBG("start_agent -> start master agent",[]),
+    ?line Sup = start_sup(Env), 
 
-    ?DBG("start_agent -> unlink from supervisor",[]),
+    ?DBG("start_agent -> unlink from supervisor", []),
     ?line unlink(Sup),
     ?line SaDir = ?config(sa_dir, Config),
-    ?DBG("start_agent -> (rpc) start sub on ~p",[SaNode]),
+    ?DBG("start_agent -> (rpc) start sub on ~p", [SaNode]),
     ?line {ok, Sub} = start_sub_sup(SaNode, SaDir),
     ?DBG("start_agent -> done",[]),
     ?line [{snmp_sup, {Sup, self()}}, {snmp_sub, Sub} | Config].
 
 
-vsn_init(Vsn) ->
-    vsn_init([v1,v2,v3], Vsn, []).
+app_agent_env_init(Env0, Opts) ->
+    ?DBG("app_agent_env_init -> unload snmp",[]),
+    ?line application:unload(snmp),
+
+    ?DBG("app_agent_env_init -> load snmp",[]),
+    ?line application:load(snmp),
 
-vsn_init([], _Vsn, Acc) ->
-    Acc;
-vsn_init([V|Vsns], Vsn, Acc) ->
-    case lists:member(V, Vsn) of
-        true ->
-            vsn_init(Vsns, Vsn, [{V, true}|Acc]);
-        false ->
-            vsn_init(Vsns, Vsn, [{V, false}|Acc])
+    ?DBG("app_agent_env_init -> "
+	 "merge or maybe replace (snmp agent) app env",[]),
+    Env = add_or_maybe_merge_agent_env(Opts, Env0),
+    ?DBG("app_agent_env_init -> merged env: "
+	 "~n   ~p", [Env]),
+
+    %% We put it into the app environment just as 
+    %% a precaution, since when starting normally, 
+    %% this is where the environment is extracted from.
+    app_agent_set_env(Env),
+    Env.
+
+app_agent_set_env(Value) ->
+    application_controller:set_env(snmp, agent, Value).
+
+add_or_maybe_merge_agent_env([], Env) ->
+    ?DBG("merging agent env -> merged", []),
+    lists:keysort(1, Env);
+add_or_maybe_merge_agent_env([{Key, Value1}|Opts], Env) ->
+    ?DBG("merging agent env -> add, replace or merge ~p", [Key]),
+    case lists:keysearch(Key, 1, Env) of
+	{value, {Key, Value1}} ->
+	    %% Identical, move on
+	    ?DBG("merging agent env -> "
+		 "no need to merge ~p - identical - keep: "
+		 "~n   ~p", [Key, Value1]),
+	    add_or_maybe_merge_agent_env(Opts, Env);
+	{value, {Key, Value2}} ->
+	    %% Another value, merge or replace
+	    NewValue = merge_or_replace_agent_env(Key, Value1, Value2),
+	    Env2 = lists:keyreplace(Key, 1, Env, {Key, NewValue}), 
+	    add_or_maybe_merge_agent_env(Opts, Env2);
+	false ->
+	    ?DBG("merging agent env -> no old ~p to merge with - add: "
+		 "~n   ~p", [Key, Value1]),
+	    add_or_maybe_merge_agent_env(Opts, [{Key, Value1}|Env])
     end.
 
-app_env_init(Env0, Opts) ->
-    ?DBG("app_env_init -> unload snmp",[]),
-    ?line application:unload(snmp),
-    ?DBG("app_env_init -> load snmp",[]),
-    ?line application:load(snmp),
-    ?DBG("app_env_init -> initiate (snmp) application env",[]),
-    F1 = fun({Key, Val} = New, Acc0) -> 
-                 ?DBG("app_env_init -> "
-                     "updating setting ~p to ~p", [Key, Val]),
-                 case lists:keyreplace(Key, 1, Acc0, New) of
-		     Acc0 ->
-			 [New|Acc0];
-		     Acc ->
-			 Acc
-		 end
-         end, 
-    Env = lists:foldr(F1, Env0, Opts),
-    ?DBG("app_env_init -> Env: ~p",[Env]),
-    F2 = fun({Key,Val}) ->
-                 ?DBG("app_env_init -> setting ~p to ~p",[Key, Val]),
-                 application_controller:set_env(snmp, Key, Val)
-         end,
-    lists:foreach(F2, Env).
+merge_or_replace_agent_env(versions, NewVersions, _OldVersions) ->
+    ?DBG("merging agent env -> versions replaced: ~p -> ~p", 
+	 [NewVersions, _OldVersions]),
+    NewVersions;
+merge_or_replace_agent_env(agent_type, NewType, _OldType) ->
+    ?DBG("merging agent env -> agent type replaced: ~p -> ~p", 
+	 [NewType, _OldType]),
+    NewType;
+merge_or_replace_agent_env(agent_verbosity, NewVerbosity, _OldVerbosity) ->
+    ?DBG("merging agent env -> agent verbosity replaced: ~p -> ~p", 
+	 [NewVerbosity, _OldVerbosity]),
+    NewVerbosity;
+merge_or_replace_agent_env(db_dir, NewDbDir, _OldDbDir) ->
+    ?DBG("merging agent env -> db-dir replaced: ~p -> ~p", 
+	 [NewDbDir, _OldDbDir]),
+    NewDbDir;
+merge_or_replace_agent_env(audit_trail_log, NewATL, OldATL) ->
+    merge_or_replace_agent_env_atl(NewATL, OldATL);
+merge_or_replace_agent_env(config, NewConfig, OldConfig) ->
+    merge_or_replace_agent_env_config(NewConfig, OldConfig);
+merge_or_replace_agent_env(local_db, NewLdb, OldLdb) ->
+    merge_or_replace_agent_env_ldb(NewLdb, OldLdb);
+merge_or_replace_agent_env(mib_storage, NewMst, OldMst) ->
+    merge_or_replace_agent_env_mib_storage(NewMst, OldMst);
+merge_or_replace_agent_env(mib_server, NewMibs, OldMibs) ->
+    merge_or_replace_agent_env_mib_server(NewMibs, OldMibs);
+merge_or_replace_agent_env(symbolic_store, NewSymStore, OldSymStore) ->
+    merge_or_replace_agent_env_symbolic_store(NewSymStore, OldSymStore);
+merge_or_replace_agent_env(note_store, NewNoteStore, OldNoteStore) ->
+    merge_or_replace_agent_env_note_store(NewNoteStore, OldNoteStore);
+merge_or_replace_agent_env(net_if, NewNetIf, OldNetIf) ->
+    merge_or_replace_agent_env_net_if(NewNetIf, OldNetIf);
+merge_or_replace_agent_env(Key, NewValue, OldValue) ->
+    ?FAIL({not_implemented_merge_or_replace, 
+	   Key, NewValue, OldValue}).
+
+merge_or_replace_agent_env_atl(New, Old) ->
+    ATL = merge_agent_options(New, Old),
+    ?DBG("merging agent env -> audit-trail-log merged: "
+	 "~n   ~p | ~p -> ~p", [New, Old, ATL]),
+    ATL.
+
+merge_or_replace_agent_env_config(New, Old) ->
+    Config = merge_agent_options(New, Old),
+    case lists:keymember(dir, 1, Config) of
+	true ->
+	    ?DBG("merging agent env -> config merged: "
+		 "~n   ~p | ~p -> ~p", [New, Old, Config]),
+	    Config;
+	false ->
+	    ?FAIL({missing_mandatory_option, {config, dir}})
+    end.
+
+merge_or_replace_agent_env_ldb(New, Old) ->
+    LDB = merge_agent_options(New, Old),
+    ?DBG("merging agent env -> local-db merged: "
+	 "~n   ~p | ~p -> ~p", [New, Old, LDB]),
+    LDB.
+
+merge_or_replace_agent_env_mib_storage(NewMibStorage, OldMibStorage) ->
+    %% Shall we merge or replace?
+    %% module is mandatory. We will only merge if NewModule is
+    %% equal to OldModule. 
+    NewModule = 
+	case lists:keysearch(module, 1, NewMibStorage) of
+	    {value, {module, M}} ->
+		M;
+	    false ->
+		?FAIL({missing_mandatory_option, {mib_storage, module}})
+	end,
+    case lists:keysearch(module, 1, OldMibStorage) of
+	{value, {module, NewModule}} ->
+	    %% Same module => merge
+	    %% Non-ex new options => remove
+	    %% Ex new options and non-ex old options => replace
+	    %% Otherwise merge
+	    case lists:keysearch(options, 1, NewMibStorage) of
+		false ->
+		    ?DBG("merging agent env -> "
+			 "no mib-storage ~p merge needed - "
+			 "no new options (= remove old options)", [NewModule]),
+		    NewMibStorage;
+		{value, {options, NewOptions}} ->
+		    case lists:keysearch(options, 1, OldMibStorage) of
+			false ->
+			    ?DBG("merging agent env -> "
+				 "no mib-storage ~p merge needed - "
+				 "no old options", [NewModule]),
+			    NewMibStorage;
+			{value, {options, OldOptions}} ->
+			    MergedOptions = 
+				merge_agent_options(NewOptions, OldOptions), 
+			    ?DBG("merging agent env -> mib-storage ~p merged: "
+				 "~n   Options: ~p | ~p -> ~p", 
+				 [NewModule, 
+				  NewOptions, OldOptions, MergedOptions]),
+			    [{module,  NewModule}, 
+			     {options, MergedOptions}]
+		    end
+	    end;
+	_ ->
+	    %% Diff module => replace
+	    ?DBG("merging agent env -> "
+		 "no mib-storage ~p merge needed - "
+		 "new module", [NewModule]),
+	    NewMibStorage
+    end.
+
+merge_or_replace_agent_env_mib_server(New, Old) ->
+    MibServer = merge_agent_options(New, Old),
+    ?DBG("merging agent env -> mib-server merged: "
+	 "~n   ~p | ~p -> ~p", [New, Old, MibServer]),
+    MibServer.
+
+merge_or_replace_agent_env_symbolic_store(New, Old) ->
+    SymbolicStore = merge_agent_options(New, Old),
+    ?DBG("merging agent env -> symbolic-store merged: "
+	 "~n   ~p | ~p -> ~p", [New, Old, SymbolicStore]),
+    SymbolicStore.
+
+merge_or_replace_agent_env_note_store(New, Old) ->
+    NoteStore = merge_agent_options(New, Old),
+    ?DBG("merging agent env -> note-store merged: "
+	 "~n   ~p | ~p -> ~p", [New, Old, NoteStore]),
+    NoteStore.
+
+merge_or_replace_agent_env_net_if(New, Old) ->
+    NetIf = merge_agent_options(New, Old),
+    ?DBG("merging agent env -> net-if merged: "
+	 "~n   ~p | ~p -> ~p", [New, Old, NetIf]),
+    NetIf.
+
+merge_agent_options([], Options) ->
+    lists:keysort(1, Options);
+merge_agent_options([{Key, _Value} = Opt|Opts], Options) ->
+    case lists:keysearch(Key, 1, Options) of
+	{value, _} ->
+	    NewOptions = lists:keyreplace(Key, 1, Options, Opt), 
+	    merge_agent_options(Opts, NewOptions);
+	false ->
+	    merge_agent_options(Opts, [Opt|Options])
+    end.
 
 
 stop_agent(Config) when is_list(Config) ->
@@ -544,8 +696,8 @@ stop_agent(Config) when is_list(Config) ->
     lists:keydelete(snmp_sub, 1, C1).
 
 
-start_sup() ->
-    case (catch snmpa_app:start(normal)) of
+start_sup(Env) ->
+    case (catch snmp_app_sup:start_agent(normal, Env)) of
 	{ok, S} ->
 	    ?DBG("start_agent -> started, Sup: ~p",[S]),
 	    S;
@@ -553,7 +705,7 @@ start_sup() ->
 	Else ->
 	    ?DBG("start_agent -> unknown result: ~n~p",[Else]),
 	    %% Get info about the apps we depend on
-	    ?FAIL({start_failed,Else, ?IS_MNESIA_RUNNING()})
+	    ?FAIL({start_failed, Else, ?IS_MNESIA_RUNNING()})
     end.
 
 stop_sup(Pid, _) when (node(Pid) =:= node()) ->
@@ -594,7 +746,7 @@ start_sub_sup(Node, Dir) ->
     
 start_sub_sup(Dir) ->
     ?DBG("start_sub -> entry",[]),
-    Opts = [{db_dir, Dir}, 
+    Opts = [{db_dir,     Dir}, 
             {supervisor, [{verbosity, trace}]}],
     {ok, P} = snmpa_supervisor:start_sub_sup(Opts),
     unlink(P),
@@ -690,31 +842,33 @@ agent_info(Sup) ->
 
 
 %% --- 
+%% The first two arguments are simple to be able to find where in the 
+%% (test) code this call is made. 
 
-expect(Id, A) -> 
-    Fun = fun() -> do_expect(A) end,
-    expect2(Id, Fun).
+expect(Mod, Line, What) -> 
+    Fun = fun() -> do_expect(What) end,
+    expect2(Mod, Line, Fun).
 
-expect(Id, A, B) ->          
-    Fun = fun() -> do_expect(A, B) end,
-    expect2(Id, Fun).
+expect(Mod, Line, What, ExpVBs) ->          
+    Fun = fun() -> do_expect(What, ExpVBs) end,
+    expect2(Mod, Line, Fun).
 	 
-expect(Id, A, B, C) -> 
-    Fun = fun() -> do_expect(A, B, C) end,
-    expect2(Id, Fun).
+expect(Mod, Line, Error, Index, ExpVBS) -> 
+    Fun = fun() -> do_expect(Error, Index, ExpVBS) end,
+    expect2(Mod, Line, Fun).
 
-expect(Id, A, B, C, D, E) -> 
-    Fun = fun() -> do_expect(A, B, C, D, E) end,
-    expect2(Id, Fun).
+expect(Mod, Line, Type, Enterp, Generic, Specific, ExpVBs) -> 
+    Fun = fun() -> do_expect(Type, Enterp, Generic, Specific, ExpVBs) end,
+    expect2(Mod, Line, Fun).
 
-expect2(Id, F) ->
-    io:format("EXPECT for ~w~n", [Id]),
+expect2(Mod, Line, F) ->
+    io:format("EXPECT for ~w:~w~n", [Mod, Line]),
     case F() of
 	{error, Reason} ->
-	    io:format("EXPECT failed for ~w: ~n~p~n", [Id, Reason]),
-	    throw({error, {expect, Id, Reason}});
+	    io:format("EXPECT failed at ~w:~w => ~n~p~n", [Mod, Line, Reason]),
+	    throw({error, {expect, Mod, Line, Reason}});
 	Else ->
-	    io:format("EXPECT result for ~w: ~n~p~n", [Id, Else]),
+	    io:format("EXPECT result for ~w:~w => ~n~p~n", [Mod, Line, Else]),
 	    Else
     end.
 
@@ -766,7 +920,8 @@ do_expect({timeout, To}) ->
     end;
 
 do_expect({Err, To}) 
-  when is_atom(Err) andalso (is_integer(To) orelse (To =:= infinity)) ->
+  when (is_atom(Err) andalso 
+	((is_integer(To) andalso To > 0) orelse (To =:= infinity))) ->
     io:format("EXPECT error ~w within ~w~n", [Err, To]),
     do_expect({{error, Err}, To});
 
diff --git a/lib/snmp/test/snmp_test_lib.erl b/lib/snmp/test/snmp_test_lib.erl
index f0abae73e8..505332b586 100644
--- a/lib/snmp/test/snmp_test_lib.erl
+++ b/lib/snmp/test/snmp_test_lib.erl
@@ -435,7 +435,7 @@ crypto_start() ->
     end.
  
 crypto_support() ->
-    crypto_support([md5_mac_96, sha_mac_96], []).
+    crypto_support([md5, sha], []).
  
 crypto_support([], []) ->
     yes;
@@ -450,12 +450,7 @@ crypto_support([Func|Funcs], Acc) ->
     end.
  
 is_crypto_supported(Func) ->
-    %% The 'catch' handles the case when 'crypto' is
-    %% not present in the system (or not started).
-    case (catch lists:member(Func, crypto:info())) of
-        true -> true;
-        _ -> false
-    end.
+    snmp_misc:is_crypto_supported(Func). 
  
  
 %% ----------------------------------------------------------------
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index fb7aa52402..0e48e7ea56 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -18,6 +18,6 @@
 # %CopyrightEnd%
 
 APPLICATION = snmp
-SNMP_VSN    = 4.23.1
+SNMP_VSN    = 4.24
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(SNMP_VSN)$(PRE_VSN)"