diff --git a/docs/example-report-asm-7.0-list.txt b/docs/example-report-asm-7.0-list.txt
index 6e5cdcf0..dadc88e9 100644
--- a/docs/example-report-asm-7.0-list.txt
+++ b/docs/example-report-asm-7.0-list.txt
@@ -85,8 +85,43 @@ Artifact: Classpath
 	Coordinates:
 		-
 
-Modules
--------
+JAR Manifests
+-------------
+Information found in META-INF/MANIFEST.MF.
+
+Artifact: asm
+	General:
+		Manifest-Version: 1.0
+	Implementation:
+		ASM, a very small and fast Java bytecode manipulation framework
+		Version: 7.0
+
+Artifact: asm-analysis
+	General:
+		Manifest-Version: 1.0
+		Module-Requires: org.objectweb.asm.tree;transitive=true
+	Implementation:
+		Static code analysis API of ASM, a very small and fast Java bytecode manipulation framework
+		Version: 7.0
+
+Artifact: asm-commons
+	General:
+		Manifest-Version: 1.0
+		Module-Requires: org.objectweb.asm;transitive=true,org.objectweb.asm.tree;transitive=true,org.objectweb.asm.tree.analysis;transitive=true
+	Implementation:
+		Usefull class adapters based on ASM, a very small and fast Java bytecode manipulation framework
+		Version: 7.0
+
+Artifact: asm-tree
+	General:
+		Manifest-Version: 1.0
+		Module-Requires: org.objectweb.asm;transitive=true
+	Implementation:
+		Tree API of ASM, a very small and fast Java bytecode manipulation framework
+		Version: 7.0
+
+JPMS Modules
+------------
 List of Java Modules found in classpath.
 
 Artifact: asm
@@ -143,6 +178,81 @@ Artifact: asm-tree
 	Exports:
 		org.objectweb.asm.tree
 
+OSGI Bundles
+------------
+Information about OSGI Bundles.
+
+Artifact: asm
+	Name:
+		org.objectweb.asm
+	Version:
+		7.0.0
+	Description:
+		Doc URL: http://asm.ow2.org
+	Export Package:
+		org.objectweb.asm;version="7.0"
+		org.objectweb.asm.signature;version="7.0"
+	Others:
+		Manifest Version: 2
+		Required Execution Environment: J2SE-1.5
+
+Artifact: asm-analysis
+	Name:
+		org.objectweb.asm.tree.analysis
+	Version:
+		7.0.0
+	Description:
+		Doc URL: http://asm.ow2.org
+	Import Package:
+		org.objectweb.asm;version="[7.0
+		8)"
+		org.objectweb.asm.tree;version="[7.0
+		8)"
+	Export Package:
+		org.objectweb.asm.tree.analysis;version="7.0";uses:="org.objectweb.asm
+		org.objectweb.asm.tree"
+	Others:
+		Manifest Version: 2
+		Required Execution Environment: J2SE-1.5
+
+Artifact: asm-commons
+	Name:
+		org.objectweb.asm.commons
+	Version:
+		7.0.0
+	Description:
+		Doc URL: http://asm.ow2.org
+	Import Package:
+		org.objectweb.asm;version="[7.0
+		8)"
+		org.objectweb.asm.signature;version="[7.0
+		8)"
+		org.objectweb.asm.tree;version="[7.0
+		8)"
+	Export Package:
+		org.objectweb.asm.commons;version="7.0";uses:="org.objectweb.asm
+		org.objectweb.asm.signature
+		org.objectweb.asm.tree"
+	Others:
+		Manifest Version: 2
+		Required Execution Environment: J2SE-1.5
+
+Artifact: asm-tree
+	Name:
+		org.objectweb.asm.tree
+	Version:
+		7.0.0
+	Description:
+		Doc URL: http://asm.ow2.org
+	Import Package:
+		org.objectweb.asm;version="[7.0
+		8)"
+	Export Package:
+		org.objectweb.asm.tree;version="7.0";uses:="org.objectweb.asm"
+	Others:
+		Manifest Version: 2
+		Required Execution Environment: J2SE-1.5
+
 Class Versions
 --------------
 Java class file format information.
diff --git a/docs/example-report-asm-7.0-provided.html b/docs/example-report-asm-7.0-provided.html
index 7e0f85f6..839d64dd 100644
--- a/docs/example-report-asm-7.0-provided.html
+++ b/docs/example-report-asm-7.0-provided.html
@@ -42,7 +42,9 @@ <h1>ASM 7.0</h1>
 <h3>Table of Contents</h3>
 <ul>
 <li><a href="#JARFiles">JAR Files</a></li>
-<li><a href="#Modules">Modules</a></li>
+<li><a href="#JARManifests">JAR Manifests</a></li>
+<li><a href="#JPMSModules">JPMS Modules</a></li>
+<li><a href="#OSGIBundles">OSGI Bundles</a></li>
 <li><a href="#ClassVersions">Class Versions</a></li>
 <li><a href="#JARDependencies">JAR Dependencies</a></li>
 <li><a href="#Dependencies">Dependencies</a></li>
@@ -63,8 +65,17 @@ <h2>JAR Files</h2>
 </table>
 </section>
 
-<section id="Modules">
-<h2>Modules</h2>
+<section id="JARManifests">
+<h2>JAR Manifests</h2>
+<p>Information found in META-INF/MANIFEST.MF.</p>
+<table>
+	<tr><th>Artifact</th><th>General</th><th>Runtime</th><th>Implementation</th><th>Specification</th><th>Signature</th></tr>
+	<tr><td>asm-commons</td><td>Manifest-Version: 1.0<br>Module-Requires: org.objectweb.asm;transitive=true,org.objectweb.asm.tree;transitive=true,org.objectweb.asm.tree.analysis;transitive=true</td><td></td><td>Usefull class adapters based on ASM, a very small and fast Java bytecode manipulation framework<br>Version: 7.0</td><td></td><td></td></tr>
+</table>
+</section>
+
+<section id="JPMSModules">
+<h2>JPMS Modules</h2>
 <p>List of Java Modules found in classpath.</p>
 <table>
 	<tr><th>Artifact</th><th>Module name</th><th>Definition</th><th>Automatic</th><th>Requires</th><th>Exports</th></tr>
@@ -72,6 +83,15 @@ <h2>Modules</h2>
 </table>
 </section>
 
+<section id="OSGIBundles">
+<h2>OSGI Bundles</h2>
+<p>Information about OSGI Bundles.</p>
+<table>
+	<tr><th>Artifact</th><th>Name</th><th>Version</th><th>Description</th><th>Import Package</th><th>Export Package</th><th>Capabilities</th><th>Others</th></tr>
+	<tr><td>asm-commons</td><td>org.objectweb.asm.commons</td><td>7.0.0</td><td>Doc URL: http://asm.ow2.org</td><td>org.objectweb.asm;version=&quote;[7.0<br>8)&quote;<br>org.objectweb.asm.signature;version=&quote;[7.0<br>8)&quote;<br>org.objectweb.asm.tree;version=&quote;[7.0<br>8)&quote;</td><td>org.objectweb.asm.commons;version=&quote;7.0&quote;;uses:=&quote;org.objectweb.asm<br>org.objectweb.asm.signature<br>org.objectweb.asm.tree&quote;</td><td></td><td>Manifest Version: 2<br>Required Execution Environment: J2SE-1.5</td></tr>
+</table>
+</section>
+
 <section id="ClassVersions">
 <h2>Class Versions</h2>
 <p>Java class file format information.</p>
diff --git a/docs/example-report-asm-7.0.html b/docs/example-report-asm-7.0.html
index c4b834e5..872de7b8 100644
--- a/docs/example-report-asm-7.0.html
+++ b/docs/example-report-asm-7.0.html
@@ -42,7 +42,9 @@ <h1>ASM 7.0</h1>
 <h3>Table of Contents</h3>
 <ul>
 <li><a href="#JARFiles">JAR Files</a></li>
-<li><a href="#Modules">Modules</a></li>
+<li><a href="#JARManifests">JAR Manifests</a></li>
+<li><a href="#JPMSModules">JPMS Modules</a></li>
+<li><a href="#OSGIBundles">OSGI Bundles</a></li>
 <li><a href="#ClassVersions">Class Versions</a></li>
 <li><a href="#JARDependencies">JAR Dependencies</a></li>
 <li><a href="#Dependencies">Dependencies</a></li>
@@ -66,8 +68,20 @@ <h2>JAR Files</h2>
 </table>
 </section>
 
-<section id="Modules">
-<h2>Modules</h2>
+<section id="JARManifests">
+<h2>JAR Manifests</h2>
+<p>Information found in META-INF/MANIFEST.MF.</p>
+<table>
+	<tr><th>Artifact</th><th>General</th><th>Runtime</th><th>Implementation</th><th>Specification</th><th>Signature</th></tr>
+	<tr><td>asm</td><td>Manifest-Version: 1.0</td><td></td><td>ASM, a very small and fast Java bytecode manipulation framework<br>Version: 7.0</td><td></td><td></td></tr>
+	<tr><td>asm-analysis</td><td>Manifest-Version: 1.0<br>Module-Requires: org.objectweb.asm.tree;transitive=true</td><td></td><td>Static code analysis API of ASM, a very small and fast Java bytecode manipulation framework<br>Version: 7.0</td><td></td><td></td></tr>
+	<tr><td>asm-commons</td><td>Manifest-Version: 1.0<br>Module-Requires: org.objectweb.asm;transitive=true,org.objectweb.asm.tree;transitive=true,org.objectweb.asm.tree.analysis;transitive=true</td><td></td><td>Usefull class adapters based on ASM, a very small and fast Java bytecode manipulation framework<br>Version: 7.0</td><td></td><td></td></tr>
+	<tr><td>asm-tree</td><td>Manifest-Version: 1.0<br>Module-Requires: org.objectweb.asm;transitive=true</td><td></td><td>Tree API of ASM, a very small and fast Java bytecode manipulation framework<br>Version: 7.0</td><td></td><td></td></tr>
+</table>
+</section>
+
+<section id="JPMSModules">
+<h2>JPMS Modules</h2>
 <p>List of Java Modules found in classpath.</p>
 <table>
 	<tr><th>Artifact</th><th>Module name</th><th>Definition</th><th>Automatic</th><th>Requires</th><th>Exports</th></tr>
@@ -78,6 +92,18 @@ <h2>Modules</h2>
 </table>
 </section>
 
+<section id="OSGIBundles">
+<h2>OSGI Bundles</h2>
+<p>Information about OSGI Bundles.</p>
+<table>
+	<tr><th>Artifact</th><th>Name</th><th>Version</th><th>Description</th><th>Import Package</th><th>Export Package</th><th>Capabilities</th><th>Others</th></tr>
+	<tr><td>asm</td><td>org.objectweb.asm</td><td>7.0.0</td><td>Doc URL: http://asm.ow2.org</td><td></td><td>org.objectweb.asm;version=&quote;7.0&quote;<br>org.objectweb.asm.signature;version=&quote;7.0&quote;</td><td></td><td>Manifest Version: 2<br>Required Execution Environment: J2SE-1.5</td></tr>
+	<tr><td>asm-analysis</td><td>org.objectweb.asm.tree.analysis</td><td>7.0.0</td><td>Doc URL: http://asm.ow2.org</td><td>org.objectweb.asm;version=&quote;[7.0<br>8)&quote;<br>org.objectweb.asm.tree;version=&quote;[7.0<br>8)&quote;</td><td>org.objectweb.asm.tree.analysis;version=&quote;7.0&quote;;uses:=&quote;org.objectweb.asm<br>org.objectweb.asm.tree&quote;</td><td></td><td>Manifest Version: 2<br>Required Execution Environment: J2SE-1.5</td></tr>
+	<tr><td>asm-commons</td><td>org.objectweb.asm.commons</td><td>7.0.0</td><td>Doc URL: http://asm.ow2.org</td><td>org.objectweb.asm;version=&quote;[7.0<br>8)&quote;<br>org.objectweb.asm.signature;version=&quote;[7.0<br>8)&quote;<br>org.objectweb.asm.tree;version=&quote;[7.0<br>8)&quote;</td><td>org.objectweb.asm.commons;version=&quote;7.0&quote;;uses:=&quote;org.objectweb.asm<br>org.objectweb.asm.signature<br>org.objectweb.asm.tree&quote;</td><td></td><td>Manifest Version: 2<br>Required Execution Environment: J2SE-1.5</td></tr>
+	<tr><td>asm-tree</td><td>org.objectweb.asm.tree</td><td>7.0.0</td><td>Doc URL: http://asm.ow2.org</td><td>org.objectweb.asm;version=&quote;[7.0<br>8)&quote;</td><td>org.objectweb.asm.tree;version=&quote;7.0&quote;;uses:=&quote;org.objectweb.asm&quote;</td><td></td><td>Manifest Version: 2<br>Required Execution Environment: J2SE-1.5</td></tr>
+</table>
+</section>
+
 <section id="ClassVersions">
 <h2>Class Versions</h2>
 <p>Java class file format information.</p>
diff --git a/docs/example-report-asm-7.0.txt b/docs/example-report-asm-7.0.txt
index 3ad13c88..13c31b30 100644
--- a/docs/example-report-asm-7.0.txt
+++ b/docs/example-report-asm-7.0.txt
@@ -13,8 +13,23 @@ asm-commons  | 7.0     | org.ow2.asm:asm-commons:7.0  | 78.0 KB | 32      | 0
 asm-tree     | 7.0     | org.ow2.asm:asm-tree:7.0     | 49.2 KB | 37      | 0         | 29bc62dcb85573af6e62e5b2d735ef65966c4180 | org.ow2.asm:asm-tree:7.0
 Classpath    | -       | -                            | 271 KB  | 118     | 0         | -                                        | -
 
-Modules
--------
+JAR Manifests
+-------------
+Information found in META-INF/MANIFEST.MF.
+
+Artifact     | General                                                                                                                                   | Runtime | Implementation                                                                                  | Specification | Signature
+-------------+-------------------------------------------------------------------------------------------------------------------------------------------+---------+-------------------------------------------------------------------------------------------------+---------------+----------
+asm          | Manifest-Version: 1.0                                                                                                                     |         | ASM, a very small and fast Java bytecode manipulation framework                                 |               |
+             |                                                                                                                                           |         | Version: 7.0                                                                                    |               |
+asm-analysis | Manifest-Version: 1.0                                                                                                                     |         | Static code analysis API of ASM, a very small and fast Java bytecode manipulation framework     |               |
+             | Module-Requires: org.objectweb.asm.tree;transitive=true                                                                                   |         | Version: 7.0                                                                                    |               |
+asm-commons  | Manifest-Version: 1.0                                                                                                                     |         | Usefull class adapters based on ASM, a very small and fast Java bytecode manipulation framework |               |
+             | Module-Requires: org.objectweb.asm;transitive=true,org.objectweb.asm.tree;transitive=true,org.objectweb.asm.tree.analysis;transitive=true |         | Version: 7.0                                                                                    |               |
+asm-tree     | Manifest-Version: 1.0                                                                                                                     |         | Tree API of ASM, a very small and fast Java bytecode manipulation framework                     |               |
+             | Module-Requires: org.objectweb.asm;transitive=true                                                                                        |         | Version: 7.0                                                                                    |               |
+
+JPMS Modules
+------------
 List of Java Modules found in classpath.
 
 Artifact     | Module name                     | Definition  | Automatic | Requires                        | Exports
@@ -30,6 +45,27 @@ asm-commons  | org.objectweb.asm.commons       | Module-Info | No        | org.o
 asm-tree     | org.objectweb.asm.tree          | Module-Info | No        | org.objectweb.asm               | org.objectweb.asm.tree
              |                                 |             |           | java.base                       |
 
+OSGI Bundles
+------------
+Information about OSGI Bundles.
+
+Artifact     | Name                            | Version | Description                 | Import Package                            | Export Package                                                         | Capabilities | Others
+-------------+---------------------------------+---------+-----------------------------+-------------------------------------------+------------------------------------------------------------------------+--------------+-----------------------------------------
+asm          | org.objectweb.asm               | 7.0.0   | Doc URL: http://asm.ow2.org |                                           | org.objectweb.asm;version="7.0"                                        |              | Manifest Version: 2
+             |                                 |         |                             |                                           | org.objectweb.asm.signature;version="7.0"                              |              | Required Execution Environment: J2SE-1.5
+asm-analysis | org.objectweb.asm.tree.analysis | 7.0.0   | Doc URL: http://asm.ow2.org | org.objectweb.asm;version="[7.0           | org.objectweb.asm.tree.analysis;version="7.0";uses:="org.objectweb.asm |              | Manifest Version: 2
+             |                                 |         |                             | 8)"                                       | org.objectweb.asm.tree"                                                |              | Required Execution Environment: J2SE-1.5
+             |                                 |         |                             | org.objectweb.asm.tree;version="[7.0      |                                                                        |              |
+             |                                 |         |                             | 8)"                                       |                                                                        |              |
+asm-commons  | org.objectweb.asm.commons       | 7.0.0   | Doc URL: http://asm.ow2.org | org.objectweb.asm;version="[7.0           | org.objectweb.asm.commons;version="7.0";uses:="org.objectweb.asm       |              | Manifest Version: 2
+             |                                 |         |                             | 8)"                                       | org.objectweb.asm.signature                                            |              | Required Execution Environment: J2SE-1.5
+             |                                 |         |                             | org.objectweb.asm.signature;version="[7.0 | org.objectweb.asm.tree"                                                |              |
+             |                                 |         |                             | 8)"                                       |                                                                        |              |
+             |                                 |         |                             | org.objectweb.asm.tree;version="[7.0      |                                                                        |              |
+             |                                 |         |                             | 8)"                                       |                                                                        |              |
+asm-tree     | org.objectweb.asm.tree          | 7.0.0   | Doc URL: http://asm.ow2.org | org.objectweb.asm;version="[7.0           | org.objectweb.asm.tree;version="7.0";uses:="org.objectweb.asm"         |              | Manifest Version: 2
+             |                                 |         |                             | 8)"                                       |                                                                        |              | Required Execution Environment: J2SE-1.5
+
 Class Versions
 --------------
 Java class file format information.
diff --git a/docs/example-report-asm-commons-7.0.html b/docs/example-report-asm-commons-7.0.html
index 644106d5..5d93817e 100644
--- a/docs/example-report-asm-commons-7.0.html
+++ b/docs/example-report-asm-commons-7.0.html
@@ -42,7 +42,9 @@ <h1>ASM Commons 7.0</h1>
 <h3>Table of Contents</h3>
 <ul>
 <li><a href="#JARFiles">JAR Files</a></li>
-<li><a href="#Modules">Modules</a></li>
+<li><a href="#JARManifests">JAR Manifests</a></li>
+<li><a href="#JPMSModules">JPMS Modules</a></li>
+<li><a href="#OSGIBundles">OSGI Bundles</a></li>
 <li><a href="#ClassVersions">Class Versions</a></li>
 <li><a href="#JARDependencies">JAR Dependencies</a></li>
 <li><a href="#Dependencies">Dependencies</a></li>
@@ -63,8 +65,17 @@ <h2>JAR Files</h2>
 </table>
 </section>
 
-<section id="Modules">
-<h2>Modules</h2>
+<section id="JARManifests">
+<h2>JAR Manifests</h2>
+<p>Information found in META-INF/MANIFEST.MF.</p>
+<table>
+	<tr><th>Artifact</th><th>General</th><th>Runtime</th><th>Implementation</th><th>Specification</th><th>Signature</th></tr>
+	<tr><td>asm-commons</td><td>Manifest-Version: 1.0<br>Module-Requires: org.objectweb.asm;transitive=true,org.objectweb.asm.tree;transitive=true,org.objectweb.asm.tree.analysis;transitive=true</td><td></td><td>Usefull class adapters based on ASM, a very small and fast Java bytecode manipulation framework<br>Version: 7.0</td><td></td><td></td></tr>
+</table>
+</section>
+
+<section id="JPMSModules">
+<h2>JPMS Modules</h2>
 <p>List of Java Modules found in classpath.</p>
 <table>
 	<tr><th>Artifact</th><th>Module name</th><th>Definition</th><th>Automatic</th><th>Requires</th><th>Exports</th></tr>
@@ -72,6 +83,15 @@ <h2>Modules</h2>
 </table>
 </section>
 
+<section id="OSGIBundles">
+<h2>OSGI Bundles</h2>
+<p>Information about OSGI Bundles.</p>
+<table>
+	<tr><th>Artifact</th><th>Name</th><th>Version</th><th>Description</th><th>Import Package</th><th>Export Package</th><th>Capabilities</th><th>Others</th></tr>
+	<tr><td>asm-commons</td><td>org.objectweb.asm.commons</td><td>7.0.0</td><td>Doc URL: http://asm.ow2.org</td><td>org.objectweb.asm;version=&quote;[7.0<br>8)&quote;<br>org.objectweb.asm.signature;version=&quote;[7.0<br>8)&quote;<br>org.objectweb.asm.tree;version=&quote;[7.0<br>8)&quote;</td><td>org.objectweb.asm.commons;version=&quote;7.0&quote;;uses:=&quote;org.objectweb.asm<br>org.objectweb.asm.signature<br>org.objectweb.asm.tree&quote;</td><td></td><td>Manifest Version: 2<br>Required Execution Environment: J2SE-1.5</td></tr>
+</table>
+</section>
+
 <section id="ClassVersions">
 <h2>Class Versions</h2>
 <p>Java class file format information.</p>