diff --git a/etc/scripts/testdata/livescan/expected.csv b/etc/scripts/testdata/livescan/expected.csv
index d944e59dc7a..9f7d77ed5f3 100644
--- a/etc/scripts/testdata/livescan/expected.csv
+++ b/etc/scripts/testdata/livescan/expected.csv
@@ -1,20 +1,20 @@
-Resource,type,name,base_name,extension,date,size,sha1,md5,files_count,mime_type,file_type,programming_language,is_binary,is_text,is_archive,is_media,is_source,is_script,scan_errors,license__key,license__score,license__short_name,license__category,license__owner,license__homepage_url,license__text_url,license__reference_url,license__spdx_license_key,license__spdx_url,start_line,end_line,matched_rule__identifier,matched_rule__license_choice,matched_rule__licenses,copyright,copyright_holder,email,url,package__type,package__name,package__version,package__primary_language,package__code_type,package__description,package__size,package__release_date,package__parties,package__homepage_url,package__download_url,package__bug_tracking_url,package__vcs_repository,package__copyright,package__asserted_license,package__notice_text
-/package.json,file,package.json,package,.json,2017-10-03,2200,918376afce796ef90eeda1d6695f2289c90491ac,1f66239a9b850c5e60a9382dbe2162d2,,text/plain,"ASCII text, with very long lines",JSON,False,True,False,False,True,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,mit,15.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit_27.RULE,False,[u'mit'],,,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,mit,100.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit.LICENSE,False,[u'mit'],,,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,Copyright (c) 2012 LearnBoost &lt tj@learnboost.com&gt,,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,,LearnBoost &lt,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12,12,,,,,,tj@learnboost.com,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,16,16,,,,,,,https://github.com/visionmedia/node-cookie-signature.git,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,27,27,,,,,,,https://github.com/visionmedia/node-cookie-signature/issues,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,TJ Holowaychuk,,,,,,,
-/json2csv.rb,file,json2csv.rb,json2csv,.rb,2017-10-03,1599,6cfb0bd0fb0b784f57164d15bdfca2b734ad87a6,f18e519b77bc7f3e4213215033db3857,,text/x-python,"Python script, ASCII text executable",Ruby,False,True,False,False,True,True,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,apache-2.0,98.45,Apache 2.0,Permissive,Apache Software Foundation,http://www.apache.org/licenses/,http://www.apache.org/licenses/LICENSE-2.0,https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0,Apache-2.0,https://spdx.org/licenses/Apache-2.0,5,24,apache-2.0_scancode.RULE,False,"[u'apache-2.0', u'scancode-acknowledgment']",,,,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,scancode-acknowledgment,98.45,ScanCode acknowledgment,Permissive,nexB,https://github.com/nexB/scancode-toolkit/,,https://enterprise.dejacode.com/urn/urn:dje:license:scancode-acknowledgment,,,5,24,apache-2.0_scancode.RULE,False,"[u'apache-2.0', u'scancode-acknowledgment']",,,,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,Copyright (c) 2017 nexB Inc. and others.,,,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,,nexB Inc. and others.,,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,http://nexb.com/,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,https://github.com/nexB/scancode-toolkit/,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,10,,,,,,,http://apache.org/licenses/LICENSE-2.0,,,,,,,,,,,,,,,,
-/license,file,license,license,,2017-10-03,679,75c5490a718ddd45e40e0cc7ce0c756abc373123,b965a762efb9421cf1bf4405f336e278,,text/plain,ASCII text,,False,True,False,False,False,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-/license,,,,,,,,,,,,,,,,,,,,gpl-2.0-plus,100.00,GPL 2.0 or later,Copyleft,Free Software Foundation (FSF),http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,https://enterprise.dejacode.com/urn/urn:dje:license:gpl-2.0-plus,GPL-2.0+,https://spdx.org/licenses/GPL-2.0,1,12,gpl-2.0-plus.LICENSE,False,[u'gpl-2.0-plus'],,,,,,,,,,,,,,,,,,,,
+Resource,type,name,base_name,extension,date,size,sha1,md5,files_count,mime_type,file_type,programming_language,is_binary,is_text,is_archive,is_media,is_source,is_script,scan_errors,license__key,license__score,license__short_name,license__category,license__owner,license__homepage_url,license__text_url,license__reference_url,license__spdx_license_key,license__spdx_url,start_line,end_line,matched_rule__identifier,matched_rule__license_choice,matched_rule__licenses,copyright,copyright_holder,email,url,package__type,package__namespace,package__name,package__version,package__qualifiers,package__path,package__primary_language,package__code_type,package__description,package__size,package__release_date,package__parties,package__homepage_url,package__download_url,package__bug_tracking_url,package__vcs_repository,package__copyright,package__asserted_license,package__notice_text
+/package.json,file,package.json,package,.json,2017-10-03,2200,918376afce796ef90eeda1d6695f2289c90491ac,1f66239a9b850c5e60a9382dbe2162d2,,text/plain,"ASCII text, with very long lines",JSON,False,True,False,False,True,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,mit,15.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit_27.RULE,False,[u'mit'],,,,,,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,mit,100.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit.LICENSE,False,[u'mit'],,,,,,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,Copyright (c) 2012 LearnBoost &lt tj@learnboost.com&gt,,,,,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,,LearnBoost &lt,,,,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12,12,,,,,,tj@learnboost.com,,,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,16,16,,,,,,,https://github.com/visionmedia/node-cookie-signature.git,,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,27,27,,,,,,,https://github.com/visionmedia/node-cookie-signature/issues,,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,TJ Holowaychuk,,,,,,,
+/json2csv.rb,file,json2csv.rb,json2csv,.rb,2017-10-03,1599,6cfb0bd0fb0b784f57164d15bdfca2b734ad87a6,f18e519b77bc7f3e4213215033db3857,,text/x-python,"Python script, ASCII text executable",Ruby,False,True,False,False,True,True,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,apache-2.0,98.45,Apache 2.0,Permissive,Apache Software Foundation,http://www.apache.org/licenses/,http://www.apache.org/licenses/LICENSE-2.0,https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0,Apache-2.0,https://spdx.org/licenses/Apache-2.0,5,24,apache-2.0_scancode.RULE,False,"[u'apache-2.0', u'scancode-acknowledgment']",,,,,,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,scancode-acknowledgment,98.45,ScanCode acknowledgment,Permissive,nexB,https://github.com/nexB/scancode-toolkit/,,https://enterprise.dejacode.com/urn/urn:dje:license:scancode-acknowledgment,,,5,24,apache-2.0_scancode.RULE,False,"[u'apache-2.0', u'scancode-acknowledgment']",,,,,,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,Copyright (c) 2017 nexB Inc. and others.,,,,,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,,nexB Inc. and others.,,,,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,http://nexb.com/,,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,https://github.com/nexB/scancode-toolkit/,,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,10,,,,,,,http://apache.org/licenses/LICENSE-2.0,,,,,,,,,,,,,,,,,,,
+/license,file,license,license,,2017-10-03,679,75c5490a718ddd45e40e0cc7ce0c756abc373123,b965a762efb9421cf1bf4405f336e278,,text/plain,ASCII text,,False,True,False,False,False,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/license,,,,,,,,,,,,,,,,,,,,gpl-2.0-plus,100.00,GPL 2.0 or later,Copyleft,Free Software Foundation (FSF),http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,https://enterprise.dejacode.com/urn/urn:dje:license:gpl-2.0-plus,GPL-2.0+,https://spdx.org/licenses/GPL-2.0,1,12,gpl-2.0-plus.LICENSE,False,[u'gpl-2.0-plus'],,,,,,,,,,,,,,,,,,,,,,,
diff --git a/src/packagedcode/maven.py b/src/packagedcode/maven.py
index 2426443649e..10768760691 100644
--- a/src/packagedcode/maven.py
+++ b/src/packagedcode/maven.py
@@ -42,29 +42,31 @@
 from commoncode import filetype
 from commoncode import fileutils
 from packagedcode import models
-from typecode import contenttype
 from textcode import analysis
+from typecode import contenttype
+
 
-logger = logging.getLogger(__name__)
 TRACE = False
 
+logger = logging.getLogger(__name__)
+
 if TRACE:
     import sys
     logging.basicConfig(stream=sys.stdout)
     logger.setLevel(logging.DEBUG)
 
+
 """
 Support Maven2 POMs.
 Attempts to resolve Maven properties when possible.
 """
 
-
-MAVEN_POM_TYPE = 'Apache Maven POM'
-
 class MavenPomPackage(models.Package):
     metafiles = ('.pom', 'pom.xml',)
     extensions = ('.pom', '.xml',)
-    type = models.StringType(default=MAVEN_POM_TYPE)
+
+    type = models.StringType(default='maven')
+
     primary_language = models.StringType(default='Java')
 
     @classmethod
@@ -117,7 +119,6 @@ def to_dict(self):
 
 
 class MavenPom(pom.Pom):
-
     def __init__(self, location=None, text=None):
         """
         Build a POM from a location or unicode text.
@@ -154,6 +155,7 @@ def __init__(self, location=None, text=None):
             self.model_version = self._get_attribute('pomVersion')
         self.group_id = self._get_attribute('groupId')
         self.artifact_id = self._get_attribute('artifactId')
+        if TRACE: logger.debug('MavenPom.__init__: self.artifact_id: {}'.format(self.artifact_id))
         self.version = self._get_attribute('version')
         self.classifier = self._get_attribute('classifier')
         self.packaging = self._get_attribute('packaging') or 'jar'
@@ -217,7 +219,6 @@ def _extra_properties(self):
     def _replace_props(cls, text, properties):
         if not text:
             return text
-
         def subfunc(matchobj):
             """Return the replacement value for a matched property key."""
             key = matchobj.group(1)
@@ -276,7 +277,7 @@ def resolve(self, **extra_properties):
         properties.update(extra_properties)
 
         if TRACE:
-            logger.debug('resolve: properties before self-resolution:\n{}'.format(pformat(properties)))
+            logger.debug('MavenPom.resolve: properties before self-resolution:\n{}'.format(pformat(properties)))
 
         # FIXME: we could remove any property that itself contains
         # ${property} as we do not know how to resolve these
@@ -286,7 +287,7 @@ def resolve(self, **extra_properties):
             properties[key] = MavenPom._replace_props(value, properties)
 
         if TRACE:
-            logger.debug('resolve: used properties:\n{}'.format(pformat(properties)))
+            logger.debug('MavenPom.resolve: used properties:\n{}'.format(pformat(properties)))
 
         # these attributes are plain strings
         plain_attributes = [
@@ -342,13 +343,21 @@ def resolve(self, **extra_properties):
 
         for scope, dependencies in self.dependencies.items():
             resolved_deps = []
+            # FIXME: this is missing the packaging/type and classifier
             for (group, artifact, version,), required in dependencies:
                 group = self._replace_properties(group, properties)
                 artifact = self._replace_properties(artifact, properties)
                 version = self._replace_properties(version, properties)
+                # skip weird damaged POMs such as
+                # http://repo1.maven.org/maven2/net/sourceforge/findbugs/coreplugin/1.0.0/coreplugin-1.0.0.pom
+                if not group or not artifact:
+                    continue
                 resolved_deps.append(((group, artifact, version,), required))
             self._dependencies[scope] = resolved_deps
 
+        if TRACE:
+            logger.debug('MavenPom.resolve: artifactId after resolve: {}'.format(self.artifact_id))
+
         # TODO: add:
         # nest dicts
         # 'distribution_management',
@@ -418,7 +427,12 @@ def _get_attribute(self, xpath, xml=None):
         if xml is None:
             xml = self._xml
         attr = xml.findtext(xpath)
-        return attr and attr.strip() or None
+        val = attr and attr.strip() or None
+        if TRACE:
+            if 'artifactId' in xpath:
+                logger.debug('MavenPom._get_attribute: xpath: {}'.format(xpath))
+                logger.debug('MavenPom._get_attribute: xml: {}'.format(xml))
+        return val
 
     def _get_attributes_list(self, xpath, xml=None):
         """Return a list of text attribute values for a given xpath or None."""
@@ -547,7 +561,7 @@ def to_dict(self):
             ('artifact_id', self.artifact_id),
             ('version', self.version),
             ('classifier', self.classifier),
-            ('packaging ', self.packaging),
+            ('packaging', self.packaging),
 
             ('parent', self.parent.to_dict() if self.parent else {}),
 
@@ -678,7 +692,7 @@ def has_basic_pom_attributes(pom):
     if TRACE and not basics:
         logger.debug(
             'has_basic_pom_attributes: not a POM, incomplete GAV: '
-            '"{}":"{}":"{}"'.format(pom.model_version and pom.group_id and pom.artifact_id))
+            '"{}":"{}":"{}"'.format(pom.model_version, pom.group_id, pom.artifact_id))
     return basics
 
 
@@ -691,6 +705,9 @@ def _get_mavenpom(location=None, text=None, check_is_pom=False, extra_properties
     pom.resolve(**extra_properties)
     # TODO: we cannot do much without these??
     if check_is_pom and not has_basic_pom_attributes(pom):
+        if TRACE:
+            logger.debug('_get_mavenpom: has_basic_pom_attributes: {}'.format(has_basic_pom_attributes(pom)))
+
         return
     return pom
 
@@ -709,6 +726,7 @@ def parse(location=None, text=None, check_is_pom=True, extra_properties=None):
         return
 
     pom = mavenpom.to_dict()
+    if TRACE: logger.debug('parse: pom:.to_dict()\n{}'.format(pformat(pom)))
 
     # join all data in a single text
     asserted_license = []
@@ -738,30 +756,97 @@ def parse(location=None, text=None, check_is_pom=True, extra_properties=None):
                 url=cont['url'],
         ))
 
-    name = pom['organization_name']
-    url = pom['organization_url']
-    if name or url:
-        parties.append(models.Party(type=models.party_org, name=name, role='owner', url=url))
+    party_name = pom['organization_name']
+    party_url = pom['organization_url']
+    if party_name or party_url:
+        parties.append(models.Party(type=models.party_org, name=party_name, role='owner', url=party_url))
 
-    dependencies = OrderedDict()
+    dependencies = []
     for scope, deps in pom['dependencies'].items():
-        scoped_deps = dependencies[scope] = []
+        if TRACE: logger.debug('parse: dependencies.deps: {}'.format(deps))
+
+        if scope:
+            scope = scope.strip().lower()
+        if not scope:
+            # maven default
+            scope = 'compile'
+
         for dep in deps:
-            scoped_deps.append(models.BasePackage(
-                type=MAVEN_POM_TYPE,
-                name='{group_id}:{artifact_id}'.format(**dep),
-                version=dep['version'],
-            ))
+            dgroup_id = dep['group_id']
+            dartifact_id = dep['artifact_id']
+            dversion = dep['version']
+            drequired = dep['required']
+
+            if TRACE:
+                logger.debug('parse: dependencies.deps: {}, {}, {}, {}'.format(
+                    dgroup_id, dartifact_id, dversion, drequired))
+
+            # pymaven whart
+            if dversion == 'latest.release':
+                dversion = None
+
+            dqualifiers = {}
+            # FIXME: this is missing from the original Pom parser
+            # classifier = dep.get('classifier')
+            # if classifier:
+            #     qualifiers['classifier'] = classifier
+            #
+            # packaging = dep.get('type')
+            # if packaging and packaging != 'jar':
+            #     qualifiers['packaging'] = packaging
+
+            dep_id = models.PackageIdentifier(
+                type='maven',
+                namespace=dgroup_id,
+                name=dartifact_id,
+                qualifiers=dqualifiers or None,
+            )
+            # TODO: handle dependency management and pom type
+            is_runtime = scope in ('runtime', 'compile', 'system', 'provided')
+            is_optional = bool(scope in ('test',) or not drequired)
+
+            dep_pack = models.DependentPackage(
+                identifier=str(dep_id),
+                requirement=dversion,
+                scope=scope,
+                is_runtime=is_runtime,
+                is_optional=is_optional,
+                is_resolved=False,
+            )
+            dependencies.append(dep_pack)
 
     # FIXME: there are still a lot of other data to map in a Package
+    version = pom['version']
+    # pymaven whart
+    if version == 'latest.release':
+        version = None
+
+    artifact_id = pom['artifact_id']
+    qualifiers = {}
+    classifier = pom['classifier']
+    if classifier:
+        qualifiers['classifier'] = classifier
+
+    packaging = pom['packaging']
+    if packaging and packaging != 'jar':
+        qualifiers['packaging'] = packaging
+
+    pname = pom['name']
+    pdesc = pom['description']
+    if pname==pdesc:
+        description = pname
+    else:
+        description = [d for d in (pom['name'], pom['description']) if d]
+        description = '\n'.join(description)
+
     package = MavenPomPackage(
-        # FIXME: what is this location about?
-        location=location,
-        name='{group_id}:{artifact_id}'.format(**pom),
-        version=pom['version'],
-        description=pom['description'],
-        homepage_url=pom['url'],
-        asserted_license=asserted_license,
+        namespace=pom['group_id'],
+        name=artifact_id,
+        version=version,
+        qualifiers=qualifiers or None,
+        description=description or None,
+        homepage_url=pom['url'] or None,
+        asserted_license=asserted_license or None,
         parties=parties,
         dependencies=dependencies,
     )
@@ -772,7 +857,6 @@ class MavenRecognizer(object):
     """
     A package recognizer for Maven-based packages.
     """
-
     def __init__(self):
         return NotImplementedError()
 
diff --git a/src/packagedcode/models.py b/src/packagedcode/models.py
index b0c556fa300..db09f728ed4 100644
--- a/src/packagedcode/models.py
+++ b/src/packagedcode/models.py
@@ -249,7 +249,7 @@ def to_string(self):
             quals = ['{}={}'.format(k, v) for k, v in quals]
             quals = '&'.join(quals)
             identifier.append('?')
-            identifier.append(self.quals)
+            identifier.append(quals)
 
         if self.path:
             identifier.append('#')
@@ -371,25 +371,32 @@ class PackageRelationship(BaseModel):
             'and the "relationship" (or predicate) string that specifies the relationship.'
             )
 
-    from_pid= StringType()
+    from_pid = StringType()
     from_pid.metadata = dict(
         label='"From" package identifier in the relationship',
         description='A compact ABC Package identifier URL in the form of '
             'type://namespace/name@version?qualifiers#path')
 
-    to_pid= StringType()
-    to_pid.metadata = dict(
-        label='"To" package identifier in the relationship',
-        description='A compact ABC Package identifier URL in the form of '
-            'type://namespace/name@version?qualifiers#path')
-
-    relationship= StringType()
+    relationship = StringType()
     relationship.metadata = dict(
         label='Relationship between two packages.',
         description='Relationship between the from and to package '
             'identifiers such as "source_of" when a package is the source '
             'code package for another package')
 
+    to_pid = StringType()
+    to_pid.metadata = dict(
+        label='"To" package identifier in the relationship',
+        description='A compact ABC Package identifier URL in the form of '
+            'type://namespace/name@version?qualifiers#path')
+
+    class Options:
+        # this defines the important serialization order
+        fields_order = [
+            'from_pid',
+            'relationship',
+            'to_pid',
+        ]
 
 class BasePackage(BaseModel):
     metadata = dict(
diff --git a/src/packagedcode/nevra.py b/src/packagedcode/nevra.py
index 2dafe14220e..b6b398c3d25 100644
--- a/src/packagedcode/nevra.py
+++ b/src/packagedcode/nevra.py
@@ -60,7 +60,7 @@ def from_name(filename):
     """
     parse_nevra = re.compile("^(.*)-([^-]*)-([^-]*)\.([^.]*)$").match
     file_ext = fileutils.file_extension(filename) or None
-    if file_ext in ['.rpm', 'srpm']:
+    if file_ext in ['.rpm', '.srpm']:
         filename = filename[:-len(file_ext)]
     m = parse_nevra(filename)
     if not m:
diff --git a/src/packagedcode/npm.py b/src/packagedcode/npm.py
index 6e194761471..f3690d308cd 100644
--- a/src/packagedcode/npm.py
+++ b/src/packagedcode/npm.py
@@ -126,7 +126,7 @@ def build_package(package_data, base_dir=None):
         # legacy, ignored
         # ('url', url_mapper),
         ('dist', dist_mapper),
-        ('repository', repository_mapper),
+        ('repository', vcs_repository_mapper),
     ])
 
 
@@ -181,11 +181,12 @@ def licensing_mapper(licenses, package):
     if not licenses:
         return package
 
+    asserted_license = None
     if isinstance(licenses, basestring):
         # current form
         # TODO:  handle "SEE LICENSE IN <filename>"
         # TODO: parse expression with license_expression library
-        package.asserted_license = licenses
+        asserted_license = licenses
 
     elif isinstance(licenses, dict):
         # old, deprecated form
@@ -195,7 +196,7 @@ def licensing_mapper(licenses, package):
             "url": "http://github.com/kriskowal/q/raw/master/LICENSE"
           }
         """
-        package.asserted_license = (licenses.get('type') or u'') + (licenses.get('url') or u'')
+        asserted_license = (licenses.get('type') or u'') + (licenses.get('url') or u'')
 
     elif isinstance(licenses, list):
         # old, deprecated form
@@ -215,11 +216,12 @@ def licensing_mapper(licenses, package):
                 lics.extend(v for v in (lic.get('type') or None, lic.get('url') or None) if v)
             else:
                 lics.append(repr(lic))
-        package.asserted_license = u'\n'.join(lics)
+        asserted_license = u'\n'.join(lics)
 
     else:
-        package.asserted_license = (repr(licenses))
+        asserted_license = (repr(licenses))
 
+    package.asserted_license = asserted_license or None
     return package
 
 
@@ -308,7 +310,7 @@ def bugs_mapper(bugs, package):
     return package
 
 
-def repository_mapper(repo, package):
+def vcs_repository_mapper(repo, package):
     """
     https://docs.npmjs.com/files/package.json#repository
     "repository" :
@@ -380,11 +382,42 @@ def dist_mapper(dist, package):
 def bundle_deps_mapper(bundle_deps, package):
     """
     https://docs.npmjs.com/files/package.json#bundleddependencies
+        "This defines an array of package names that will be bundled
+        when publishing the package."
     """
-    package.dependencies[models.dep_bundled] = bundle_deps
+    for bdep in (bundle_deps or []):
+        bdep = bdep and bdep.strip()
+        if not bdep:
+            continue
+
+        ns, name = split_scoped_package_name(bdep)
+        identifier = models.PackageIdentifier(
+            type='npm', namespace=ns, name=name)
+
+        dep = models.DependentPackage(
+            identifier=identifier.to_string(),
+            scope='bundledDependencies',
+            is_runtime=True,
+            )
+        package.dependencies.append(dep)
+
     return package
 
 
+def split_scoped_package_name(name):
+    """
+    Return a tuple of (namespace, name) given a package name.
+    Namespace is the "scope" for a scoped package.
+    """
+    name = name and name.strip()
+    if not name:
+        return None, None
+    ns, _, name = name.rpartition('/')
+    ns = ns.strip() or None
+    name = name.strip() or None
+    return ns, name
+
+
 def deps_mapper(deps, package, field_name):
     """
     Handle deps such as dependencies, devDependencies, peerDependencies, optionalDependencies
@@ -394,21 +427,51 @@ def deps_mapper(deps, package, field_name):
     https://docs.npmjs.com/files/package.json#devdependencies
     https://docs.npmjs.com/files/package.json#optionaldependencies
     """
-    dep_types = {
-        'dependencies': models.dep_runtime,
-        'devDependencies': models.dep_dev,
-        'peerDependencies': models.dep_optional,
-        'optionalDependencies': models.dep_optional,
+    npm_dep_scopes_attrs = {
+        'dependencies': dict(is_runtime=True, is_optional=False),
+        'devDependencies': dict(is_runtime=False, is_optional=True),
+        'peerDependencies': dict(is_runtime=True, is_optional=False),
+        'optionalDependencies': dict(is_runtime=True, is_optional=True),
     }
-    resolved_scope = dep_types[field_name]
-    dependencies = []
-    for name, version in deps.items():
-        dep = models.BasePackage(type='npm', name=name, version=version)
-        dependencies.append(dep)
-    if resolved_scope in package.dependencies:
-        package.dependencies[resolved_scope].extend(dependencies)
-    else:
-        package.dependencies[resolved_scope] = dependencies
+    dependencies = package.dependencies
+
+    deps_by_name = {}
+    if field_name == 'optionalDependencies':
+        # optionalDependencies override the dependencies with the same name
+        # so we build a map of name->dep object for use later
+        for d in dependencies:
+            if d.scope != 'dependencies':
+                continue
+            pid = models.PackageIdentifier.from_string(d.identifier)
+            npm_name = pid.name
+            if pid.namespace:
+                npm_name = '/'.join([pid.namespace, pid.name])
+            deps_by_name[npm_name] = d
+
+    for fqname, requirement in deps.items():
+        ns, name = split_scoped_package_name(fqname)
+        identifier = models.PackageIdentifier(
+            type='npm', namespace=ns, name=name).to_string()
+
+        # optionalDependencies override the dependencies with the same name
+        # https://docs.npmjs.com/files/package.json#optionaldependencies
+        # therefore we update/override the dependency of the same name
+        overridable = deps_by_name.get(fqname)
+
+        if overridable and field_name == 'optionalDependencies':
+            overridable.identifier = identifier
+            overridable.is_optional = True
+            overridable.scope = field_name
+        else:
+            dep_attrs = npm_dep_scopes_attrs.get(field_name, dict())
+            dep = models.DependentPackage(
+                identifier=identifier,
+                scope=field_name,
+                requirement=requirement,
+                **dep_attrs
+            )
+            dependencies.append(dep)
+
     return package
 
 
@@ -507,6 +570,10 @@ def parse_person(person):
     return name, email, url
 
 
+def is_scoped_package(name):
+    return '@' in name
+
+
 def quote_scoped_name(name):
     """
     Return a package name suitable for use in a URL percent-encoding
@@ -517,8 +584,7 @@ def quote_scoped_name(name):
     >>> quote_scoped_name('some-package')
     u'some-package'
     """
-    is_scoped_package = '@' in name
-    if is_scoped_package:
+    if is_scoped_package(name):
         return name.replace('/', '%2f')
     return name
 
@@ -571,8 +637,7 @@ def package_data_url(name, version=None, registry='https://registry.npmjs.org'):
     u'https://registry.npmjs.org/angular/1.6.6'
     """
     registry = registry.rstrip('/')
-    is_scoped_package = '@' in name
-    if is_scoped_package or not version:
+    if is_scoped_package(name) or not version:
         name = quote_scoped_name(name)
         return '%(registry)s/%(name)s' % locals()
     return '%(registry)s/%(name)s/%(version)s' % locals()
diff --git a/src/packagedcode/nuget.py b/src/packagedcode/nuget.py
index 0795a10a4ba..ef166844ad4 100644
--- a/src/packagedcode/nuget.py
+++ b/src/packagedcode/nuget.py
@@ -41,7 +41,7 @@ class NugetPackage(models.Package):
     mimetypes = ('application/zip', 'application/octet-stream',)
     extensions = ('.nupkg',)
 
-    type = models.StringType(default='Nuget')
+    type = models.StringType(default='nuget')
 
     @classmethod
     def recognize(cls, location):
diff --git a/src/packagedcode/phpcomposer.py b/src/packagedcode/phpcomposer.py
index 20298290afa..469b4d55201 100644
--- a/src/packagedcode/phpcomposer.py
+++ b/src/packagedcode/phpcomposer.py
@@ -27,10 +27,11 @@
 from __future__ import unicode_literals
 
 import codecs
-import logging
-import json
 from collections import OrderedDict
 from functools import partial
+import json
+import logging
+import sys
 
 from commoncode import filetype
 from commoncode import fileutils
@@ -38,21 +39,31 @@
 from packagedcode.utils import parse_repo_url
 
 """
-Handle PHP composer packages, refer to https://getcomposer.org/
+Parse PHP composer package manifests, see https://getcomposer.org/ and
+https://packagist.org/
 """
 
 
+TRACE = False
+
+def logger_debug(*args):
+    pass
+
 logger = logging.getLogger(__name__)
-# import sys
-# logging.basicConfig(level=logging.DEBUG, stream=sys.stdout)
-# logger.setLevel(logging.DEBUG)
+
+if TRACE:
+    logging.basicConfig(stream=sys.stdout)
+    logger.setLevel(logging.DEBUG)
+
+    def logger_debug(*args):
+        return logger.debug(' '.join(isinstance(a, basestring) and a or repr(a) for a in args))
 
 
 class PHPComposerPackage(models.Package):
     metafiles = ('composer.json',)
     filetypes = ('.json',)
     mimetypes = ('application/json',)
-    type = models.StringType(default='phpcomposer')
+    type = models.StringType(default='composer')
     primary_language = models.StringType(default='PHP')
 
     @classmethod
@@ -88,10 +99,9 @@ def build_package(package_data, base_dir=None):
     # mapping of top level composer.json items to the Package object
     # field name
     plain_fields = OrderedDict([
-        ('name', 'name'),
+        ('version', 'version'),
         ('description', 'summary'),
         ('keywords', 'keywords'),
-        ('version', 'version'),
         ('homepage', 'homepage_url'),
     ])
 
@@ -101,9 +111,13 @@ def build_package(package_data, base_dir=None):
     field_mappers = OrderedDict([
         ('authors', author_mapper),
         ('license', licensing_mapper),
-        ('require', dependencies_mapper),
-        ('require-dev', dev_dependencies_mapper),
-        ('repositories', repository_mapper),
+        ('require', deps_mapper),
+        ('require-dev', dev_deps_mapper),
+        ('provide', provide_deps_mapper),
+        ('conflict', conflict_deps_mapper),
+        ('replace', replace_deps_mapper),
+        ('suggest', suggest_deps_mapper),
+        ('repositories', vcs_repository_mapper),
         ('support', support_mapper),
     ])
 
@@ -112,9 +126,17 @@ def build_package(package_data, base_dir=None):
     # only for published packages:
     # https://getcomposer.org/doc/04-schema.md#name
     # We want to catch both published and non-published packages here.
+    # Therefore, we use "private-package-without-a-name" as a package name if there is no name.
+
+    ns_name = package_data.get('name')
+    if not ns_name:
+        ns_name ='private-package-without-a-name'
+    ns, _, name = ns_name.rpartition('/')
 
-    package = PHPComposerPackage()
-    package.location = base_dir
+    package = PHPComposerPackage(
+        namespace=ns,
+        name=name,
+    )
 
     for source, target in plain_fields.items():
         value = package_data.get(source)
@@ -172,7 +194,7 @@ def licensing_mapper(licenses, package):
     else:
         lics = licenses
 
-    package.asserted_license = lics
+    package.asserted_license = lics or None
     return package
 
 
@@ -204,15 +226,12 @@ def vendor_mapper(package):
     Vendor is the first part of the name element.
     https://getcomposer.org/doc/04-schema.md#name
     """
-    name = package.name
-    if name and '/' in name:
-        vendor, _ , _ = name.partition('/')
-        if vendor:
-            package.parties.append(models.Party(name=vendor, role='vendor'))
+    if package.namespace:
+        package.parties.append(models.Party(name=package.namespace, role='vendor'))
     return package
 
 
-def repository_mapper(repos, package):
+def vcs_repository_mapper(repos, package):
     """
     https://getcomposer.org/doc/04-schema.md#repositories
     "repositories": [
@@ -283,27 +302,42 @@ def deps_mapper(deps, package, field_name):
     return a tuple of (dep type, list of deps)
     https://getcomposer.org/doc/04-schema.md#package-links
     """
-    dep_types = {
-        'dependencies': models.dep_runtime,
-        'devDependencies': models.dep_dev,
+    dep_scopes = {
+        'require': dict(is_runtime=True),
+        'require-dev': dict(is_runtime=False, is_optional=True),
+        'provide': dict(is_runtime=True),
+        'conflict': dict(is_runtime=False, is_optional=True),
+        'replace': dict(is_runtime=True, is_optional=True),
+        'suggest': dict(is_runtime=True, is_optional=True),
     }
-    resolved_type = dep_types[field_name]
-    dependencies = []
-    for name, version in deps.items():
-        dep = models.BasePackage(
-            type='phpcomposer',
-            name=name,
-            version=version)
+    dep_scope = dep_scopes.get(field_name)
+
+    dependencies = package.dependencies
+    for ns_name, requirement in deps.items():
+        ns, _, name = ns_name.rpartition('/')
+
+        did = models.PackageIdentifier(
+            type='composer',
+            namespace=ns,
+            name=name
+            ).to_string()
+
+        dep = models.DependentPackage(
+            identifier=did,
+            requirement=requirement,
+            scope=field_name,
+            **dep_scope
+        )
         dependencies.append(dep)
-    if resolved_type in package.dependencies:
-        package.dependencies[resolved_type].extend(dependencies)
-    else:
-        package.dependencies[resolved_type] = dependencies
     return package
 
 
-dependencies_mapper = partial(deps_mapper, field_name='dependencies')
-dev_dependencies_mapper = partial(deps_mapper, field_name='devDependencies')
+deps_mapper = partial(deps_mapper, field_name='require')
+dev_deps_mapper = partial(deps_mapper, field_name='require-dev')
+provide_deps_mapper = partial(deps_mapper, field_name='provide')
+conflict_deps_mapper = partial(deps_mapper, field_name='conflict')
+replace_deps_mapper = partial(deps_mapper, field_name='replace')
+suggest_deps_mapper = partial(deps_mapper, field_name='suggest')
 
 
 def parse_person(persons):
diff --git a/src/packagedcode/pypi.py b/src/packagedcode/pypi.py
index f6f3d990eaf..36ae7fcd047 100644
--- a/src/packagedcode/pypi.py
+++ b/src/packagedcode/pypi.py
@@ -96,9 +96,9 @@ def parse_pkg_info(location):
     package = PythonPackage(
         name=infos.get('Name'),
         version=infos.get('Version'),
-        description=description,
-        homepage_url=infos.get('Home-page'),
-        asserted_license=infos.get('License'),
+        description=description or None,
+        homepage_url=infos.get('Home-page') or None,
+        asserted_license=infos.get('License') or None,
         # FIXME: what about email?
         # FIXME: what about maintainers?
         parties=parties,
@@ -184,9 +184,9 @@ def parse_metadata(location):
     package = PythonPackage(
         name=infos.get('name'),
         version=infos.get('version'),
-        description=description,
-        asserted_license=infos.get('license'),
-        homepage_url=homepage_url,
+        description=description or None,
+        asserted_license=infos.get('license') or None,
+        homepage_url=homepage_url or None,
         parties=parties,
     )
     return package
@@ -214,10 +214,10 @@ def parse_setup_py(location):
     package = PythonPackage(
         name=get_setup_attribute(location, 'name'),
         version=get_setup_attribute(location, 'version'),
-        description=description,
-        homepage_url=get_setup_attribute(location, 'url'),
+        description=description or None,
+        homepage_url=get_setup_attribute(location, 'url') or None,
         parties=parties,
-        asserted_license=get_setup_attribute(location, 'license')
+        asserted_license=get_setup_attribute(location, 'license') or None,
     )
     return package
 
diff --git a/src/packagedcode/rpm.py b/src/packagedcode/rpm.py
index 3cbc84664de..86261f41667 100644
--- a/src/packagedcode/rpm.py
+++ b/src/packagedcode/rpm.py
@@ -125,19 +125,23 @@ class EVR(namedtuple('EVR', 'epoch version release')):
 
     # note: the order of the named tuple is the sort order.
     # But for creation we put the rarely used epoch last
-    def __new__(self, version, release, epoch=None):
+    def __new__(self, version, release=None, epoch=None):
         if epoch and epoch.strip() and not epoch.isdigit():
             raise ValueError('Invalid epoch: must be a number or empty.')
+        if not version:
+            raise ValueError('Version is required: {}'.format(repr(version)))
+
         return super(EVR, self).__new__(EVR, epoch, version, release)
 
     def __str__(self, *args, **kwargs):
-        vr = '-'.join([self.version, self.release])
-        if self.epoch:
-            vr = ':'.join([self.epoch, vr])
-        return vr
+        return self.to_string()
 
     def to_string(self):
-        vr = '-'.join([self.version, self.release])
+        if self.release:
+            vr = '-'.join([self.version, self.release])
+        else:
+            vr = self.version
+
         if self.epoch:
             vr = ':'.join([self.epoch, vr])
         return vr
@@ -149,7 +153,7 @@ class RpmPackage(models.Package):
     filetypes = ('rpm ',)
     mimetypes = ('application/x-rpm',)
 
-    type = models.StringType(default='RPM')
+    type = models.StringType(default='rpm')
 
     @classmethod
     def recognize(cls, location):
@@ -158,24 +162,60 @@ def recognize(cls, location):
 
 def parse(location):
     """
-    Return an RpmPackage object for the file at location or None if the file is
-    not an RPM.
+    Return an RpmPackage object for the file at location or None if
+    the file is not an RPM.
     """
     infos = info(location, include_desc=True)
     if TRACE: logger_debug('parse: infos', infos)
     if not infos:
         return
 
-    epoch = infos.epoch and int(infos.epoch) or None
+    name = infos.name
+
+    try:
+        epoch = infos.epoch and int(infos.epoch) or None
+    except ValueError:
+        epoch = None
+    evr = EVR(
+        version=infos.version or None,
+        release=infos.release or None,
+        epoch=epoch).to_string()
+
+    qualifiers = {}
+    os = infos.os
+    if os and os != 'linux':
+        qualifiers['os'] = os
 
-    asserted_license = infos.license or None
+    arch = infos.arch
+    if arch:
+        qualifiers['arch'] = arch
 
     related_packages = []
     if infos.source_rpm:
-        epoch, name, version, release, _arch = nevra.from_name(infos.source_rpm)
-        evr = EVR(version, release, epoch)
-        if TRACE: logger_debug('parse: evr', str(evr))
-        related_packages = [models.BasePackage(type='RPM', name=name, version=evr.to_string())]
+        identifier = models.PackageIdentifier(
+            type='rpm',
+            name=name,
+            version=evr,
+            qualifiers=qualifiers
+        ).to_string()
+
+        src_epoch, src_name, src_version, src_release, src_arch = nevra.from_name(infos.source_rpm)
+        src_evr = EVR(src_version, src_release, src_epoch).to_string()
+        src_qualifiers = {}
+        if src_arch:
+            src_qualifiers['arch'] = src_arch
+
+        src_identifier = models.PackageIdentifier(
+            type='rpm',
+            name=src_name,
+            version=src_evr,
+            qualifiers=src_qualifiers
+            ).to_string()
+        if TRACE: logger_debug('parse: source_rpm', src_identifier)
+        related_packages = [models.PackageRelationship(
+            from_pid=src_identifier,
+            to_pid=identifier,
+            relationship='source_of')]
 
     parties = []
     if infos.distribution:
@@ -186,12 +226,12 @@ def parse(location):
     description = join_texts(infos.summary , infos.description)
 
     package = RpmPackage(
-        description=description,
-        name=infos.name,
-        version=str(EVR(version=infos.version, release=infos.release, epoch=epoch or None)),
-        homepage_url=infos.url,
+        name=name,
+        version=evr,
+        description=description or None,
+        homepage_url=infos.url or None,
         parties=parties,
-        asserted_license=asserted_license,
+        asserted_license=infos.license or None,
         related_packages=related_packages
     )
     return package
diff --git a/src/scancode/cli_test_utils.py b/src/scancode/cli_test_utils.py
index e3fa8e1697b..4729961b7b9 100644
--- a/src/scancode/cli_test_utils.py
+++ b/src/scancode/cli_test_utils.py
@@ -31,7 +31,7 @@
 from collections import OrderedDict
 import json
 import os
-
+ 
 from commoncode.system import on_linux
 from scancode_config import scancode_root_dir
 
diff --git a/tests/formattedcode/data/csv/livescan/expected.csv b/tests/formattedcode/data/csv/livescan/expected.csv
index 53fb28a2b6d..f7a781bf700 100644
--- a/tests/formattedcode/data/csv/livescan/expected.csv
+++ b/tests/formattedcode/data/csv/livescan/expected.csv
@@ -1,19 +1,19 @@
-Resource,type,name,base_name,extension,date,size,sha1,md5,files_count,mime_type,file_type,programming_language,is_binary,is_text,is_archive,is_media,is_source,is_script,scan_errors,license__key,license__score,license__short_name,license__category,license__owner,license__homepage_url,license__text_url,license__reference_url,license__spdx_license_key,license__spdx_url,start_line,end_line,matched_rule__identifier,matched_rule__license_choice,matched_rule__licenses,copyright,copyright_holder,email,url,package__type,package__name,package__version,package__primary_language,package__code_type,package__description,package__size,package__release_date,package__homepage_url,package__download_url,package__bug_tracking_url,package__vcs_repository,package__copyright,package__asserted_license,package__notice_text
-/package.json,file,package.json,package,.json,2017-10-03,2200,918376afce796ef90eeda1d6695f2289c90491ac,1f66239a9b850c5e60a9382dbe2162d2,,text/plain,"ASCII text, with very long lines",JSON,False,True,False,False,True,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,mit,15.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit_27.RULE,False,[u'mit'],,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,mit,100.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit.LICENSE,False,[u'mit'],,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,Copyright (c) 2012 LearnBoost &lt tj@learnboost.com&gt,,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,,LearnBoost &lt,,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12,12,,,,,,tj@learnboost.com,,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,16,16,,,,,,,https://github.com/visionmedia/node-cookie-signature.git,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,27,27,,,,,,,https://github.com/visionmedia/node-cookie-signature/issues,,,,,,,,,,,,,,,
-/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-/json2csv.rb,file,json2csv.rb,json2csv,.rb,2017-10-03,1014,92a83e5f8566bee7c83cf798c1b8912d609f56e0,380b7a5f483db7ace853b8f9dca5bfec,,text/x-python,"Python script, ASCII text executable",Ruby,False,True,False,False,True,True,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,apache-2.0,89.53,Apache 2.0,Permissive,Apache Software Foundation,http://www.apache.org/licenses/,http://www.apache.org/licenses/LICENSE-2.0,https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0,Apache-2.0,https://spdx.org/licenses/Apache-2.0,5,14,apache-2.0_7.RULE,False,[u'apache-2.0'],,,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,Copyright (c) 2017 nexB Inc. and others.,,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,,nexB Inc. and others.,,,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,http://nexb.com/,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,https://github.com/nexB/scancode-toolkit/,,,,,,,,,,,,,,,
-/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,10,,,,,,,http://apache.org/licenses/LICENSE-2.0,,,,,,,,,,,,,,,
-/license,file,license,license,,2017-10-03,679,75c5490a718ddd45e40e0cc7ce0c756abc373123,b965a762efb9421cf1bf4405f336e278,,text/plain,ASCII text,,False,True,False,False,False,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-/license,,,,,,,,,,,,,,,,,,,,gpl-2.0-plus,100.00,GPL 2.0 or later,Copyleft,Free Software Foundation (FSF),http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,https://enterprise.dejacode.com/urn/urn:dje:license:gpl-2.0-plus,GPL-2.0+,https://spdx.org/licenses/GPL-2.0,1,12,gpl-2.0-plus.LICENSE,False,[u'gpl-2.0-plus'],,,,,,,,,,,,,,,,,,,
+Resource,type,name,base_name,extension,date,size,sha1,md5,files_count,mime_type,file_type,programming_language,is_binary,is_text,is_archive,is_media,is_source,is_script,scan_errors,license__key,license__score,license__short_name,license__category,license__owner,license__homepage_url,license__text_url,license__reference_url,license__spdx_license_key,license__spdx_url,start_line,end_line,matched_rule__identifier,matched_rule__license_choice,matched_rule__licenses,copyright,copyright_holder,email,url,package__type,package__namespace,package__name,package__version,package__qualifiers,package__path,package__primary_language,package__code_type,package__description,package__size,package__release_date,package__homepage_url,package__download_url,package__bug_tracking_url,package__vcs_repository,package__copyright,package__asserted_license,package__notice_text
+/package.json,file,package.json,package,.json,2017-10-03,2200,918376afce796ef90eeda1d6695f2289c90491ac,1f66239a9b850c5e60a9382dbe2162d2,,text/plain,"ASCII text, with very long lines",JSON,False,True,False,False,True,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,mit,15.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit_27.RULE,False,[u'mit'],,,,,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,mit,100.00,MIT License,Permissive,MIT,http://opensource.org/licenses/mit-license.php,http://opensource.org/licenses/mit-license.php,https://enterprise.dejacode.com/urn/urn:dje:license:mit,MIT,https://spdx.org/licenses/MIT,24,24,mit.LICENSE,False,[u'mit'],,,,,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,Copyright (c) 2012 LearnBoost &lt tj@learnboost.com&gt,,,,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,23,26,,,,,LearnBoost &lt,,,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12,12,,,,,,tj@learnboost.com,,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,16,16,,,,,,,https://github.com/visionmedia/node-cookie-signature.git,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,27,27,,,,,,,https://github.com/visionmedia/node-cookie-signature/issues,,,,,,,,,,,,,,,,,,
+/package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/json2csv.rb,file,json2csv.rb,json2csv,.rb,2017-10-03,1014,92a83e5f8566bee7c83cf798c1b8912d609f56e0,380b7a5f483db7ace853b8f9dca5bfec,,text/x-python,"Python script, ASCII text executable",Ruby,False,True,False,False,True,True,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,apache-2.0,89.53,Apache 2.0,Permissive,Apache Software Foundation,http://www.apache.org/licenses/,http://www.apache.org/licenses/LICENSE-2.0,https://enterprise.dejacode.com/urn/urn:dje:license:apache-2.0,Apache-2.0,https://spdx.org/licenses/Apache-2.0,5,14,apache-2.0_7.RULE,False,[u'apache-2.0'],,,,,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,Copyright (c) 2017 nexB Inc. and others.,,,,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,3,3,,,,,nexB Inc. and others.,,,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,http://nexb.com/,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4,,,,,,,https://github.com/nexB/scancode-toolkit/,,,,,,,,,,,,,,,,,,
+/json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,10,10,,,,,,,http://apache.org/licenses/LICENSE-2.0,,,,,,,,,,,,,,,,,,
+/license,file,license,license,,2017-10-03,679,75c5490a718ddd45e40e0cc7ce0c756abc373123,b965a762efb9421cf1bf4405f336e278,,text/plain,ASCII text,,False,True,False,False,False,False,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+/license,,,,,,,,,,,,,,,,,,,,gpl-2.0-plus,100.00,GPL 2.0 or later,Copyleft,Free Software Foundation (FSF),http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html,https://enterprise.dejacode.com/urn/urn:dje:license:gpl-2.0-plus,GPL-2.0+,https://spdx.org/licenses/GPL-2.0,1,12,gpl-2.0-plus.LICENSE,False,[u'gpl-2.0-plus'],,,,,,,,,,,,,,,,,,,,,,
diff --git a/tests/formattedcode/data/json/simple-expected.jsonlines b/tests/formattedcode/data/json/simple-expected.jsonlines
index 2838e023931..c643a3ffdd4 100644
--- a/tests/formattedcode/data/json/simple-expected.jsonlines
+++ b/tests/formattedcode/data/json/simple-expected.jsonlines
@@ -5,7 +5,7 @@
       "scancode_options": {
         "input": "<path>",
         "--info": true,
-        "--json-lines": "<file>" 
+        "--json-lines": "<file>"
       },
       "files_count": 1
     }
diff --git a/tests/packagedcode/data/m2/ant/ant-launcher/1.6.5/ant-launcher-1.6.5.pom.json b/tests/packagedcode/data/m2/ant/ant-launcher/1.6.5/ant-launcher-1.6.5.pom.json
index 28957fcf249..481539783a1 100644
--- a/tests/packagedcode/data/m2/ant/ant-launcher/1.6.5/ant-launcher-1.6.5.pom.json
+++ b/tests/packagedcode/data/m2/ant/ant-launcher/1.6.5/ant-launcher-1.6.5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "ant-launcher", 
   "version": "1.6.5", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/ant/ant-launcher/1.6.5/ant-launcher-1.6.5.pom.package.json b/tests/packagedcode/data/m2/ant/ant-launcher/1.6.5/ant-launcher-1.6.5.pom.package.json
index ae7f20626ce..bc4dd6192c0 100644
--- a/tests/packagedcode/data/m2/ant/ant-launcher/1.6.5/ant-launcher-1.6.5.pom.package.json
+++ b/tests/packagedcode/data/m2/ant/ant-launcher/1.6.5/ant-launcher-1.6.5.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "ant:ant-launcher", 
+  "type": "maven", 
+  "namespace": "ant", 
+  "name": "ant-launcher", 
   "version": "1.6.5", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/ant/ant/1.6.5/ant-1.6.5.pom.json b/tests/packagedcode/data/m2/ant/ant/1.6.5/ant-1.6.5.pom.json
index 37420e6cba4..ebf8ea58306 100644
--- a/tests/packagedcode/data/m2/ant/ant/1.6.5/ant-1.6.5.pom.json
+++ b/tests/packagedcode/data/m2/ant/ant/1.6.5/ant-1.6.5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "ant", 
   "version": "1.6.5", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache", 
     "artifact_id": "apache", 
diff --git a/tests/packagedcode/data/m2/ant/ant/1.6.5/ant-1.6.5.pom.package.json b/tests/packagedcode/data/m2/ant/ant/1.6.5/ant-1.6.5.pom.package.json
index 8289c9198a6..e004accd2a3 100644
--- a/tests/packagedcode/data/m2/ant/ant/1.6.5/ant-1.6.5.pom.package.json
+++ b/tests/packagedcode/data/m2/ant/ant/1.6.5/ant-1.6.5.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "ant:ant", 
+  "type": "maven", 
+  "namespace": "ant", 
+  "name": "ant", 
   "version": "1.6.5", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,22 +21,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "xerces:xercesImpl", 
-        "version": "2.6.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "xml-apis:xml-apis", 
-        "version": "1.3.04"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:xerces/xercesImpl", 
+      "requirement": "2.6.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:xml-apis/xml-apis", 
+      "requirement": "1.3.04", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/antlr/antlr/2.7.6/antlr-2.7.6.pom.json b/tests/packagedcode/data/m2/antlr/antlr/2.7.6/antlr-2.7.6.pom.json
index f9cee92e30f..2ee80dff90e 100644
--- a/tests/packagedcode/data/m2/antlr/antlr/2.7.6/antlr-2.7.6.pom.json
+++ b/tests/packagedcode/data/m2/antlr/antlr/2.7.6/antlr-2.7.6.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "antlr", 
   "version": "2.7.6", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "AntLR", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/antlr/antlr/2.7.6/antlr-2.7.6.pom.package.json b/tests/packagedcode/data/m2/antlr/antlr/2.7.6/antlr-2.7.6.pom.package.json
index 3210d69cff7..8319e8ae8c4 100644
--- a/tests/packagedcode/data/m2/antlr/antlr/2.7.6/antlr-2.7.6.pom.package.json
+++ b/tests/packagedcode/data/m2/antlr/antlr/2.7.6/antlr-2.7.6.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "antlr:antlr", 
+  "type": "maven", 
+  "namespace": "antlr", 
+  "name": "antlr", 
   "version": "2.7.6", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "AntLR", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/aopalliance/aopalliance/1.0/aopalliance-1.0.pom.json b/tests/packagedcode/data/m2/aopalliance/aopalliance/1.0/aopalliance-1.0.pom.json
index fc0b089a013..6b9db133969 100644
--- a/tests/packagedcode/data/m2/aopalliance/aopalliance/1.0/aopalliance-1.0.pom.json
+++ b/tests/packagedcode/data/m2/aopalliance/aopalliance/1.0/aopalliance-1.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "aopalliance", 
   "version": "1.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "AOP alliance", 
   "description": "AOP Alliance", 
diff --git a/tests/packagedcode/data/m2/aopalliance/aopalliance/1.0/aopalliance-1.0.pom.package.json b/tests/packagedcode/data/m2/aopalliance/aopalliance/1.0/aopalliance-1.0.pom.package.json
index 43255b50731..751eb2d4356 100644
--- a/tests/packagedcode/data/m2/aopalliance/aopalliance/1.0/aopalliance-1.0.pom.package.json
+++ b/tests/packagedcode/data/m2/aopalliance/aopalliance/1.0/aopalliance-1.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "aopalliance:aopalliance", 
+  "type": "maven", 
+  "namespace": "aopalliance", 
+  "name": "aopalliance", 
   "version": "1.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "AOP Alliance", 
+  "description": "AOP alliance\nAOP Alliance", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "Public Domain", 
   "license_expression": null, 
+  "asserted_license": "Public Domain", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.pom.json b/tests/packagedcode/data/m2/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.pom.json
index 8320d2e85c1..8b1cc36d543 100644
--- a/tests/packagedcode/data/m2/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.pom.json
+++ b/tests/packagedcode/data/m2/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "asm-attrs", 
   "version": "1.5.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "asm-attrs", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.pom.package.json b/tests/packagedcode/data/m2/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.pom.package.json
index d9a50762c20..5fa7108ba50 100644
--- a/tests/packagedcode/data/m2/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.pom.package.json
+++ b/tests/packagedcode/data/m2/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "asm:asm-attrs", 
+  "type": "maven", 
+  "namespace": "asm", 
+  "name": "asm-attrs", 
   "version": "1.5.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "asm-attrs", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -40,9 +43,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/asm/asm-parent/3.0/asm-parent-3.0.pom.json b/tests/packagedcode/data/m2/asm/asm-parent/3.0/asm-parent-3.0.pom.json
index 04ed600a574..bdf6286c2bc 100644
--- a/tests/packagedcode/data/m2/asm/asm-parent/3.0/asm-parent-3.0.pom.json
+++ b/tests/packagedcode/data/m2/asm/asm-parent/3.0/asm-parent-3.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "asm-parent", 
   "version": "3.0", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "ASM", 
   "description": "A very small and fast Java bytecode manipulation framework", 
diff --git a/tests/packagedcode/data/m2/asm/asm-parent/3.0/asm-parent-3.0.pom.package.json b/tests/packagedcode/data/m2/asm/asm-parent/3.0/asm-parent-3.0.pom.package.json
index 269bdcdaf14..c4d586f0fea 100644
--- a/tests/packagedcode/data/m2/asm/asm-parent/3.0/asm-parent-3.0.pom.package.json
+++ b/tests/packagedcode/data/m2/asm/asm-parent/3.0/asm-parent-3.0.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "asm:asm-parent", 
+  "type": "maven", 
+  "namespace": "asm", 
+  "name": "asm-parent", 
   "version": "3.0", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "A very small and fast Java bytecode manipulation framework", 
+  "description": "ASM\nA very small and fast Java bytecode manipulation framework", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -40,9 +45,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/asm/asm/1.5.3/asm-1.5.3.pom.json b/tests/packagedcode/data/m2/asm/asm/1.5.3/asm-1.5.3.pom.json
index d2d88ffe380..ddad17c1139 100644
--- a/tests/packagedcode/data/m2/asm/asm/1.5.3/asm-1.5.3.pom.json
+++ b/tests/packagedcode/data/m2/asm/asm/1.5.3/asm-1.5.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "asm", 
   "version": "1.5.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "asm", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/asm/asm/1.5.3/asm-1.5.3.pom.package.json b/tests/packagedcode/data/m2/asm/asm/1.5.3/asm-1.5.3.pom.package.json
index 3c426800f98..2f31aa749f5 100644
--- a/tests/packagedcode/data/m2/asm/asm/1.5.3/asm-1.5.3.pom.package.json
+++ b/tests/packagedcode/data/m2/asm/asm/1.5.3/asm-1.5.3.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "asm:asm", 
+  "type": "maven", 
+  "namespace": "asm", 
+  "name": "asm", 
   "version": "1.5.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "asm", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -40,9 +43,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/asm/asm/3.0/asm-3.0.pom.json b/tests/packagedcode/data/m2/asm/asm/3.0/asm-3.0.pom.json
index d5d30e378ae..124c8ea6bfa 100644
--- a/tests/packagedcode/data/m2/asm/asm/3.0/asm-3.0.pom.json
+++ b/tests/packagedcode/data/m2/asm/asm/3.0/asm-3.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "asm", 
   "version": "3.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "asm", 
     "artifact_id": "asm-parent", 
diff --git a/tests/packagedcode/data/m2/asm/asm/3.0/asm-3.0.pom.package.json b/tests/packagedcode/data/m2/asm/asm/3.0/asm-3.0.pom.package.json
index dfd06adada7..1340cb4677b 100644
--- a/tests/packagedcode/data/m2/asm/asm/3.0/asm-3.0.pom.package.json
+++ b/tests/packagedcode/data/m2/asm/asm/3.0/asm-3.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "asm:asm", 
+  "type": "maven", 
+  "namespace": "asm", 
+  "name": "asm", 
   "version": "3.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "ASM Core", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/aspectj/aspectjrt/1.5.3/aspectjrt-1.5.3.pom.json b/tests/packagedcode/data/m2/aspectj/aspectjrt/1.5.3/aspectjrt-1.5.3.pom.json
index af26e6ce4ea..9acdf94ba2e 100644
--- a/tests/packagedcode/data/m2/aspectj/aspectjrt/1.5.3/aspectjrt-1.5.3.pom.json
+++ b/tests/packagedcode/data/m2/aspectj/aspectjrt/1.5.3/aspectjrt-1.5.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "aspectjrt", 
   "version": "1.5.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "AspectJ runtime", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/aspectj/aspectjrt/1.5.3/aspectjrt-1.5.3.pom.package.json b/tests/packagedcode/data/m2/aspectj/aspectjrt/1.5.3/aspectjrt-1.5.3.pom.package.json
index c39d7ab12c0..876492b4fad 100644
--- a/tests/packagedcode/data/m2/aspectj/aspectjrt/1.5.3/aspectjrt-1.5.3.pom.package.json
+++ b/tests/packagedcode/data/m2/aspectj/aspectjrt/1.5.3/aspectjrt-1.5.3.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "aspectj:aspectjrt", 
+  "type": "maven", 
+  "namespace": "aspectj", 
+  "name": "aspectjrt", 
   "version": "1.5.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "AspectJ runtime", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "Eclipse Public License - v 1.0\nhttp://www.eclipse.org/legal/epl-v10.html", 
   "license_expression": null, 
+  "asserted_license": "Eclipse Public License - v 1.0\nhttp://www.eclipse.org/legal/epl-v10.html", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/aspectj/aspectjrt/1.5.4/aspectjrt-1.5.4.pom.json b/tests/packagedcode/data/m2/aspectj/aspectjrt/1.5.4/aspectjrt-1.5.4.pom.json
index 5245a1d4c50..fab55d8a5c0 100644
--- a/tests/packagedcode/data/m2/aspectj/aspectjrt/1.5.4/aspectjrt-1.5.4.pom.json
+++ b/tests/packagedcode/data/m2/aspectj/aspectjrt/1.5.4/aspectjrt-1.5.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "aspectjrt", 
   "version": "1.5.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/aspectj/aspectjrt/1.5.4/aspectjrt-1.5.4.pom.package.json b/tests/packagedcode/data/m2/aspectj/aspectjrt/1.5.4/aspectjrt-1.5.4.pom.package.json
index 3eba66a9b27..67116bcdb37 100644
--- a/tests/packagedcode/data/m2/aspectj/aspectjrt/1.5.4/aspectjrt-1.5.4.pom.package.json
+++ b/tests/packagedcode/data/m2/aspectj/aspectjrt/1.5.4/aspectjrt-1.5.4.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "aspectj:aspectjrt", 
+  "type": "maven", 
+  "namespace": "aspectj", 
+  "name": "aspectjrt", 
   "version": "1.5.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "relocation": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.aspectj:aspectjrt", 
-        "version": "1.5.4"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.aspectj/aspectjrt", 
+      "requirement": "1.5.4", 
+      "scope": "relocation", 
+      "is_runtime": false, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/aspectj/aspectjtools/1.5.4/aspectjtools-1.5.4.pom.json b/tests/packagedcode/data/m2/aspectj/aspectjtools/1.5.4/aspectjtools-1.5.4.pom.json
index 61c6929b93c..6d38ee5793e 100644
--- a/tests/packagedcode/data/m2/aspectj/aspectjtools/1.5.4/aspectjtools-1.5.4.pom.json
+++ b/tests/packagedcode/data/m2/aspectj/aspectjtools/1.5.4/aspectjtools-1.5.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "aspectjtools", 
   "version": "1.5.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/aspectj/aspectjtools/1.5.4/aspectjtools-1.5.4.pom.package.json b/tests/packagedcode/data/m2/aspectj/aspectjtools/1.5.4/aspectjtools-1.5.4.pom.package.json
index a41246691eb..c4e7ba3fa4b 100644
--- a/tests/packagedcode/data/m2/aspectj/aspectjtools/1.5.4/aspectjtools-1.5.4.pom.package.json
+++ b/tests/packagedcode/data/m2/aspectj/aspectjtools/1.5.4/aspectjtools-1.5.4.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "aspectj:aspectjtools", 
+  "type": "maven", 
+  "namespace": "aspectj", 
+  "name": "aspectjtools", 
   "version": "1.5.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "relocation": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.aspectj:aspectjtools", 
-        "version": "1.5.4"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.aspectj/aspectjtools", 
+      "requirement": "1.5.4", 
+      "scope": "relocation", 
+      "is_runtime": false, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/aspectj/aspectjweaver/1.5.4/aspectjweaver-1.5.4.pom.json b/tests/packagedcode/data/m2/aspectj/aspectjweaver/1.5.4/aspectjweaver-1.5.4.pom.json
index f198b944103..bad2be8b50e 100644
--- a/tests/packagedcode/data/m2/aspectj/aspectjweaver/1.5.4/aspectjweaver-1.5.4.pom.json
+++ b/tests/packagedcode/data/m2/aspectj/aspectjweaver/1.5.4/aspectjweaver-1.5.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "aspectjweaver", 
   "version": "1.5.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/aspectj/aspectjweaver/1.5.4/aspectjweaver-1.5.4.pom.package.json b/tests/packagedcode/data/m2/aspectj/aspectjweaver/1.5.4/aspectjweaver-1.5.4.pom.package.json
index b1543de6105..f4d4852aaeb 100644
--- a/tests/packagedcode/data/m2/aspectj/aspectjweaver/1.5.4/aspectjweaver-1.5.4.pom.package.json
+++ b/tests/packagedcode/data/m2/aspectj/aspectjweaver/1.5.4/aspectjweaver-1.5.4.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "aspectj:aspectjweaver", 
+  "type": "maven", 
+  "namespace": "aspectj", 
+  "name": "aspectjweaver", 
   "version": "1.5.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "relocation": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.aspectj:aspectjweaver", 
-        "version": "1.5.4"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.aspectj/aspectjweaver", 
+      "requirement": "1.5.4", 
+      "scope": "relocation", 
+      "is_runtime": false, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/avalon/avalon-framework/4.1.3/avalon-framework-4.1.3.pom.json b/tests/packagedcode/data/m2/avalon/avalon-framework/4.1.3/avalon-framework-4.1.3.pom.json
index 15033b66a20..b4d6d49e9ed 100644
--- a/tests/packagedcode/data/m2/avalon/avalon-framework/4.1.3/avalon-framework-4.1.3.pom.json
+++ b/tests/packagedcode/data/m2/avalon/avalon-framework/4.1.3/avalon-framework-4.1.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "avalon-framework", 
   "version": "4.1.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/avalon/avalon-framework/4.1.3/avalon-framework-4.1.3.pom.package.json b/tests/packagedcode/data/m2/avalon/avalon-framework/4.1.3/avalon-framework-4.1.3.pom.package.json
index 22ddb444de6..8eec2b11fde 100644
--- a/tests/packagedcode/data/m2/avalon/avalon-framework/4.1.3/avalon-framework-4.1.3.pom.package.json
+++ b/tests/packagedcode/data/m2/avalon/avalon-framework/4.1.3/avalon-framework-4.1.3.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "avalon-framework:avalon-framework", 
+  "type": "maven", 
+  "namespace": "avalon-framework", 
+  "name": "avalon-framework", 
   "version": "4.1.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/bcel/bcel/5.1/bcel-5.1.pom.json b/tests/packagedcode/data/m2/bcel/bcel/5.1/bcel-5.1.pom.json
index d11e507269b..b14096a95b9 100644
--- a/tests/packagedcode/data/m2/bcel/bcel/5.1/bcel-5.1.pom.json
+++ b/tests/packagedcode/data/m2/bcel/bcel/5.1/bcel-5.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "bcel", 
   "version": "5.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/bcel/bcel/5.1/bcel-5.1.pom.package.json b/tests/packagedcode/data/m2/bcel/bcel/5.1/bcel-5.1.pom.package.json
index 0c4a417ea73..84059b20e26 100644
--- a/tests/packagedcode/data/m2/bcel/bcel/5.1/bcel-5.1.pom.package.json
+++ b/tests/packagedcode/data/m2/bcel/bcel/5.1/bcel-5.1.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "bcel:bcel", 
+  "type": "maven", 
+  "namespace": "bcel", 
+  "name": "bcel", 
   "version": "5.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom.json b/tests/packagedcode/data/m2/beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom.json
index 7445a708c51..b08a1afcc35 100644
--- a/tests/packagedcode/data/m2/beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom.json
+++ b/tests/packagedcode/data/m2/beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-beanutils", 
   "version": "1.6", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "BeanUtils", 
   "description": "Java Bean Utililities", 
diff --git a/tests/packagedcode/data/m2/beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom.package.json b/tests/packagedcode/data/m2/beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom.package.json
index 3c428209d79..6ecaf8c38dc 100644
--- a/tests/packagedcode/data/m2/beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom.package.json
+++ b/tests/packagedcode/data/m2/beanutils/commons-beanutils/1.6/commons-beanutils-1.6.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "commons-beanutils:commons-beanutils", 
+  "type": "maven", 
+  "namespace": "commons-beanutils", 
+  "name": "commons-beanutils", 
   "version": "1.6", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Java Bean Utililities", 
+  "description": "BeanUtils\nJava Bean Utililities", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -61,29 +64,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-collections:commons-collections", 
-        "version": "2.0"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.7"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-collections/commons-collections", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.7", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom.json b/tests/packagedcode/data/m2/beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom.json
index 64963067f80..245f865336f 100644
--- a/tests/packagedcode/data/m2/beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom.json
+++ b/tests/packagedcode/data/m2/beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-beanutils", 
   "version": "1.7.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom.package.json b/tests/packagedcode/data/m2/beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom.package.json
index cef6c227abc..310f993f1ac 100644
--- a/tests/packagedcode/data/m2/beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom.package.json
+++ b/tests/packagedcode/data/m2/beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "commons-beanutils:commons-beanutils", 
+  "type": "maven", 
+  "namespace": "commons-beanutils", 
+  "name": "commons-beanutils", 
   "version": "1.7.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.0.3"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.0.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/biz/aQute/bndlib/0.0.203/bndlib-0.0.203.pom.json b/tests/packagedcode/data/m2/biz/aQute/bndlib/0.0.203/bndlib-0.0.203.pom.json
index a33cdcb6273..4086160916e 100644
--- a/tests/packagedcode/data/m2/biz/aQute/bndlib/0.0.203/bndlib-0.0.203.pom.json
+++ b/tests/packagedcode/data/m2/biz/aQute/bndlib/0.0.203/bndlib-0.0.203.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "bndlib", 
   "version": "0.0.203", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "BND Library", 
   "description": "JAR Processing Library for creating and verifying OSGi manifest headers", 
diff --git a/tests/packagedcode/data/m2/biz/aQute/bndlib/0.0.203/bndlib-0.0.203.pom.package.json b/tests/packagedcode/data/m2/biz/aQute/bndlib/0.0.203/bndlib-0.0.203.pom.package.json
index f36f6aa460a..e1995dcb3de 100644
--- a/tests/packagedcode/data/m2/biz/aQute/bndlib/0.0.203/bndlib-0.0.203.pom.package.json
+++ b/tests/packagedcode/data/m2/biz/aQute/bndlib/0.0.203/bndlib-0.0.203.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "biz.aQute:bndlib", 
+  "type": "maven", 
+  "namespace": "biz.aQute", 
+  "name": "bndlib", 
   "version": "0.0.203", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "JAR Processing Library for creating and verifying OSGi manifest headers", 
+  "description": "BND Library\nJAR Processing Library for creating and verifying OSGi manifest headers", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,9 +29,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "This material is licensed under the Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0", 
   "license_expression": null, 
+  "asserted_license": "This material is licensed under the Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/biz/aQute/bndlib/0.0.238/bndlib-0.0.238.pom.json b/tests/packagedcode/data/m2/biz/aQute/bndlib/0.0.238/bndlib-0.0.238.pom.json
index f79b6590e1e..0ce245abbdc 100644
--- a/tests/packagedcode/data/m2/biz/aQute/bndlib/0.0.238/bndlib-0.0.238.pom.json
+++ b/tests/packagedcode/data/m2/biz/aQute/bndlib/0.0.238/bndlib-0.0.238.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "bndlib", 
   "version": "0.0.238", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "BND Library", 
   "description": "JAR Processing Library for creating and verifying OSGi manifest headers", 
diff --git a/tests/packagedcode/data/m2/biz/aQute/bndlib/0.0.238/bndlib-0.0.238.pom.package.json b/tests/packagedcode/data/m2/biz/aQute/bndlib/0.0.238/bndlib-0.0.238.pom.package.json
index 4c91807ddbf..1e58b7502c4 100644
--- a/tests/packagedcode/data/m2/biz/aQute/bndlib/0.0.238/bndlib-0.0.238.pom.package.json
+++ b/tests/packagedcode/data/m2/biz/aQute/bndlib/0.0.238/bndlib-0.0.238.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "biz.aQute:bndlib", 
+  "type": "maven", 
+  "namespace": "biz.aQute", 
+  "name": "bndlib", 
   "version": "0.0.238", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "JAR Processing Library for creating and verifying OSGi manifest headers", 
+  "description": "BND Library\nJAR Processing Library for creating and verifying OSGi manifest headers", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,9 +29,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "This material is licensed under the Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0", 
   "license_expression": null, 
+  "asserted_license": "This material is licensed under the Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/c3p0/c3p0/0.9.0.4/c3p0-0.9.0.4.pom.json b/tests/packagedcode/data/m2/c3p0/c3p0/0.9.0.4/c3p0-0.9.0.4.pom.json
index 9884f6f1c01..5de7d85aa6a 100644
--- a/tests/packagedcode/data/m2/c3p0/c3p0/0.9.0.4/c3p0-0.9.0.4.pom.json
+++ b/tests/packagedcode/data/m2/c3p0/c3p0/0.9.0.4/c3p0-0.9.0.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "c3p0", 
   "version": "0.9.0.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "c3p0:JDBC DataSources/Resource Pools", 
   "description": "c3p0 is an easy-to-use library for augmenting traditional (DriverManager-based) JDBC drivers with JNDI-bindable DataSources,\n    including DataSources that implement Connection and Statement Pooling, as described by the jdbc3 spec and jdbc2 std extension.", 
diff --git a/tests/packagedcode/data/m2/c3p0/c3p0/0.9.0.4/c3p0-0.9.0.4.pom.package.json b/tests/packagedcode/data/m2/c3p0/c3p0/0.9.0.4/c3p0-0.9.0.4.pom.package.json
index 50677f40487..6318cb5bd99 100644
--- a/tests/packagedcode/data/m2/c3p0/c3p0/0.9.0.4/c3p0-0.9.0.4.pom.package.json
+++ b/tests/packagedcode/data/m2/c3p0/c3p0/0.9.0.4/c3p0-0.9.0.4.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "c3p0:c3p0", 
+  "type": "maven", 
+  "namespace": "c3p0", 
+  "name": "c3p0", 
   "version": "0.9.0.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "c3p0 is an easy-to-use library for augmenting traditional (DriverManager-based) JDBC drivers with JNDI-bindable DataSources,\n    including DataSources that implement Connection and Statement Pooling, as described by the jdbc3 spec and jdbc2 std extension.", 
+  "description": "c3p0:JDBC DataSources/Resource Pools\nc3p0 is an easy-to-use library for augmenting traditional (DriverManager-based) JDBC drivers with JNDI-bindable DataSources,\n    including DataSources that implement Connection and Statement Pooling, as described by the jdbc3 spec and jdbc2 std extension.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "GNU LESSER GENERAL PUBLIC LICENSE\nhttp://www.gnu.org/licenses/lgpl.txt", 
   "license_expression": null, 
+  "asserted_license": "GNU LESSER GENERAL PUBLIC LICENSE\nhttp://www.gnu.org/licenses/lgpl.txt", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.pom.json b/tests/packagedcode/data/m2/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.pom.json
index 56e014eb5fb..71783b2952e 100644
--- a/tests/packagedcode/data/m2/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.pom.json
+++ b/tests/packagedcode/data/m2/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "cglib-nodep", 
   "version": "2.1_3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "cglib", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.pom.package.json b/tests/packagedcode/data/m2/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.pom.package.json
index 7b120ea654d..7fe038e0f4d 100644
--- a/tests/packagedcode/data/m2/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.pom.package.json
+++ b/tests/packagedcode/data/m2/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "cglib:cglib-nodep", 
+  "type": "maven", 
+  "namespace": "cglib", 
+  "name": "cglib-nodep", 
   "version": "2.1_3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "cglib", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/cglib/cglib/2.1_3/cglib-2.1_3.pom.json b/tests/packagedcode/data/m2/cglib/cglib/2.1_3/cglib-2.1_3.pom.json
index 22f422884c1..571578ea876 100644
--- a/tests/packagedcode/data/m2/cglib/cglib/2.1_3/cglib-2.1_3.pom.json
+++ b/tests/packagedcode/data/m2/cglib/cglib/2.1_3/cglib-2.1_3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "cglib", 
   "version": "2.1_3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "cglib", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/cglib/cglib/2.1_3/cglib-2.1_3.pom.package.json b/tests/packagedcode/data/m2/cglib/cglib/2.1_3/cglib-2.1_3.pom.package.json
index b7a7be75a3a..35e8e2f8f30 100644
--- a/tests/packagedcode/data/m2/cglib/cglib/2.1_3/cglib-2.1_3.pom.package.json
+++ b/tests/packagedcode/data/m2/cglib/cglib/2.1_3/cglib-2.1_3.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "cglib:cglib", 
+  "type": "maven", 
+  "namespace": "cglib", 
+  "name": "cglib", 
   "version": "2.1_3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "cglib", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "asm:asm", 
-        "version": "1.5.3"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:asm/asm", 
+      "requirement": "1.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom.json b/tests/packagedcode/data/m2/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom.json
index 5081720e304..667630421ae 100644
--- a/tests/packagedcode/data/m2/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom.json
+++ b/tests/packagedcode/data/m2/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "classworlds", 
   "version": "1.1-alpha-2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "classworlds", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom.package.json b/tests/packagedcode/data/m2/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom.package.json
index 0bd9f816905..8d5c3264935 100644
--- a/tests/packagedcode/data/m2/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom.package.json
+++ b/tests/packagedcode/data/m2/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "classworlds:classworlds", 
+  "type": "maven", 
+  "namespace": "classworlds", 
+  "name": "classworlds", 
   "version": "1.1-alpha-2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "classworlds", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -47,9 +50,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/classworlds/classworlds/1.1/classworlds-1.1.pom.json b/tests/packagedcode/data/m2/classworlds/classworlds/1.1/classworlds-1.1.pom.json
index f606360482c..ed148143e92 100644
--- a/tests/packagedcode/data/m2/classworlds/classworlds/1.1/classworlds-1.1.pom.json
+++ b/tests/packagedcode/data/m2/classworlds/classworlds/1.1/classworlds-1.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "classworlds", 
   "version": "1.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "classworlds", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/classworlds/classworlds/1.1/classworlds-1.1.pom.package.json b/tests/packagedcode/data/m2/classworlds/classworlds/1.1/classworlds-1.1.pom.package.json
index 379b1bfa53f..87288e11a6b 100644
--- a/tests/packagedcode/data/m2/classworlds/classworlds/1.1/classworlds-1.1.pom.package.json
+++ b/tests/packagedcode/data/m2/classworlds/classworlds/1.1/classworlds-1.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "classworlds:classworlds", 
+  "type": "maven", 
+  "namespace": "classworlds", 
+  "name": "classworlds", 
   "version": "1.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "classworlds", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -47,9 +50,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/cli/commons-cli/1.0/commons-cli-1.0.pom.json b/tests/packagedcode/data/m2/cli/commons-cli/1.0/commons-cli-1.0.pom.json
index 43a6374d187..4673a4b6f82 100644
--- a/tests/packagedcode/data/m2/cli/commons-cli/1.0/commons-cli-1.0.pom.json
+++ b/tests/packagedcode/data/m2/cli/commons-cli/1.0/commons-cli-1.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-cli", 
   "version": "1.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "CLI", 
   "description": "Commons CLI provides a simple API for working with the command line arguments and options.", 
diff --git a/tests/packagedcode/data/m2/cli/commons-cli/1.0/commons-cli-1.0.pom.package.json b/tests/packagedcode/data/m2/cli/commons-cli/1.0/commons-cli-1.0.pom.package.json
index b9d3925c84f..c5fd42f1135 100644
--- a/tests/packagedcode/data/m2/cli/commons-cli/1.0/commons-cli-1.0.pom.package.json
+++ b/tests/packagedcode/data/m2/cli/commons-cli/1.0/commons-cli-1.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "commons-cli:commons-cli", 
+  "type": "maven", 
+  "namespace": "commons-cli", 
+  "name": "commons-cli", 
   "version": "1.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Commons CLI provides a simple API for working with the command line arguments and options.", 
+  "description": "CLI\nCommons CLI provides a simple API for working with the command line arguments and options.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -54,29 +57,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-lang:commons-lang", 
-        "version": "1.0"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.7"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-lang/commons-lang", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.7", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/codec/commons-codec/1.3/commons-codec-1.3.pom.json b/tests/packagedcode/data/m2/codec/commons-codec/1.3/commons-codec-1.3.pom.json
index 2a1ce0da454..52647eeda49 100644
--- a/tests/packagedcode/data/m2/codec/commons-codec/1.3/commons-codec-1.3.pom.json
+++ b/tests/packagedcode/data/m2/codec/commons-codec/1.3/commons-codec-1.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-codec", 
   "version": "1.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Codec", 
   "description": "The codec package contains simple encoder and decoders for\n   various formats such as Base64 and Hexadecimal.  In addition to these\n   widely used encoders and decoders, the codec package also maintains a\n   collection of phonetic encoding utilities.", 
diff --git a/tests/packagedcode/data/m2/codec/commons-codec/1.3/commons-codec-1.3.pom.package.json b/tests/packagedcode/data/m2/codec/commons-codec/1.3/commons-codec-1.3.pom.package.json
index 3abfcf8118c..3b471f8ea8c 100644
--- a/tests/packagedcode/data/m2/codec/commons-codec/1.3/commons-codec-1.3.pom.package.json
+++ b/tests/packagedcode/data/m2/codec/commons-codec/1.3/commons-codec-1.3.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "commons-codec:commons-codec", 
+  "type": "maven", 
+  "namespace": "commons-codec", 
+  "name": "commons-codec", 
   "version": "1.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "The codec package contains simple encoder and decoders for\n   various formats such as Base64 and Hexadecimal.  In addition to these\n   widely used encoders and decoders, the codec package also maintains a\n   collection of phonetic encoding utilities.", 
+  "description": "Codec\nThe codec package contains simple encoder and decoders for\n   various formats such as Base64 and Hexadecimal.  In addition to these\n   widely used encoders and decoders, the codec package also maintains a\n   collection of phonetic encoding utilities.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -145,17 +148,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\n/LICENSE.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\n/LICENSE.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/collections/commons-collections/2.0/commons-collections-2.0.pom.json b/tests/packagedcode/data/m2/collections/commons-collections/2.0/commons-collections-2.0.pom.json
index d69d9754bb5..b87d0f1be94 100644
--- a/tests/packagedcode/data/m2/collections/commons-collections/2.0/commons-collections-2.0.pom.json
+++ b/tests/packagedcode/data/m2/collections/commons-collections/2.0/commons-collections-2.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-collections", 
   "version": "2.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/collections/commons-collections/2.0/commons-collections-2.0.pom.package.json b/tests/packagedcode/data/m2/collections/commons-collections/2.0/commons-collections-2.0.pom.package.json
index e818e472e70..2b8001c444a 100644
--- a/tests/packagedcode/data/m2/collections/commons-collections/2.0/commons-collections-2.0.pom.package.json
+++ b/tests/packagedcode/data/m2/collections/commons-collections/2.0/commons-collections-2.0.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "commons-collections:commons-collections", 
+  "type": "maven", 
+  "namespace": "commons-collections", 
+  "name": "commons-collections", 
   "version": "2.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/collections/commons-collections/2.1/commons-collections-2.1.pom.json b/tests/packagedcode/data/m2/collections/commons-collections/2.1/commons-collections-2.1.pom.json
index 03792a9f277..f25981fdfe5 100644
--- a/tests/packagedcode/data/m2/collections/commons-collections/2.1/commons-collections-2.1.pom.json
+++ b/tests/packagedcode/data/m2/collections/commons-collections/2.1/commons-collections-2.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-collections", 
   "version": "2.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Collections", 
   "description": "Commons Collections", 
diff --git a/tests/packagedcode/data/m2/collections/commons-collections/2.1/commons-collections-2.1.pom.package.json b/tests/packagedcode/data/m2/collections/commons-collections/2.1/commons-collections-2.1.pom.package.json
index ae7ecfe2316..c46ac05d811 100644
--- a/tests/packagedcode/data/m2/collections/commons-collections/2.1/commons-collections-2.1.pom.package.json
+++ b/tests/packagedcode/data/m2/collections/commons-collections/2.1/commons-collections-2.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "commons-collections:commons-collections", 
+  "type": "maven", 
+  "namespace": "commons-collections", 
+  "name": "commons-collections", 
   "version": "2.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Commons Collections", 
+  "description": "Collections\nCommons Collections", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -54,17 +57,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.7"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.7", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/collections/commons-collections/3.1/commons-collections-3.1.pom.json b/tests/packagedcode/data/m2/collections/commons-collections/3.1/commons-collections-3.1.pom.json
index e9a1ef3786f..fe9bee94350 100644
--- a/tests/packagedcode/data/m2/collections/commons-collections/3.1/commons-collections-3.1.pom.json
+++ b/tests/packagedcode/data/m2/collections/commons-collections/3.1/commons-collections-3.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-collections", 
   "version": "3.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": "Types that extend and augment the Java Collections Framework.", 
diff --git a/tests/packagedcode/data/m2/collections/commons-collections/3.1/commons-collections-3.1.pom.package.json b/tests/packagedcode/data/m2/collections/commons-collections/3.1/commons-collections-3.1.pom.package.json
index 3f58eb84949..b1e592ea048 100644
--- a/tests/packagedcode/data/m2/collections/commons-collections/3.1/commons-collections-3.1.pom.package.json
+++ b/tests/packagedcode/data/m2/collections/commons-collections/3.1/commons-collections-3.1.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "commons-collections:commons-collections", 
+  "type": "maven", 
+  "namespace": "commons-collections", 
+  "name": "commons-collections", 
   "version": "3.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Types that extend and augment the Java Collections Framework.", 
@@ -460,17 +463,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/collections/commons-collections/3.2/commons-collections-3.2.pom.json b/tests/packagedcode/data/m2/collections/commons-collections/3.2/commons-collections-3.2.pom.json
index a0c02d5bb40..dc5724c4502 100644
--- a/tests/packagedcode/data/m2/collections/commons-collections/3.2/commons-collections-3.2.pom.json
+++ b/tests/packagedcode/data/m2/collections/commons-collections/3.2/commons-collections-3.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-collections", 
   "version": "3.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Collections", 
   "description": "Types that extend and augment the Java Collections Framework.", 
diff --git a/tests/packagedcode/data/m2/collections/commons-collections/3.2/commons-collections-3.2.pom.package.json b/tests/packagedcode/data/m2/collections/commons-collections/3.2/commons-collections-3.2.pom.package.json
index 7868a21bb30..8d8fe27cec6 100644
--- a/tests/packagedcode/data/m2/collections/commons-collections/3.2/commons-collections-3.2.pom.package.json
+++ b/tests/packagedcode/data/m2/collections/commons-collections/3.2/commons-collections-3.2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "commons-collections:commons-collections", 
+  "type": "maven", 
+  "namespace": "commons-collections", 
+  "name": "commons-collections", 
   "version": "3.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Types that extend and augment the Java Collections Framework.", 
+  "description": "Collections\nTypes that extend and augment the Java Collections Framework.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -684,17 +687,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\n/LICENSE.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\n/LICENSE.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/com/google/collect/com.ss.c.g.common.collect/0.5.0.alpha/com.ss.c.g.common.collect-0.5.0.alpha.pom.json b/tests/packagedcode/data/m2/com/google/collect/com.ss.c.g.common.collect/0.5.0.alpha/com.ss.c.g.common.collect-0.5.0.alpha.pom.json
index ceb8db6cb9d..2ffc3dbfb51 100644
--- a/tests/packagedcode/data/m2/com/google/collect/com.ss.c.g.common.collect/0.5.0.alpha/com.ss.c.g.common.collect-0.5.0.alpha.pom.json
+++ b/tests/packagedcode/data/m2/com/google/collect/com.ss.c.g.common.collect/0.5.0.alpha/com.ss.c.g.common.collect-0.5.0.alpha.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "com.ss.c.g.common.collect", 
   "version": "0.5.0.alpha", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/com/google/collect/com.ss.c.g.common.collect/0.5.0.alpha/com.ss.c.g.common.collect-0.5.0.alpha.pom.package.json b/tests/packagedcode/data/m2/com/google/collect/com.ss.c.g.common.collect/0.5.0.alpha/com.ss.c.g.common.collect-0.5.0.alpha.pom.package.json
index 951b7cb06b8..3829bbb8f1a 100644
--- a/tests/packagedcode/data/m2/com/google/collect/com.ss.c.g.common.collect/0.5.0.alpha/com.ss.c.g.common.collect-0.5.0.alpha.pom.package.json
+++ b/tests/packagedcode/data/m2/com/google/collect/com.ss.c.g.common.collect/0.5.0.alpha/com.ss.c.g.common.collect-0.5.0.alpha.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "com.google.collect:com.ss.c.g.common.collect", 
+  "type": "maven", 
+  "namespace": "com.google.collect", 
+  "name": "com.ss.c.g.common.collect", 
   "version": "0.5.0.alpha", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/com/jcraft/jsch/0.1.23/jsch-0.1.23.pom.json b/tests/packagedcode/data/m2/com/jcraft/jsch/0.1.23/jsch-0.1.23.pom.json
index 60fcafb2bdf..ae26fc73b1d 100644
--- a/tests/packagedcode/data/m2/com/jcraft/jsch/0.1.23/jsch-0.1.23.pom.json
+++ b/tests/packagedcode/data/m2/com/jcraft/jsch/0.1.23/jsch-0.1.23.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "jsch", 
   "version": "0.1.23", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "jsch", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/com/jcraft/jsch/0.1.23/jsch-0.1.23.pom.package.json b/tests/packagedcode/data/m2/com/jcraft/jsch/0.1.23/jsch-0.1.23.pom.package.json
index 2c4112a0bc4..522db3eb44d 100644
--- a/tests/packagedcode/data/m2/com/jcraft/jsch/0.1.23/jsch-0.1.23.pom.package.json
+++ b/tests/packagedcode/data/m2/com/jcraft/jsch/0.1.23/jsch-0.1.23.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "com.jcraft:jsch", 
+  "type": "maven", 
+  "namespace": "com.jcraft", 
+  "name": "jsch", 
   "version": "0.1.23", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "jsch", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,9 +29,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "BSD\nhttp://www.jcraft.com/jsch/LICENSE.txt\nLicense information from http://www.jcraft.com/jsch", 
   "license_expression": null, 
+  "asserted_license": "BSD\nhttp://www.jcraft.com/jsch/LICENSE.txt\nLicense information from http://www.jcraft.com/jsch", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/com/jcraft/jsch/0.1.27/jsch-0.1.27.pom.json b/tests/packagedcode/data/m2/com/jcraft/jsch/0.1.27/jsch-0.1.27.pom.json
index b42e1881d45..167436bf47d 100644
--- a/tests/packagedcode/data/m2/com/jcraft/jsch/0.1.27/jsch-0.1.27.pom.json
+++ b/tests/packagedcode/data/m2/com/jcraft/jsch/0.1.27/jsch-0.1.27.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "jsch", 
   "version": "0.1.27", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "JSch", 
   "description": "JSch is a pure Java implementation of SSH2", 
diff --git a/tests/packagedcode/data/m2/com/jcraft/jsch/0.1.27/jsch-0.1.27.pom.package.json b/tests/packagedcode/data/m2/com/jcraft/jsch/0.1.27/jsch-0.1.27.pom.package.json
index 70a64334c67..01521497131 100644
--- a/tests/packagedcode/data/m2/com/jcraft/jsch/0.1.27/jsch-0.1.27.pom.package.json
+++ b/tests/packagedcode/data/m2/com/jcraft/jsch/0.1.27/jsch-0.1.27.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "com.jcraft:jsch", 
+  "type": "maven", 
+  "namespace": "com.jcraft", 
+  "name": "jsch", 
   "version": "0.1.27", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "JSch is a pure Java implementation of SSH2", 
+  "description": "JSch\nJSch is a pure Java implementation of SSH2", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,17 +29,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "BSD\nhttp://www.jcraft.com/jsch/LICENSE.txt", 
   "license_expression": null, 
+  "asserted_license": "BSD\nhttp://www.jcraft.com/jsch/LICENSE.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.jcraft:jzlib", 
-        "version": "1.0.7"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:com.jcraft/jzlib", 
+      "requirement": "1.0.7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/com/sun/facelets/el-api/1.1.11/el-api-1.1.11.pom.json b/tests/packagedcode/data/m2/com/sun/facelets/el-api/1.1.11/el-api-1.1.11.pom.json
index 54d404f47b0..51f3f3fe864 100644
--- a/tests/packagedcode/data/m2/com/sun/facelets/el-api/1.1.11/el-api-1.1.11.pom.json
+++ b/tests/packagedcode/data/m2/com/sun/facelets/el-api/1.1.11/el-api-1.1.11.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "el-api", 
   "version": "1.1.11", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": "POM was created from deploy:deploy-file", 
diff --git a/tests/packagedcode/data/m2/com/sun/facelets/el-api/1.1.11/el-api-1.1.11.pom.package.json b/tests/packagedcode/data/m2/com/sun/facelets/el-api/1.1.11/el-api-1.1.11.pom.package.json
index d67d5bd8d64..59aa3e3db21 100644
--- a/tests/packagedcode/data/m2/com/sun/facelets/el-api/1.1.11/el-api-1.1.11.pom.package.json
+++ b/tests/packagedcode/data/m2/com/sun/facelets/el-api/1.1.11/el-api-1.1.11.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "com.sun.facelets:el-api", 
+  "type": "maven", 
+  "namespace": "com.sun.facelets", 
+  "name": "el-api", 
   "version": "1.1.11", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "POM was created from deploy:deploy-file", 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/com/sun/facelets/el-ri/1.1.11/el-ri-1.1.11.pom.json b/tests/packagedcode/data/m2/com/sun/facelets/el-ri/1.1.11/el-ri-1.1.11.pom.json
index 903800ea8fc..72ad01c7e0f 100644
--- a/tests/packagedcode/data/m2/com/sun/facelets/el-ri/1.1.11/el-ri-1.1.11.pom.json
+++ b/tests/packagedcode/data/m2/com/sun/facelets/el-ri/1.1.11/el-ri-1.1.11.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "el-ri", 
   "version": "1.1.11", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": "POM was created from deploy:deploy-file", 
diff --git a/tests/packagedcode/data/m2/com/sun/facelets/el-ri/1.1.11/el-ri-1.1.11.pom.package.json b/tests/packagedcode/data/m2/com/sun/facelets/el-ri/1.1.11/el-ri-1.1.11.pom.package.json
index b3945580b5b..885ddd07a12 100644
--- a/tests/packagedcode/data/m2/com/sun/facelets/el-ri/1.1.11/el-ri-1.1.11.pom.package.json
+++ b/tests/packagedcode/data/m2/com/sun/facelets/el-ri/1.1.11/el-ri-1.1.11.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "com.sun.facelets:el-ri", 
+  "type": "maven", 
+  "namespace": "com.sun.facelets", 
+  "name": "el-ri", 
   "version": "1.1.11", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "POM was created from deploy:deploy-file", 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/com/sun/facelets/jsf-facelets/1.1.14/jsf-facelets-1.1.14.pom.json b/tests/packagedcode/data/m2/com/sun/facelets/jsf-facelets/1.1.14/jsf-facelets-1.1.14.pom.json
index 25c471a8bcc..ea71b6dbccd 100644
--- a/tests/packagedcode/data/m2/com/sun/facelets/jsf-facelets/1.1.14/jsf-facelets-1.1.14.pom.json
+++ b/tests/packagedcode/data/m2/com/sun/facelets/jsf-facelets/1.1.14/jsf-facelets-1.1.14.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "jsf-facelets", 
   "version": "1.1.14", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/com/sun/facelets/jsf-facelets/1.1.14/jsf-facelets-1.1.14.pom.package.json b/tests/packagedcode/data/m2/com/sun/facelets/jsf-facelets/1.1.14/jsf-facelets-1.1.14.pom.package.json
index c8075e226c1..e51d7701494 100644
--- a/tests/packagedcode/data/m2/com/sun/facelets/jsf-facelets/1.1.14/jsf-facelets-1.1.14.pom.package.json
+++ b/tests/packagedcode/data/m2/com/sun/facelets/jsf-facelets/1.1.14/jsf-facelets-1.1.14.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "com.sun.facelets:jsf-facelets", 
+  "type": "maven", 
+  "namespace": "com.sun.facelets", 
+  "name": "jsf-facelets", 
   "version": "1.1.14", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/com/thoughtworks/xstream/xstream-parent/1.2.2/xstream-parent-1.2.2.pom.json b/tests/packagedcode/data/m2/com/thoughtworks/xstream/xstream-parent/1.2.2/xstream-parent-1.2.2.pom.json
index 38a9c9cc056..dd3073c2e85 100644
--- a/tests/packagedcode/data/m2/com/thoughtworks/xstream/xstream-parent/1.2.2/xstream-parent-1.2.2.pom.json
+++ b/tests/packagedcode/data/m2/com/thoughtworks/xstream/xstream-parent/1.2.2/xstream-parent-1.2.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "xstream-parent", 
   "version": "1.2.2", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "XStream Parent", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/com/thoughtworks/xstream/xstream-parent/1.2.2/xstream-parent-1.2.2.pom.package.json b/tests/packagedcode/data/m2/com/thoughtworks/xstream/xstream-parent/1.2.2/xstream-parent-1.2.2.pom.package.json
index bd5b25e8252..9af990a3586 100644
--- a/tests/packagedcode/data/m2/com/thoughtworks/xstream/xstream-parent/1.2.2/xstream-parent-1.2.2.pom.package.json
+++ b/tests/packagedcode/data/m2/com/thoughtworks/xstream/xstream-parent/1.2.2/xstream-parent-1.2.2.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "com.thoughtworks.xstream:xstream-parent", 
+  "type": "maven", 
+  "namespace": "com.thoughtworks.xstream", 
+  "name": "xstream-parent", 
   "version": "1.2.2", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "XStream Parent", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,9 +31,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "BSD style\nhttp://xstream.codehaus.com/license.html", 
   "license_expression": null, 
+  "asserted_license": "BSD style\nhttp://xstream.codehaus.com/license.html", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.pom.json b/tests/packagedcode/data/m2/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.pom.json
index a30c7d63101..fa1e348eebe 100644
--- a/tests/packagedcode/data/m2/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.pom.json
+++ b/tests/packagedcode/data/m2/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "xstream", 
   "version": "1.2.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "com.thoughtworks.xstream", 
     "artifact_id": "xstream-parent", 
diff --git a/tests/packagedcode/data/m2/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.pom.package.json b/tests/packagedcode/data/m2/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.pom.package.json
index caf0244ebd9..c3d538ff830 100644
--- a/tests/packagedcode/data/m2/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.pom.package.json
+++ b/tests/packagedcode/data/m2/com/thoughtworks/xstream/xstream/1.2.2/xstream-1.2.2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "com.thoughtworks.xstream:xstream", 
+  "type": "maven", 
+  "namespace": "com.thoughtworks.xstream", 
+  "name": "xstream", 
   "version": "1.2.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "XStream Core", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,89 +21,130 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "dom4j:dom4j", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jdom:jdom", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "joda-time:joda-time", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.megginson.sax:xml-writer", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "stax:stax", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.woodstox:wstx-asl", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "stax:stax-api", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "xom:xom", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "xpp3:xpp3_min", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "cglib:cglib-nodep", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.jettison:jettison", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jmock:jmock", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "oro:oro", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-lang:commons-lang", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:dom4j/dom4j", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jdom/jdom", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:joda-time/joda-time", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.megginson.sax/xml-writer", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:stax/stax", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.woodstox/wstx-asl", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:stax/stax-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:xom/xom", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:xpp3/xpp3_min", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:cglib/cglib-nodep", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.jettison/jettison", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jmock/jmock", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:oro/oro", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-lang/commons-lang", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/digester/commons-digester/1.6/commons-digester-1.6.pom.json b/tests/packagedcode/data/m2/digester/commons-digester/1.6/commons-digester-1.6.pom.json
index 2aaff9e0fe5..27d26653713 100644
--- a/tests/packagedcode/data/m2/digester/commons-digester/1.6/commons-digester-1.6.pom.json
+++ b/tests/packagedcode/data/m2/digester/commons-digester/1.6/commons-digester-1.6.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-digester", 
   "version": "1.6", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/digester/commons-digester/1.6/commons-digester-1.6.pom.package.json b/tests/packagedcode/data/m2/digester/commons-digester/1.6/commons-digester-1.6.pom.package.json
index 496aa479c70..9d90169ef5b 100644
--- a/tests/packagedcode/data/m2/digester/commons-digester/1.6/commons-digester-1.6.pom.package.json
+++ b/tests/packagedcode/data/m2/digester/commons-digester/1.6/commons-digester-1.6.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "commons-digester:commons-digester", 
+  "type": "maven", 
+  "namespace": "commons-digester", 
+  "name": "commons-digester", 
   "version": "1.6", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,39 +21,50 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-beanutils:commons-beanutils", 
-        "version": "1.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-collections:commons-collections", 
-        "version": "2.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "xml-apis:xml-apis", 
-        "version": "1.0.b2"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:commons-beanutils/commons-beanutils", 
+      "requirement": "1.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-collections/commons-collections", 
+      "requirement": "2.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:xml-apis/xml-apis", 
+      "requirement": "1.0.b2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/digester/commons-digester/1.8/commons-digester-1.8.pom.json b/tests/packagedcode/data/m2/digester/commons-digester/1.8/commons-digester-1.8.pom.json
index e9754afe456..dadb21eaa7f 100644
--- a/tests/packagedcode/data/m2/digester/commons-digester/1.8/commons-digester-1.8.pom.json
+++ b/tests/packagedcode/data/m2/digester/commons-digester/1.8/commons-digester-1.8.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-digester", 
   "version": "1.8", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Digester", 
   "description": "The Digester package lets you configure an XML->Java object mapping module\n    which triggers certain actions called rules whenever a particular \n    pattern of nested XML elements is recognized.", 
diff --git a/tests/packagedcode/data/m2/digester/commons-digester/1.8/commons-digester-1.8.pom.package.json b/tests/packagedcode/data/m2/digester/commons-digester/1.8/commons-digester-1.8.pom.package.json
index c3f865583b0..dc37f7d0b2b 100644
--- a/tests/packagedcode/data/m2/digester/commons-digester/1.8/commons-digester-1.8.pom.package.json
+++ b/tests/packagedcode/data/m2/digester/commons-digester/1.8/commons-digester-1.8.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "commons-digester:commons-digester", 
+  "type": "maven", 
+  "namespace": "commons-digester", 
+  "name": "commons-digester", 
   "version": "1.8", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "The Digester package lets you configure an XML->Java object mapping module\n    which triggers certain actions called rules whenever a particular \n    pattern of nested XML elements is recognized.", 
+  "description": "Digester\nThe Digester package lets you configure an XML->Java object mapping module\n    which triggers certain actions called rules whenever a particular \n    pattern of nested XML elements is recognized.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -180,36 +183,42 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\n/LICENSE.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\n/LICENSE.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-beanutils:commons-beanutils", 
-        "version": "1.7.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.1"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "xml-apis:xml-apis", 
-        "version": "1.0.b2"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:commons-beanutils/commons-beanutils", 
+      "requirement": "1.7.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:xml-apis/xml-apis", 
+      "requirement": "1.0.b2", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/dom4j/dom4j/1.6.1/dom4j-1.6.1.pom.json b/tests/packagedcode/data/m2/dom4j/dom4j/1.6.1/dom4j-1.6.1.pom.json
index 5fab6b950e3..2013c6c90bf 100644
--- a/tests/packagedcode/data/m2/dom4j/dom4j/1.6.1/dom4j-1.6.1.pom.json
+++ b/tests/packagedcode/data/m2/dom4j/dom4j/1.6.1/dom4j-1.6.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "dom4j", 
   "version": "1.6.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "dom4j", 
   "description": "dom4j: the flexible XML framework for Java", 
diff --git a/tests/packagedcode/data/m2/dom4j/dom4j/1.6.1/dom4j-1.6.1.pom.package.json b/tests/packagedcode/data/m2/dom4j/dom4j/1.6.1/dom4j-1.6.1.pom.package.json
index 8616a082cda..66ea9d9d7e3 100644
--- a/tests/packagedcode/data/m2/dom4j/dom4j/1.6.1/dom4j-1.6.1.pom.package.json
+++ b/tests/packagedcode/data/m2/dom4j/dom4j/1.6.1/dom4j-1.6.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "dom4j:dom4j", 
+  "type": "maven", 
+  "namespace": "dom4j", 
+  "name": "dom4j", 
   "version": "1.6.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "dom4j: the flexible XML framework for Java", 
+  "description": "dom4j\ndom4j: the flexible XML framework for Java", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -131,74 +134,106 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "jaxme:jaxme-api", 
-        "version": "0.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jaxen:jaxen", 
-        "version": "1.1-beta-6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "msv:xsdlib", 
-        "version": "20030807"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "msv:relaxngDatatype", 
-        "version": "20030807"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "pull-parser:pull-parser", 
-        "version": "2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "xpp3:xpp3", 
-        "version": "1.1.3.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "stax:stax-api", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "xml-apis:xml-apis", 
-        "version": "1.0.b2"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junitperf:junitperf", 
-        "version": "1.8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "stax:stax-ri", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "xerces:xercesImpl", 
-        "version": "2.6.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "xalan:xalan", 
-        "version": "2.5.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:jaxme/jaxme-api", 
+      "requirement": "0.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jaxen/jaxen", 
+      "requirement": "1.1-beta-6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:msv/xsdlib", 
+      "requirement": "20030807", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:msv/relaxngDatatype", 
+      "requirement": "20030807", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:pull-parser/pull-parser", 
+      "requirement": "2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:xpp3/xpp3", 
+      "requirement": "1.1.3.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:stax/stax-api", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:xml-apis/xml-apis", 
+      "requirement": "1.0.b2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junitperf/junitperf", 
+      "requirement": "1.8", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:stax/stax-ri", 
+      "requirement": "1.0", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:xerces/xercesImpl", 
+      "requirement": "2.6.2", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:xalan/xalan", 
+      "requirement": "2.5.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/doxia/doxia-core/1.0-alpha-4/doxia-core-1.0-alpha-4.pom.json b/tests/packagedcode/data/m2/doxia/doxia-core/1.0-alpha-4/doxia-core-1.0-alpha-4.pom.json
index ea21213bbcc..59820d9f543 100644
--- a/tests/packagedcode/data/m2/doxia/doxia-core/1.0-alpha-4/doxia-core-1.0-alpha-4.pom.json
+++ b/tests/packagedcode/data/m2/doxia/doxia-core/1.0-alpha-4/doxia-core-1.0-alpha-4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "doxia-core", 
   "version": "1.0-alpha-4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Doxia Core", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/doxia/doxia-core/1.0-alpha-4/doxia-core-1.0-alpha-4.pom.package.json b/tests/packagedcode/data/m2/doxia/doxia-core/1.0-alpha-4/doxia-core-1.0-alpha-4.pom.package.json
index 18cfd64cc9d..6e9170a31eb 100644
--- a/tests/packagedcode/data/m2/doxia/doxia-core/1.0-alpha-4/doxia-core-1.0-alpha-4.pom.package.json
+++ b/tests/packagedcode/data/m2/doxia/doxia-core/1.0-alpha-4/doxia-core-1.0-alpha-4.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "doxia:doxia-core", 
+  "type": "maven", 
+  "namespace": "doxia", 
+  "name": "doxia-core", 
   "version": "1.0-alpha-4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Doxia Core", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -33,34 +36,42 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "oro:oro", 
-        "version": "2.0.7"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "plexus:plexus-utils", 
-        "version": "1.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "doxia:doxia-sink-api", 
-        "version": "1.0-alpha-4"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "plexus:plexus-container-default", 
-        "version": "1.0-alpha-6"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:oro/oro", 
+      "requirement": "2.0.7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:plexus/plexus-utils", 
+      "requirement": "1.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:doxia/doxia-sink-api", 
+      "requirement": "1.0-alpha-4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-6", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom.json b/tests/packagedcode/data/m2/doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom.json
index 9dbdc94d3fa..61bf2403596 100644
--- a/tests/packagedcode/data/m2/doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom.json
+++ b/tests/packagedcode/data/m2/doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "doxia-sink-api", 
   "version": "1.0-alpha-4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Doxia Core", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom.package.json b/tests/packagedcode/data/m2/doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom.package.json
index 0f886befac1..47c603880e7 100644
--- a/tests/packagedcode/data/m2/doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom.package.json
+++ b/tests/packagedcode/data/m2/doxia/doxia-sink-api/1.0-alpha-4/doxia-sink-api-1.0-alpha-4.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "doxia:doxia-sink-api", 
+  "type": "maven", 
+  "namespace": "doxia", 
+  "name": "doxia-sink-api", 
   "version": "1.0-alpha-4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Doxia Core", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/el/commons-el/1.0/commons-el-1.0.pom.json b/tests/packagedcode/data/m2/el/commons-el/1.0/commons-el-1.0.pom.json
index 12fca6e7126..295da78b7f2 100644
--- a/tests/packagedcode/data/m2/el/commons-el/1.0/commons-el-1.0.pom.json
+++ b/tests/packagedcode/data/m2/el/commons-el/1.0/commons-el-1.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-el", 
   "version": "1.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "EL", 
   "description": "JSP 2.0 Expression Language Interpreter Implementation", 
diff --git a/tests/packagedcode/data/m2/el/commons-el/1.0/commons-el-1.0.pom.package.json b/tests/packagedcode/data/m2/el/commons-el/1.0/commons-el-1.0.pom.package.json
index 50752bf8ade..8fcd566189a 100644
--- a/tests/packagedcode/data/m2/el/commons-el/1.0/commons-el-1.0.pom.package.json
+++ b/tests/packagedcode/data/m2/el/commons-el/1.0/commons-el-1.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "commons-el:commons-el", 
+  "type": "maven", 
+  "namespace": "commons-el", 
+  "name": "commons-el", 
   "version": "1.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "JSP 2.0 Expression Language Interpreter Implementation", 
+  "description": "EL\nJSP 2.0 Expression Language Interpreter Implementation", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -61,29 +64,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\n/LICENSE.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\n/LICENSE.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.0.3"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "servletapi:servletapi", 
-        "version": "2.4-20040521"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jspapi:jsp-api", 
-        "version": "2.0-20040521"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:servletapi/servletapi", 
+      "requirement": "2.4-20040521", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jspapi/jsp-api", 
+      "requirement": "2.0-20040521", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.0.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/fileupload/commons-fileupload/1.0/commons-fileupload-1.0.pom.json b/tests/packagedcode/data/m2/fileupload/commons-fileupload/1.0/commons-fileupload-1.0.pom.json
index 4c8dd393adc..d3c52164aaf 100644
--- a/tests/packagedcode/data/m2/fileupload/commons-fileupload/1.0/commons-fileupload-1.0.pom.json
+++ b/tests/packagedcode/data/m2/fileupload/commons-fileupload/1.0/commons-fileupload-1.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-fileupload", 
   "version": "1.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "FileUpload", 
   "description": "The FileUpload component provides a simple yet flexible means of adding\n    support for multipart file upload functionality to servlets and web\n    applications.", 
diff --git a/tests/packagedcode/data/m2/fileupload/commons-fileupload/1.0/commons-fileupload-1.0.pom.package.json b/tests/packagedcode/data/m2/fileupload/commons-fileupload/1.0/commons-fileupload-1.0.pom.package.json
index 9873ee18a50..8433eb9541a 100644
--- a/tests/packagedcode/data/m2/fileupload/commons-fileupload/1.0/commons-fileupload-1.0.pom.package.json
+++ b/tests/packagedcode/data/m2/fileupload/commons-fileupload/1.0/commons-fileupload-1.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "commons-fileupload:commons-fileupload", 
+  "type": "maven", 
+  "namespace": "commons-fileupload", 
+  "name": "commons-fileupload", 
   "version": "1.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "The FileUpload component provides a simple yet flexible means of adding\n    support for multipart file upload functionality to servlets and web\n    applications.", 
+  "description": "FileUpload\nThe FileUpload component provides a simple yet flexible means of adding\n    support for multipart file upload functionality to servlets and web\n    applications.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -68,24 +71,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "servletapi:servletapi", 
-        "version": "2.3"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:servletapi/servletapi", 
+      "requirement": "2.3", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.pom.json b/tests/packagedcode/data/m2/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.pom.json
index ae2d57f3a14..091a6ed9c6e 100644
--- a/tests/packagedcode/data/m2/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.pom.json
+++ b/tests/packagedcode/data/m2/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "hsqldb", 
   "version": "1.8.0.7", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "HSQLDB", 
   "description": "Lightweight 100% Java SQL Database Engine", 
diff --git a/tests/packagedcode/data/m2/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.pom.package.json b/tests/packagedcode/data/m2/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.pom.package.json
index dae9ff60fad..d233be0b83d 100644
--- a/tests/packagedcode/data/m2/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.pom.package.json
+++ b/tests/packagedcode/data/m2/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "hsqldb:hsqldb", 
+  "type": "maven", 
+  "namespace": "hsqldb", 
+  "name": "hsqldb", 
   "version": "1.8.0.7", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Lightweight 100% Java SQL Database Engine", 
+  "description": "HSQLDB\nLightweight 100% Java SQL Database Engine", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "HSQLDB License\nhttp://hsqldb.org/web/hsqlLicense.html", 
   "license_expression": null, 
+  "asserted_license": "HSQLDB License\nhttp://hsqldb.org/web/hsqlLicense.html", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/httpunit/httpunit/1.6.2/httpunit-1.6.2.pom.json b/tests/packagedcode/data/m2/httpunit/httpunit/1.6.2/httpunit-1.6.2.pom.json
index 5101af982bc..2594fa8ea35 100644
--- a/tests/packagedcode/data/m2/httpunit/httpunit/1.6.2/httpunit-1.6.2.pom.json
+++ b/tests/packagedcode/data/m2/httpunit/httpunit/1.6.2/httpunit-1.6.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "httpunit", 
   "version": "1.6.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "HttpUnit", 
   "description": "A Java library for the automatic stimulation and testing of web applications.", 
diff --git a/tests/packagedcode/data/m2/httpunit/httpunit/1.6.2/httpunit-1.6.2.pom.package.json b/tests/packagedcode/data/m2/httpunit/httpunit/1.6.2/httpunit-1.6.2.pom.package.json
index 8d171e0c206..c1928a52858 100644
--- a/tests/packagedcode/data/m2/httpunit/httpunit/1.6.2/httpunit-1.6.2.pom.package.json
+++ b/tests/packagedcode/data/m2/httpunit/httpunit/1.6.2/httpunit-1.6.2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "httpunit:httpunit", 
+  "type": "maven", 
+  "namespace": "httpunit", 
+  "name": "httpunit", 
   "version": "1.6.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "A Java library for the automatic stimulation and testing of web applications.", 
+  "description": "HttpUnit\nA Java library for the automatic stimulation and testing of web applications.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,54 +21,74 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "MIT License\nhttp://httpunit.sourceforge.net/doc/license.html", 
   "license_expression": null, 
+  "asserted_license": "MIT License\nhttp://httpunit.sourceforge.net/doc/license.html", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "xerces:xmlParserAPIs", 
-        "version": "2.2.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "xerces:xercesImpl", 
-        "version": "2.6.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "nekohtml:nekohtml", 
-        "version": "0.9.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "rhino:js", 
-        "version": "1.5R4.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:servlet-api", 
-        "version": "2.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jtidy:jtidy", 
-        "version": "4aug2000r7-dev"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.mail:mail", 
-        "version": "1.4"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:xerces/xmlParserAPIs", 
+      "requirement": "2.2.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:xerces/xercesImpl", 
+      "requirement": "2.6.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:nekohtml/nekohtml", 
+      "requirement": "0.9.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:rhino/js", 
+      "requirement": "1.5R4.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/servlet-api", 
+      "requirement": "2.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jtidy/jtidy", 
+      "requirement": "4aug2000r7-dev", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.mail/mail", 
+      "requirement": "1.4", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/io/commons-io/1.3.1/commons-io-1.3.1.pom.json b/tests/packagedcode/data/m2/io/commons-io/1.3.1/commons-io-1.3.1.pom.json
index 0bc9b62752c..3a6acbc4f2c 100644
--- a/tests/packagedcode/data/m2/io/commons-io/1.3.1/commons-io-1.3.1.pom.json
+++ b/tests/packagedcode/data/m2/io/commons-io/1.3.1/commons-io-1.3.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-io", 
   "version": "1.3.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "IO", 
   "description": "Commons-IO contains utility classes, stream implementations, file filters, and endian classes.", 
diff --git a/tests/packagedcode/data/m2/io/commons-io/1.3.1/commons-io-1.3.1.pom.package.json b/tests/packagedcode/data/m2/io/commons-io/1.3.1/commons-io-1.3.1.pom.package.json
index ca06c4b8c5b..38cc6c3c2e2 100644
--- a/tests/packagedcode/data/m2/io/commons-io/1.3.1/commons-io-1.3.1.pom.package.json
+++ b/tests/packagedcode/data/m2/io/commons-io/1.3.1/commons-io-1.3.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "commons-io:commons-io", 
+  "type": "maven", 
+  "namespace": "commons-io", 
+  "name": "commons-io", 
   "version": "1.3.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Commons-IO contains utility classes, stream implementations, file filters, and endian classes.", 
+  "description": "IO\nCommons-IO contains utility classes, stream implementations, file filters, and endian classes.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -215,17 +218,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\n/LICENSE.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\n/LICENSE.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/javassist/javassist/3.4.GA/javassist-3.4.GA.pom.json b/tests/packagedcode/data/m2/javassist/javassist/3.4.GA/javassist-3.4.GA.pom.json
index 58aeba85920..13765030e34 100644
--- a/tests/packagedcode/data/m2/javassist/javassist/3.4.GA/javassist-3.4.GA.pom.json
+++ b/tests/packagedcode/data/m2/javassist/javassist/3.4.GA/javassist-3.4.GA.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "javassist", 
   "version": "3.4.GA", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Javassist", 
   "description": "Simple Java bytecode manipulation", 
diff --git a/tests/packagedcode/data/m2/javassist/javassist/3.4.GA/javassist-3.4.GA.pom.package.json b/tests/packagedcode/data/m2/javassist/javassist/3.4.GA/javassist-3.4.GA.pom.package.json
index 2144d9d5b68..006eeac85ea 100644
--- a/tests/packagedcode/data/m2/javassist/javassist/3.4.GA/javassist-3.4.GA.pom.package.json
+++ b/tests/packagedcode/data/m2/javassist/javassist/3.4.GA/javassist-3.4.GA.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "javassist:javassist", 
+  "type": "maven", 
+  "namespace": "javassist", 
+  "name": "javassist", 
   "version": "3.4.GA", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Simple Java bytecode manipulation", 
+  "description": "Javassist\nSimple Java bytecode manipulation", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "lgpl\nhttp://repository.jboss.com/licenses/lgpl.txt", 
   "license_expression": null, 
+  "asserted_license": "lgpl\nhttp://repository.jboss.com/licenses/lgpl.txt", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/javax/persistence/persistence-api/1.0.2/persistence-api-1.0.2.pom.json b/tests/packagedcode/data/m2/javax/persistence/persistence-api/1.0.2/persistence-api-1.0.2.pom.json
index d25fa1a6a53..d1bd9518109 100644
--- a/tests/packagedcode/data/m2/javax/persistence/persistence-api/1.0.2/persistence-api-1.0.2.pom.json
+++ b/tests/packagedcode/data/m2/javax/persistence/persistence-api/1.0.2/persistence-api-1.0.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "persistence-api", 
   "version": "1.0.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/javax/persistence/persistence-api/1.0.2/persistence-api-1.0.2.pom.package.json b/tests/packagedcode/data/m2/javax/persistence/persistence-api/1.0.2/persistence-api-1.0.2.pom.package.json
index d842cc5a65d..570b7346c22 100644
--- a/tests/packagedcode/data/m2/javax/persistence/persistence-api/1.0.2/persistence-api-1.0.2.pom.package.json
+++ b/tests/packagedcode/data/m2/javax/persistence/persistence-api/1.0.2/persistence-api-1.0.2.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "javax.persistence:persistence-api", 
+  "type": "maven", 
+  "namespace": "javax.persistence", 
+  "name": "persistence-api", 
   "version": "1.0.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/javax/persistence/persistence-api/1.0/persistence-api-1.0.pom.json b/tests/packagedcode/data/m2/javax/persistence/persistence-api/1.0/persistence-api-1.0.pom.json
index 5f085f46269..d12c46bca72 100644
--- a/tests/packagedcode/data/m2/javax/persistence/persistence-api/1.0/persistence-api-1.0.pom.json
+++ b/tests/packagedcode/data/m2/javax/persistence/persistence-api/1.0/persistence-api-1.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "persistence-api", 
   "version": "1.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Enterprise JavaBeans (EJB) 3.0", 
   "description": "The Enterprise JavaBeans architecture is a component architecture for the development and deployment of component-based business applications.\n    The purpose of Enterprise JavaBeans (EJB) 3.0 is to improve the EJB architecture by reducing its complexity from the developer's point of view.", 
diff --git a/tests/packagedcode/data/m2/javax/persistence/persistence-api/1.0/persistence-api-1.0.pom.package.json b/tests/packagedcode/data/m2/javax/persistence/persistence-api/1.0/persistence-api-1.0.pom.package.json
index 9d42db793be..50824391fc9 100644
--- a/tests/packagedcode/data/m2/javax/persistence/persistence-api/1.0/persistence-api-1.0.pom.package.json
+++ b/tests/packagedcode/data/m2/javax/persistence/persistence-api/1.0/persistence-api-1.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "javax.persistence:persistence-api", 
+  "type": "maven", 
+  "namespace": "javax.persistence", 
+  "name": "persistence-api", 
   "version": "1.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "The Enterprise JavaBeans architecture is a component architecture for the development and deployment of component-based business applications.\n    The purpose of Enterprise JavaBeans (EJB) 3.0 is to improve the EJB architecture by reducing its complexity from the developer's point of view.", 
+  "description": "Enterprise JavaBeans (EJB) 3.0\nThe Enterprise JavaBeans architecture is a component architecture for the development and deployment of component-based business applications.\n    The purpose of Enterprise JavaBeans (EJB) 3.0 is to improve the EJB architecture by reducing its complexity from the developer's point of view.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "Common Development and Distribution License (CDDL) v1.0\nhttp://www.sun.com/cddl/cddl.html", 
   "license_expression": null, 
+  "asserted_license": "Common Development and Distribution License (CDDL) v1.0\nhttp://www.sun.com/cddl/cddl.html", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/javax/servlet/jstl/1.1.0/jstl-1.1.0.pom.json b/tests/packagedcode/data/m2/javax/servlet/jstl/1.1.0/jstl-1.1.0.pom.json
index 2c193f77149..08aab68a0df 100644
--- a/tests/packagedcode/data/m2/javax/servlet/jstl/1.1.0/jstl-1.1.0.pom.json
+++ b/tests/packagedcode/data/m2/javax/servlet/jstl/1.1.0/jstl-1.1.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "jstl", 
   "version": "1.1.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/javax/servlet/jstl/1.1.0/jstl-1.1.0.pom.package.json b/tests/packagedcode/data/m2/javax/servlet/jstl/1.1.0/jstl-1.1.0.pom.package.json
index b05cc2e1514..c16904f27f2 100644
--- a/tests/packagedcode/data/m2/javax/servlet/jstl/1.1.0/jstl-1.1.0.pom.package.json
+++ b/tests/packagedcode/data/m2/javax/servlet/jstl/1.1.0/jstl-1.1.0.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "javax.servlet:jstl", 
+  "type": "maven", 
+  "namespace": "javax.servlet", 
+  "name": "jstl", 
   "version": "1.1.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:jsp-api", 
-        "version": "2.0"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:javax.servlet/jsp-api", 
+      "requirement": "2.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/javax/servlet/servlet-api/2.4/servlet-api-2.4.pom.json b/tests/packagedcode/data/m2/javax/servlet/servlet-api/2.4/servlet-api-2.4.pom.json
index d2d9c13da68..8a42f453108 100644
--- a/tests/packagedcode/data/m2/javax/servlet/servlet-api/2.4/servlet-api-2.4.pom.json
+++ b/tests/packagedcode/data/m2/javax/servlet/servlet-api/2.4/servlet-api-2.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "servlet-api", 
   "version": "2.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/javax/servlet/servlet-api/2.4/servlet-api-2.4.pom.package.json b/tests/packagedcode/data/m2/javax/servlet/servlet-api/2.4/servlet-api-2.4.pom.package.json
index 2f73e8156d5..b850f935477 100644
--- a/tests/packagedcode/data/m2/javax/servlet/servlet-api/2.4/servlet-api-2.4.pom.package.json
+++ b/tests/packagedcode/data/m2/javax/servlet/servlet-api/2.4/servlet-api-2.4.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "javax.servlet:servlet-api", 
+  "type": "maven", 
+  "namespace": "javax.servlet", 
+  "name": "servlet-api", 
   "version": "2.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/javax/servlet/servlet-api/2.5/servlet-api-2.5.pom.json b/tests/packagedcode/data/m2/javax/servlet/servlet-api/2.5/servlet-api-2.5.pom.json
index 4c56990fd72..c8427ceb051 100644
--- a/tests/packagedcode/data/m2/javax/servlet/servlet-api/2.5/servlet-api-2.5.pom.json
+++ b/tests/packagedcode/data/m2/javax/servlet/servlet-api/2.5/servlet-api-2.5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "servlet-api", 
   "version": "2.5", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/javax/servlet/servlet-api/2.5/servlet-api-2.5.pom.package.json b/tests/packagedcode/data/m2/javax/servlet/servlet-api/2.5/servlet-api-2.5.pom.package.json
index 32ccf5dd254..eabcefe525a 100644
--- a/tests/packagedcode/data/m2/javax/servlet/servlet-api/2.5/servlet-api-2.5.pom.package.json
+++ b/tests/packagedcode/data/m2/javax/servlet/servlet-api/2.5/servlet-api-2.5.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "javax.servlet:servlet-api", 
+  "type": "maven", 
+  "namespace": "javax.servlet", 
+  "name": "servlet-api", 
   "version": "2.5", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/javax/transaction/jta/1.0.1B/jta-1.0.1B.pom.json b/tests/packagedcode/data/m2/javax/transaction/jta/1.0.1B/jta-1.0.1B.pom.json
index 57e3e8afda5..806ed0674bc 100644
--- a/tests/packagedcode/data/m2/javax/transaction/jta/1.0.1B/jta-1.0.1B.pom.json
+++ b/tests/packagedcode/data/m2/javax/transaction/jta/1.0.1B/jta-1.0.1B.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "jta", 
   "version": "1.0.1B", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/javax/transaction/jta/1.0.1B/jta-1.0.1B.pom.package.json b/tests/packagedcode/data/m2/javax/transaction/jta/1.0.1B/jta-1.0.1B.pom.package.json
index 4bd0db79764..701d2b2a761 100644
--- a/tests/packagedcode/data/m2/javax/transaction/jta/1.0.1B/jta-1.0.1B.pom.package.json
+++ b/tests/packagedcode/data/m2/javax/transaction/jta/1.0.1B/jta-1.0.1B.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "javax.transaction:jta", 
+  "type": "maven", 
+  "namespace": "javax.transaction", 
+  "name": "jta", 
   "version": "1.0.1B", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/jboss/javassist/3.3.ga/javassist-3.3.ga.pom.json b/tests/packagedcode/data/m2/jboss/javassist/3.3.ga/javassist-3.3.ga.pom.json
index 0282f65ac3d..44a4b804d9f 100644
--- a/tests/packagedcode/data/m2/jboss/javassist/3.3.ga/javassist-3.3.ga.pom.json
+++ b/tests/packagedcode/data/m2/jboss/javassist/3.3.ga/javassist-3.3.ga.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "javassist", 
   "version": "3.3.ga", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Javassist", 
   "description": "Javassist (Java programming assistant) is a load-time reflective system for Java.", 
diff --git a/tests/packagedcode/data/m2/jboss/javassist/3.3.ga/javassist-3.3.ga.pom.package.json b/tests/packagedcode/data/m2/jboss/javassist/3.3.ga/javassist-3.3.ga.pom.package.json
index b79adb2b10a..2da08475a6d 100644
--- a/tests/packagedcode/data/m2/jboss/javassist/3.3.ga/javassist-3.3.ga.pom.package.json
+++ b/tests/packagedcode/data/m2/jboss/javassist/3.3.ga/javassist-3.3.ga.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "jboss:javassist", 
+  "type": "maven", 
+  "namespace": "jboss", 
+  "name": "javassist", 
   "version": "3.3.ga", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Javassist (Java programming assistant) is a load-time reflective system for Java.", 
+  "description": "Javassist\nJavassist (Java programming assistant) is a load-time reflective system for Java.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,9 +29,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "MPL 1.1\nhttp://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/jboss/javassist/License.html?rev=HEAD&content-type=text/html\nDual-license; LGPL if downloaded as part of JBoss, MPL if downloaded separately.", 
   "license_expression": null, 
+  "asserted_license": "MPL 1.1\nhttp://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/jboss/javassist/License.html?rev=HEAD&content-type=text/html\nDual-license; LGPL if downloaded as part of JBoss, MPL if downloaded separately.", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/jboss/jboss-archive-browsing/5.0.0alpha-200607201-119/jboss-archive-browsing-5.0.0alpha-200607201-119.pom.json b/tests/packagedcode/data/m2/jboss/jboss-archive-browsing/5.0.0alpha-200607201-119/jboss-archive-browsing-5.0.0alpha-200607201-119.pom.json
index 84c63e2d6ed..4b01be13edf 100644
--- a/tests/packagedcode/data/m2/jboss/jboss-archive-browsing/5.0.0alpha-200607201-119/jboss-archive-browsing-5.0.0alpha-200607201-119.pom.json
+++ b/tests/packagedcode/data/m2/jboss/jboss-archive-browsing/5.0.0alpha-200607201-119/jboss-archive-browsing-5.0.0alpha-200607201-119.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "jboss-archive-browsing", 
   "version": "5.0.0alpha-200607201-119", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/jboss/jboss-archive-browsing/5.0.0alpha-200607201-119/jboss-archive-browsing-5.0.0alpha-200607201-119.pom.package.json b/tests/packagedcode/data/m2/jboss/jboss-archive-browsing/5.0.0alpha-200607201-119/jboss-archive-browsing-5.0.0alpha-200607201-119.pom.package.json
index c1f8dc8bb5f..ef729a1645a 100644
--- a/tests/packagedcode/data/m2/jboss/jboss-archive-browsing/5.0.0alpha-200607201-119/jboss-archive-browsing-5.0.0alpha-200607201-119.pom.package.json
+++ b/tests/packagedcode/data/m2/jboss/jboss-archive-browsing/5.0.0alpha-200607201-119/jboss-archive-browsing-5.0.0alpha-200607201-119.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "jboss:jboss-archive-browsing", 
+  "type": "maven", 
+  "namespace": "jboss", 
+  "name": "jboss-archive-browsing", 
   "version": "5.0.0alpha-200607201-119", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "GNU LESSER GENERAL PUBLIC LICENSE\nhttp://www.gnu.org/licenses/lgpl.txt", 
   "license_expression": null, 
+  "asserted_license": "GNU LESSER GENERAL PUBLIC LICENSE\nhttp://www.gnu.org/licenses/lgpl.txt", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/jetty/org.mortbay.jetty/5.1.10/org.mortbay.jetty-5.1.10.pom.json b/tests/packagedcode/data/m2/jetty/org.mortbay.jetty/5.1.10/org.mortbay.jetty-5.1.10.pom.json
index 749ece7dffb..06a37ee7958 100644
--- a/tests/packagedcode/data/m2/jetty/org.mortbay.jetty/5.1.10/org.mortbay.jetty-5.1.10.pom.json
+++ b/tests/packagedcode/data/m2/jetty/org.mortbay.jetty/5.1.10/org.mortbay.jetty-5.1.10.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "org.mortbay.jetty", 
   "version": "5.1.10", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/jetty/org.mortbay.jetty/5.1.10/org.mortbay.jetty-5.1.10.pom.package.json b/tests/packagedcode/data/m2/jetty/org.mortbay.jetty/5.1.10/org.mortbay.jetty-5.1.10.pom.package.json
index 167ac748d42..73086a50180 100644
--- a/tests/packagedcode/data/m2/jetty/org.mortbay.jetty/5.1.10/org.mortbay.jetty-5.1.10.pom.package.json
+++ b/tests/packagedcode/data/m2/jetty/org.mortbay.jetty/5.1.10/org.mortbay.jetty-5.1.10.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "jetty:org.mortbay.jetty", 
+  "type": "maven", 
+  "namespace": "jetty", 
+  "name": "org.mortbay.jetty", 
   "version": "5.1.10", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.pom.json b/tests/packagedcode/data/m2/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.pom.json
index 3b60af9bbf5..47e435ab88a 100644
--- a/tests/packagedcode/data/m2/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.pom.json
+++ b/tests/packagedcode/data/m2/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "jtidy", 
   "version": "4aug2000r7-dev", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "JTidy", 
   "description": "JTidy is a Java port of HTML Tidy, a HTML syntax checker and pretty printer. Like its non-Java cousin, JTidy can be used as a tool for cleaning up malformed and faulty HTML. In addition, JTidy provides a DOM parser for real-world HTML.", 
diff --git a/tests/packagedcode/data/m2/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.pom.package.json b/tests/packagedcode/data/m2/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.pom.package.json
index 1d1142dca62..73373b2c4f6 100644
--- a/tests/packagedcode/data/m2/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.pom.package.json
+++ b/tests/packagedcode/data/m2/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "jtidy:jtidy", 
+  "type": "maven", 
+  "namespace": "jtidy", 
+  "name": "jtidy", 
   "version": "4aug2000r7-dev", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "JTidy is a Java port of HTML Tidy, a HTML syntax checker and pretty printer. Like its non-Java cousin, JTidy can be used as a tool for cleaning up malformed and faulty HTML. In addition, JTidy provides a DOM parser for real-world HTML.", 
+  "description": "JTidy\nJTidy is a Java port of HTML Tidy, a HTML syntax checker and pretty printer. Like its non-Java cousin, JTidy can be used as a tool for cleaning up malformed and faulty HTML. In addition, JTidy provides a DOM parser for real-world HTML.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,9 +29,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "Java HTML Tidy License\nhttp://svn.sourceforge.net/viewvc/*checkout*/jtidy/trunk/jtidy/LICENSE.txt?revision=95", 
   "license_expression": null, 
+  "asserted_license": "Java HTML Tidy License\nhttp://svn.sourceforge.net/viewvc/*checkout*/jtidy/trunk/jtidy/LICENSE.txt?revision=95", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/junit/junit/3.8.1/junit-3.8.1.pom.json b/tests/packagedcode/data/m2/junit/junit/3.8.1/junit-3.8.1.pom.json
index b2b689f0a1e..6ea1323f554 100644
--- a/tests/packagedcode/data/m2/junit/junit/3.8.1/junit-3.8.1.pom.json
+++ b/tests/packagedcode/data/m2/junit/junit/3.8.1/junit-3.8.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "junit", 
   "version": "3.8.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "JUnit", 
   "description": "JUnit is a regression testing framework written by Erich Gamma and Kent Beck. It is used by the developer who implements unit tests in Java.", 
diff --git a/tests/packagedcode/data/m2/junit/junit/3.8.1/junit-3.8.1.pom.package.json b/tests/packagedcode/data/m2/junit/junit/3.8.1/junit-3.8.1.pom.package.json
index b3a9ae9953e..6bc712c32ab 100644
--- a/tests/packagedcode/data/m2/junit/junit/3.8.1/junit-3.8.1.pom.package.json
+++ b/tests/packagedcode/data/m2/junit/junit/3.8.1/junit-3.8.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "junit:junit", 
+  "type": "maven", 
+  "namespace": "junit", 
+  "name": "junit", 
   "version": "3.8.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "JUnit is a regression testing framework written by Erich Gamma and Kent Beck. It is used by the developer who implements unit tests in Java.", 
+  "description": "JUnit\nJUnit is a regression testing framework written by Erich Gamma and Kent Beck. It is used by the developer who implements unit tests in Java.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,9 +29,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "Common Public License Version 1.0\nhttp://www.opensource.org/licenses/cpl1.0.txt", 
   "license_expression": null, 
+  "asserted_license": "Common Public License Version 1.0\nhttp://www.opensource.org/licenses/cpl1.0.txt", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/junit/junit/3.8.2/junit-3.8.2.pom.json b/tests/packagedcode/data/m2/junit/junit/3.8.2/junit-3.8.2.pom.json
index c6211ed7777..b226e7fe4d5 100644
--- a/tests/packagedcode/data/m2/junit/junit/3.8.2/junit-3.8.2.pom.json
+++ b/tests/packagedcode/data/m2/junit/junit/3.8.2/junit-3.8.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "junit", 
   "version": "3.8.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "JUnit", 
   "description": "JUnit is a regression testing framework written by Erich Gamma and Kent Beck. It is used by the developer who implements unit tests in Java.", 
diff --git a/tests/packagedcode/data/m2/junit/junit/3.8.2/junit-3.8.2.pom.package.json b/tests/packagedcode/data/m2/junit/junit/3.8.2/junit-3.8.2.pom.package.json
index 2b7d2dc967e..8c34c9c472d 100644
--- a/tests/packagedcode/data/m2/junit/junit/3.8.2/junit-3.8.2.pom.package.json
+++ b/tests/packagedcode/data/m2/junit/junit/3.8.2/junit-3.8.2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "junit:junit", 
+  "type": "maven", 
+  "namespace": "junit", 
+  "name": "junit", 
   "version": "3.8.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "JUnit is a regression testing framework written by Erich Gamma and Kent Beck. It is used by the developer who implements unit tests in Java.", 
+  "description": "JUnit\nJUnit is a regression testing framework written by Erich Gamma and Kent Beck. It is used by the developer who implements unit tests in Java.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,9 +29,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "Common Public License Version 1.0\nhttp://www.opensource.org/licenses/cpl1.0.txt", 
   "license_expression": null, 
+  "asserted_license": "Common Public License Version 1.0\nhttp://www.opensource.org/licenses/cpl1.0.txt", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/junit/junit/4.4/junit-4.4.pom.json b/tests/packagedcode/data/m2/junit/junit/4.4/junit-4.4.pom.json
index cd24fab4ea9..b83e1bad53e 100644
--- a/tests/packagedcode/data/m2/junit/junit/4.4/junit-4.4.pom.json
+++ b/tests/packagedcode/data/m2/junit/junit/4.4/junit-4.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "junit", 
   "version": "4.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "JUnit", 
   "description": "JUnit is a regression testing framework written by Erich Gamma and Kent Beck. It is used by the developer who implements unit tests in Java.", 
diff --git a/tests/packagedcode/data/m2/junit/junit/4.4/junit-4.4.pom.package.json b/tests/packagedcode/data/m2/junit/junit/4.4/junit-4.4.pom.package.json
index 772f6ea795e..d6f4dc8e855 100644
--- a/tests/packagedcode/data/m2/junit/junit/4.4/junit-4.4.pom.package.json
+++ b/tests/packagedcode/data/m2/junit/junit/4.4/junit-4.4.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "junit:junit", 
+  "type": "maven", 
+  "namespace": "junit", 
+  "name": "junit", 
   "version": "4.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "JUnit is a regression testing framework written by Erich Gamma and Kent Beck. It is used by the developer who implements unit tests in Java.", 
+  "description": "JUnit\nJUnit is a regression testing framework written by Erich Gamma and Kent Beck. It is used by the developer who implements unit tests in Java.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,9 +29,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "Common Public License Version 1.0\nhttp://www.opensource.org/licenses/cpl1.0.txt", 
   "license_expression": null, 
+  "asserted_license": "Common Public License Version 1.0\nhttp://www.opensource.org/licenses/cpl1.0.txt", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/lang/commons-lang/2.1/commons-lang-2.1.pom.json b/tests/packagedcode/data/m2/lang/commons-lang/2.1/commons-lang-2.1.pom.json
index 8fa88ddbcde..41198f221c8 100644
--- a/tests/packagedcode/data/m2/lang/commons-lang/2.1/commons-lang-2.1.pom.json
+++ b/tests/packagedcode/data/m2/lang/commons-lang/2.1/commons-lang-2.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-lang", 
   "version": "2.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Lang", 
   "description": "Commons.Lang, a package of Java utility classes for the\n    classes that are in java.lang's hierarchy, or are considered to be so\n    standard as to justify existence in java.lang.", 
diff --git a/tests/packagedcode/data/m2/lang/commons-lang/2.1/commons-lang-2.1.pom.package.json b/tests/packagedcode/data/m2/lang/commons-lang/2.1/commons-lang-2.1.pom.package.json
index ce1516fc6e3..249b9a8fb1c 100644
--- a/tests/packagedcode/data/m2/lang/commons-lang/2.1/commons-lang-2.1.pom.package.json
+++ b/tests/packagedcode/data/m2/lang/commons-lang/2.1/commons-lang-2.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "commons-lang:commons-lang", 
+  "type": "maven", 
+  "namespace": "commons-lang", 
+  "name": "commons-lang", 
   "version": "2.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Commons.Lang, a package of Java utility classes for the\n    classes that are in java.lang's hierarchy, or are considered to be so\n    standard as to justify existence in java.lang.", 
+  "description": "Lang\nCommons.Lang, a package of Java utility classes for the\n    classes that are in java.lang's hierarchy, or are considered to be so\n    standard as to justify existence in java.lang.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -523,17 +526,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\n/LICENSE.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\n/LICENSE.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/lang/commons-lang/2.3/commons-lang-2.3.pom.json b/tests/packagedcode/data/m2/lang/commons-lang/2.3/commons-lang-2.3.pom.json
index 1938333e731..513e3574ff1 100644
--- a/tests/packagedcode/data/m2/lang/commons-lang/2.3/commons-lang-2.3.pom.json
+++ b/tests/packagedcode/data/m2/lang/commons-lang/2.3/commons-lang-2.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-lang", 
   "version": "2.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Lang", 
   "description": "Commons.Lang, a package of Java utility classes for the\n        classes that are in java.lang's hierarchy, or are considered to be so\n        standard as to justify existence in java.lang.", 
diff --git a/tests/packagedcode/data/m2/lang/commons-lang/2.3/commons-lang-2.3.pom.package.json b/tests/packagedcode/data/m2/lang/commons-lang/2.3/commons-lang-2.3.pom.package.json
index dae1f4dbfa4..4cbf7fe10f7 100644
--- a/tests/packagedcode/data/m2/lang/commons-lang/2.3/commons-lang-2.3.pom.package.json
+++ b/tests/packagedcode/data/m2/lang/commons-lang/2.3/commons-lang-2.3.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "commons-lang:commons-lang", 
+  "type": "maven", 
+  "namespace": "commons-lang", 
+  "name": "commons-lang", 
   "version": "2.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Commons.Lang, a package of Java utility classes for the\n        classes that are in java.lang's hierarchy, or are considered to be so\n        standard as to justify existence in java.lang.", 
+  "description": "Lang\nCommons.Lang, a package of Java utility classes for the\n        classes that are in java.lang's hierarchy, or are considered to be so\n        standard as to justify existence in java.lang.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -600,17 +603,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\n/LICENSE.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\n/LICENSE.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/lang/commons-lang/2.4/commons-lang-2.4.pom.json b/tests/packagedcode/data/m2/lang/commons-lang/2.4/commons-lang-2.4.pom.json
index 9b28349674a..b9e1e58a581 100644
--- a/tests/packagedcode/data/m2/lang/commons-lang/2.4/commons-lang-2.4.pom.json
+++ b/tests/packagedcode/data/m2/lang/commons-lang/2.4/commons-lang-2.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-lang", 
   "version": "2.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.commons", 
     "artifact_id": "commons-parent", 
diff --git a/tests/packagedcode/data/m2/lang/commons-lang/2.4/commons-lang-2.4.pom.package.json b/tests/packagedcode/data/m2/lang/commons-lang/2.4/commons-lang-2.4.pom.package.json
index ca726d0ad62..f89c539aa61 100644
--- a/tests/packagedcode/data/m2/lang/commons-lang/2.4/commons-lang-2.4.pom.package.json
+++ b/tests/packagedcode/data/m2/lang/commons-lang/2.4/commons-lang-2.4.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "commons-lang:commons-lang", 
+  "type": "maven", 
+  "namespace": "commons-lang", 
+  "name": "commons-lang", 
   "version": "2.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Commons Lang, a package of Java utility classes for the\n        classes that are in java.lang's hierarchy, or are considered to be so\n        standard as to justify existence in java.lang.", 
+  "description": "Commons Lang\nCommons Lang, a package of Java utility classes for the\n        classes that are in java.lang's hierarchy, or are considered to be so\n        standard as to justify existence in java.lang.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -607,17 +610,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/log4j/log4j/1.2.15/log4j-1.2.15.pom.json b/tests/packagedcode/data/m2/log4j/log4j/1.2.15/log4j-1.2.15.pom.json
index 7baec6eacf5..16863c63f13 100644
--- a/tests/packagedcode/data/m2/log4j/log4j/1.2.15/log4j-1.2.15.pom.json
+++ b/tests/packagedcode/data/m2/log4j/log4j/1.2.15/log4j-1.2.15.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "log4j", 
   "version": "1.2.15", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Apache Log4j", 
   "description": "Apache Log4j 1.2", 
diff --git a/tests/packagedcode/data/m2/log4j/log4j/1.2.15/log4j-1.2.15.pom.package.json b/tests/packagedcode/data/m2/log4j/log4j/1.2.15/log4j-1.2.15.pom.package.json
index 69250d97820..6e3bc6e7080 100644
--- a/tests/packagedcode/data/m2/log4j/log4j/1.2.15/log4j-1.2.15.pom.package.json
+++ b/tests/packagedcode/data/m2/log4j/log4j/1.2.15/log4j-1.2.15.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "log4j:log4j", 
+  "type": "maven", 
+  "namespace": "log4j", 
+  "name": "log4j", 
   "version": "1.2.15", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Apache Log4j 1.2", 
+  "description": "Apache Log4j\nApache Log4j 1.2", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,44 +29,58 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.mail:mail", 
-        "version": "1.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.jms:jms", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.sun.jdmk:jmxtools", 
-        "version": "1.2.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.sun.jmx:jmxri", 
-        "version": "1.2.1"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "oro:oro", 
-        "version": "2.0.8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:javax.mail/mail", 
+      "requirement": "1.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.jms/jms", 
+      "requirement": "1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.sun.jdmk/jmxtools", 
+      "requirement": "1.2.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.sun.jmx/jmxri", 
+      "requirement": "1.2.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:oro/oro", 
+      "requirement": "2.0.8", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/log4j/log4j/1.2.9/log4j-1.2.9.pom.json b/tests/packagedcode/data/m2/log4j/log4j/1.2.9/log4j-1.2.9.pom.json
index 85d4d96ab0f..1b1fa724b7c 100644
--- a/tests/packagedcode/data/m2/log4j/log4j/1.2.9/log4j-1.2.9.pom.json
+++ b/tests/packagedcode/data/m2/log4j/log4j/1.2.9/log4j-1.2.9.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "log4j", 
   "version": "1.2.9", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/log4j/log4j/1.2.9/log4j-1.2.9.pom.package.json b/tests/packagedcode/data/m2/log4j/log4j/1.2.9/log4j-1.2.9.pom.package.json
index a3cf3df68a6..84f294ba278 100644
--- a/tests/packagedcode/data/m2/log4j/log4j/1.2.9/log4j-1.2.9.pom.package.json
+++ b/tests/packagedcode/data/m2/log4j/log4j/1.2.9/log4j-1.2.9.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "log4j:log4j", 
+  "type": "maven", 
+  "namespace": "log4j", 
+  "name": "log4j", 
   "version": "1.2.9", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.pom.json b/tests/packagedcode/data/m2/logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.pom.json
index f9d7cc57e36..74b3f881464 100644
--- a/tests/packagedcode/data/m2/logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.pom.json
+++ b/tests/packagedcode/data/m2/logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-logging-api", 
   "version": "1.0.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.pom.package.json b/tests/packagedcode/data/m2/logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.pom.package.json
index 12e51fd5f98..e8a903b45e7 100644
--- a/tests/packagedcode/data/m2/logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.pom.package.json
+++ b/tests/packagedcode/data/m2/logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "commons-logging:commons-logging-api", 
+  "type": "maven", 
+  "namespace": "commons-logging", 
+  "name": "commons-logging-api", 
   "version": "1.0.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.json b/tests/packagedcode/data/m2/logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.json
index 21acdbcaa09..8f5eed086ad 100644
--- a/tests/packagedcode/data/m2/logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.json
+++ b/tests/packagedcode/data/m2/logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-logging", 
   "version": "1.0.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Logging", 
   "description": "Commons Logging", 
diff --git a/tests/packagedcode/data/m2/logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.package.json b/tests/packagedcode/data/m2/logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.package.json
index a55dc22735f..60eba544c62 100644
--- a/tests/packagedcode/data/m2/logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.package.json
+++ b/tests/packagedcode/data/m2/logging/commons-logging/1.0.3/commons-logging-1.0.3.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "commons-logging:commons-logging", 
+  "type": "maven", 
+  "namespace": "commons-logging", 
+  "name": "commons-logging", 
   "version": "1.0.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Commons Logging", 
+  "description": "Logging\nCommons Logging", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,29 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "log4j:log4j", 
-        "version": "1.2.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "logkit:logkit", 
-        "version": "1.0.1"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.7"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:log4j/log4j", 
+      "requirement": "1.2.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:logkit/logkit", 
+      "requirement": "1.0.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.7", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.json b/tests/packagedcode/data/m2/logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.json
index 2eb75d2a1ae..b366ffd40d2 100644
--- a/tests/packagedcode/data/m2/logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.json
+++ b/tests/packagedcode/data/m2/logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-logging", 
   "version": "1.0.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Logging", 
   "description": "Commons Logging is a thin adapter allowing configurable bridging to other,\n    well known logging systems.", 
diff --git a/tests/packagedcode/data/m2/logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.package.json b/tests/packagedcode/data/m2/logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.package.json
index 7072974b302..adb92d5d2a9 100644
--- a/tests/packagedcode/data/m2/logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.package.json
+++ b/tests/packagedcode/data/m2/logging/commons-logging/1.0.4/commons-logging-1.0.4.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "commons-logging:commons-logging", 
+  "type": "maven", 
+  "namespace": "commons-logging", 
+  "name": "commons-logging", 
   "version": "1.0.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Commons Logging is a thin adapter allowing configurable bridging to other,\n    well known logging systems.", 
+  "description": "Logging\nCommons Logging is a thin adapter allowing configurable bridging to other,\n    well known logging systems.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -89,34 +92,42 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\n/LICENSE.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\n/LICENSE.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "log4j:log4j", 
-        "version": "1.2.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "logkit:logkit", 
-        "version": "1.0.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "avalon-framework:avalon-framework", 
-        "version": "4.1.3"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.7"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:log4j/log4j", 
+      "requirement": "1.2.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:logkit/logkit", 
+      "requirement": "1.0.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:avalon-framework/avalon-framework", 
+      "requirement": "4.1.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.7", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/logging/commons-logging/1.0/commons-logging-1.0.pom.json b/tests/packagedcode/data/m2/logging/commons-logging/1.0/commons-logging-1.0.pom.json
index 59756232c00..f2ace34fece 100644
--- a/tests/packagedcode/data/m2/logging/commons-logging/1.0/commons-logging-1.0.pom.json
+++ b/tests/packagedcode/data/m2/logging/commons-logging/1.0/commons-logging-1.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-logging", 
   "version": "1.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/logging/commons-logging/1.0/commons-logging-1.0.pom.package.json b/tests/packagedcode/data/m2/logging/commons-logging/1.0/commons-logging-1.0.pom.package.json
index caed2b46d32..dc7b44f8122 100644
--- a/tests/packagedcode/data/m2/logging/commons-logging/1.0/commons-logging-1.0.pom.package.json
+++ b/tests/packagedcode/data/m2/logging/commons-logging/1.0/commons-logging-1.0.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "commons-logging:commons-logging", 
+  "type": "maven", 
+  "namespace": "commons-logging", 
+  "name": "commons-logging", 
   "version": "1.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/logging/commons-logging/1.1.1/commons-logging-1.1.1.pom.json b/tests/packagedcode/data/m2/logging/commons-logging/1.1.1/commons-logging-1.1.1.pom.json
index d0b6e1e8f32..220a02bf119 100644
--- a/tests/packagedcode/data/m2/logging/commons-logging/1.1.1/commons-logging-1.1.1.pom.json
+++ b/tests/packagedcode/data/m2/logging/commons-logging/1.1.1/commons-logging-1.1.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-logging", 
   "version": "1.1.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.commons", 
     "artifact_id": "commons-parent", 
diff --git a/tests/packagedcode/data/m2/logging/commons-logging/1.1.1/commons-logging-1.1.1.pom.package.json b/tests/packagedcode/data/m2/logging/commons-logging/1.1.1/commons-logging-1.1.1.pom.package.json
index a3fa56d36ee..fc85a8b9c4f 100644
--- a/tests/packagedcode/data/m2/logging/commons-logging/1.1.1/commons-logging-1.1.1.pom.package.json
+++ b/tests/packagedcode/data/m2/logging/commons-logging/1.1.1/commons-logging-1.1.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "commons-logging:commons-logging", 
+  "type": "maven", 
+  "namespace": "commons-logging", 
+  "name": "commons-logging", 
   "version": "1.1.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Commons Logging is a thin adapter allowing configurable bridging to other,\n    well known logging systems.", 
+  "description": "Commons Logging\nCommons Logging is a thin adapter allowing configurable bridging to other,\n    well known logging systems.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -103,41 +106,50 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ], 
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "log4j:log4j", 
-        "version": "1.2.12"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "logkit:logkit", 
-        "version": "1.0.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "avalon-framework:avalon-framework", 
-        "version": "4.1.3"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:servlet-api", 
-        "version": "2.3"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:log4j/log4j", 
+      "requirement": "1.2.12", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:logkit/logkit", 
+      "requirement": "1.0.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:avalon-framework/avalon-framework", 
+      "requirement": "4.1.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/servlet-api", 
+      "requirement": "2.3", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/logging/commons-logging/1.1/commons-logging-1.1.pom.json b/tests/packagedcode/data/m2/logging/commons-logging/1.1/commons-logging-1.1.pom.json
index df041067d0e..9887eea66a5 100644
--- a/tests/packagedcode/data/m2/logging/commons-logging/1.1/commons-logging-1.1.pom.json
+++ b/tests/packagedcode/data/m2/logging/commons-logging/1.1/commons-logging-1.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-logging", 
   "version": "1.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Logging", 
   "description": "Commons Logging is a thin adapter allowing configurable bridging to other,\n    well known logging systems.", 
diff --git a/tests/packagedcode/data/m2/logging/commons-logging/1.1/commons-logging-1.1.pom.package.json b/tests/packagedcode/data/m2/logging/commons-logging/1.1/commons-logging-1.1.pom.package.json
index befcc0b3336..26de6eaf422 100644
--- a/tests/packagedcode/data/m2/logging/commons-logging/1.1/commons-logging-1.1.pom.package.json
+++ b/tests/packagedcode/data/m2/logging/commons-logging/1.1/commons-logging-1.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "commons-logging:commons-logging", 
+  "type": "maven", 
+  "namespace": "commons-logging", 
+  "name": "commons-logging", 
   "version": "1.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Commons Logging is a thin adapter allowing configurable bridging to other,\n    well known logging systems.", 
+  "description": "Logging\nCommons Logging is a thin adapter allowing configurable bridging to other,\n    well known logging systems.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -110,39 +113,50 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\n/LICENSE.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\n/LICENSE.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "log4j:log4j", 
-        "version": "1.2.12"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "logkit:logkit", 
-        "version": "1.0.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "avalon-framework:avalon-framework", 
-        "version": "4.1.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:servlet-api", 
-        "version": "2.3"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:log4j/log4j", 
+      "requirement": "1.2.12", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:logkit/logkit", 
+      "requirement": "1.0.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:avalon-framework/avalon-framework", 
+      "requirement": "4.1.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/servlet-api", 
+      "requirement": "2.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/logkit/logkit/1.0.1/logkit-1.0.1.pom.json b/tests/packagedcode/data/m2/logkit/logkit/1.0.1/logkit-1.0.1.pom.json
index e32a1bdb386..9384798a5bd 100644
--- a/tests/packagedcode/data/m2/logkit/logkit/1.0.1/logkit-1.0.1.pom.json
+++ b/tests/packagedcode/data/m2/logkit/logkit/1.0.1/logkit-1.0.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "logkit", 
   "version": "1.0.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/logkit/logkit/1.0.1/logkit-1.0.1.pom.package.json b/tests/packagedcode/data/m2/logkit/logkit/1.0.1/logkit-1.0.1.pom.package.json
index dacc4696019..7f7f93f921c 100644
--- a/tests/packagedcode/data/m2/logkit/logkit/1.0.1/logkit-1.0.1.pom.package.json
+++ b/tests/packagedcode/data/m2/logkit/logkit/1.0.1/logkit-1.0.1.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "logkit:logkit", 
+  "type": "maven", 
+  "namespace": "logkit", 
+  "name": "logkit", 
   "version": "1.0.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/math/commons-math/1.2/commons-math-1.2.pom.json b/tests/packagedcode/data/m2/math/commons-math/1.2/commons-math-1.2.pom.json
index 202535a390c..f0963e1a3a9 100644
--- a/tests/packagedcode/data/m2/math/commons-math/1.2/commons-math-1.2.pom.json
+++ b/tests/packagedcode/data/m2/math/commons-math/1.2/commons-math-1.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-math", 
   "version": "1.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.commons", 
     "artifact_id": "commons-parent", 
diff --git a/tests/packagedcode/data/m2/math/commons-math/1.2/commons-math-1.2.pom.package.json b/tests/packagedcode/data/m2/math/commons-math/1.2/commons-math-1.2.pom.package.json
index b40ff408036..1bbe0de7c96 100644
--- a/tests/packagedcode/data/m2/math/commons-math/1.2/commons-math-1.2.pom.package.json
+++ b/tests/packagedcode/data/m2/math/commons-math/1.2/commons-math-1.2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "commons-math:commons-math", 
+  "type": "maven", 
+  "namespace": "commons-math", 
+  "name": "commons-math", 
   "version": "1.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "The Math project is a library of lightweight, self-contained mathematics and statistics components addressing the most common practical problems not immediately available in the Java programming language or commons-lang.", 
+  "description": "Commons Math\nThe Math project is a library of lightweight, self-contained mathematics and statistics components addressing the most common practical problems not immediately available in the Java programming language or commons-lang.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -187,29 +190,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.2"
-      }
-    ], 
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-discovery:commons-discovery", 
-        "version": "0.2"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.2", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-discovery/commons-discovery", 
+      "requirement": "0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/mysql/mysql-connector-java/5.0.4/mysql-connector-java-5.0.4.pom.json b/tests/packagedcode/data/m2/mysql/mysql-connector-java/5.0.4/mysql-connector-java-5.0.4.pom.json
index 0cad8e42158..45ba454eeff 100644
--- a/tests/packagedcode/data/m2/mysql/mysql-connector-java/5.0.4/mysql-connector-java-5.0.4.pom.json
+++ b/tests/packagedcode/data/m2/mysql/mysql-connector-java/5.0.4/mysql-connector-java-5.0.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "mysql-connector-java", 
   "version": "5.0.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "MySQL java connector", 
   "description": "MySQL java connector", 
diff --git a/tests/packagedcode/data/m2/mysql/mysql-connector-java/5.0.4/mysql-connector-java-5.0.4.pom.package.json b/tests/packagedcode/data/m2/mysql/mysql-connector-java/5.0.4/mysql-connector-java-5.0.4.pom.package.json
index 516cf757e7e..f4ce26f2454 100644
--- a/tests/packagedcode/data/m2/mysql/mysql-connector-java/5.0.4/mysql-connector-java-5.0.4.pom.package.json
+++ b/tests/packagedcode/data/m2/mysql/mysql-connector-java/5.0.4/mysql-connector-java-5.0.4.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "mysql:mysql-connector-java", 
+  "type": "maven", 
+  "namespace": "mysql", 
+  "name": "mysql-connector-java", 
   "version": "5.0.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "MySQL java connector", 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The GNU General Public License, Version 2\nhttp://www.gnu.org/licenses/gpl.txt\nMySQL Connector/J contains exceptions to GPL requirements when linking with other components\n      \t\tthat are licensed under OSI-approved open source licenses, see EXCEPTIONS-CONNECTOR-J\n      \t\tin this distribution for more details.", 
   "license_expression": null, 
+  "asserted_license": "The GNU General Public License, Version 2\nhttp://www.gnu.org/licenses/gpl.txt\nMySQL Connector/J contains exceptions to GPL requirements when linking with other components\n      \t\tthat are licensed under OSI-approved open source licenses, see EXCEPTIONS-CONNECTOR-J\n      \t\tin this distribution for more details.", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.pom.json b/tests/packagedcode/data/m2/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.pom.json
index abddd861027..41f3133887b 100644
--- a/tests/packagedcode/data/m2/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.pom.json
+++ b/tests/packagedcode/data/m2/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "jcip-annotations", 
   "version": "1.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "\"Java Concurrency in Practice\" book annotations", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.pom.package.json b/tests/packagedcode/data/m2/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.pom.package.json
index 7c289029164..9b1379de56e 100644
--- a/tests/packagedcode/data/m2/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.pom.package.json
+++ b/tests/packagedcode/data/m2/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "net.jcip:jcip-annotations", 
+  "type": "maven", 
+  "namespace": "net.jcip", 
+  "name": "jcip-annotations", 
   "version": "1.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "\"Java Concurrency in Practice\" book annotations", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.pom.json b/tests/packagedcode/data/m2/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.pom.json
index 37abe4867ba..8e09a67c107 100644
--- a/tests/packagedcode/data/m2/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.pom.json
+++ b/tests/packagedcode/data/m2/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "ehcache", 
   "version": "1.2.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "ehcache", 
   "description": "ehcache is a pure Java, in-process cache with the following features:\n\n   1. Fast.\n   2. Simple.\n   3. Multiple eviction policies: LRU, LFU and FIFO.\n   4. Caches can be in memory or on disk.\n   5. Disk Stores can be persistent between VM restarts.\n   6. Distributed caching using multicast and RMI, with a pluggable API.\n   7. Cache and CacheManager listeners\n   8. Supports multiple Caches per CacheManager, and multiple CacheManagers per application.\n   9. Acts as a pluggable cache for Hibernate 3.1, 3 and 2.1.\n   10. Small foot print. Both in terms of size and memory requirements.\n   11. Minimal dependencies apart from J2SE.\n   12. Fully documented. See the online Documentation and the online JavaDoc.\n   13. Comprehensive Test Coverage. See the clover test report.\n   14. Available under the Apache 1.1 license. EHCache's copyright and licensing has been reviewed and approved by the Apache Software Foundation, making EHCache suitable for use in Apache projects.\n   15. Production tested. EHCache is used on a large and very busy eCommerce site.\n   16. Web caching, pull-through caches and other common caching implementations are provided in the ehcache-constructs module.", 
diff --git a/tests/packagedcode/data/m2/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.pom.package.json b/tests/packagedcode/data/m2/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.pom.package.json
index a544c131ff5..0dcf13770e5 100644
--- a/tests/packagedcode/data/m2/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.pom.package.json
+++ b/tests/packagedcode/data/m2/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "net.sf.ehcache:ehcache", 
+  "type": "maven", 
+  "namespace": "net.sf.ehcache", 
+  "name": "ehcache", 
   "version": "1.2.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "ehcache is a pure Java, in-process cache with the following features:\n\n   1. Fast.\n   2. Simple.\n   3. Multiple eviction policies: LRU, LFU and FIFO.\n   4. Caches can be in memory or on disk.\n   5. Disk Stores can be persistent between VM restarts.\n   6. Distributed caching using multicast and RMI, with a pluggable API.\n   7. Cache and CacheManager listeners\n   8. Supports multiple Caches per CacheManager, and multiple CacheManagers per application.\n   9. Acts as a pluggable cache for Hibernate 3.1, 3 and 2.1.\n   10. Small foot print. Both in terms of size and memory requirements.\n   11. Minimal dependencies apart from J2SE.\n   12. Fully documented. See the online Documentation and the online JavaDoc.\n   13. Comprehensive Test Coverage. See the clover test report.\n   14. Available under the Apache 1.1 license. EHCache's copyright and licensing has been reviewed and approved by the Apache Software Foundation, making EHCache suitable for use in Apache projects.\n   15. Production tested. EHCache is used on a large and very busy eCommerce site.\n   16. Web caching, pull-through caches and other common caching implementations are provided in the ehcache-constructs module.", 
+  "description": "ehcache\nehcache is a pure Java, in-process cache with the following features:\n\n   1. Fast.\n   2. Simple.\n   3. Multiple eviction policies: LRU, LFU and FIFO.\n   4. Caches can be in memory or on disk.\n   5. Disk Stores can be persistent between VM restarts.\n   6. Distributed caching using multicast and RMI, with a pluggable API.\n   7. Cache and CacheManager listeners\n   8. Supports multiple Caches per CacheManager, and multiple CacheManagers per application.\n   9. Acts as a pluggable cache for Hibernate 3.1, 3 and 2.1.\n   10. Small foot print. Both in terms of size and memory requirements.\n   11. Minimal dependencies apart from J2SE.\n   12. Fully documented. See the online Documentation and the online JavaDoc.\n   13. Comprehensive Test Coverage. See the clover test report.\n   14. Available under the Apache 1.1 license. EHCache's copyright and licensing has been reviewed and approved by the Apache Software Foundation, making EHCache suitable for use in Apache projects.\n   15. Production tested. EHCache is used on a large and very busy eCommerce site.\n   16. Web caching, pull-through caches and other common caching implementations are provided in the ehcache-constructs module.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -68,54 +71,74 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://ehcache.sourceforge.net/LICENSE.txt\nThe license is the standard wording from the Apache license, but with\n                Greg Luck as copyright\n                owner.", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://ehcache.sourceforge.net/LICENSE.txt\nThe license is the standard wording from the Apache license, but with\n                Greg Luck as copyright\n                owner.", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-collections:commons-collections", 
-        "version": "2.1"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.hibernate:hibernate", 
-        "version": "3.2.0.cr3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "net.sf.hibernate:hibernate", 
-        "version": "2.1.8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:servlet-api", 
-        "version": "2.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "httpunit:httpunit", 
-        "version": "1.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-httpclient:commons-httpclient", 
-        "version": "3.0.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-collections/commons-collections", 
+      "requirement": "2.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.hibernate/hibernate", 
+      "requirement": "3.2.0.cr3", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:net.sf.hibernate/hibernate", 
+      "requirement": "2.1.8", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/servlet-api", 
+      "requirement": "2.4", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:httpunit/httpunit", 
+      "requirement": "1.6", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-httpclient/commons-httpclient", 
+      "requirement": "3.0.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/net/sf/kxml/kxml2/2.2.2/kxml2-2.2.2.pom.json b/tests/packagedcode/data/m2/net/sf/kxml/kxml2/2.2.2/kxml2-2.2.2.pom.json
index e2d43c00906..23eeb2055d1 100644
--- a/tests/packagedcode/data/m2/net/sf/kxml/kxml2/2.2.2/kxml2-2.2.2.pom.json
+++ b/tests/packagedcode/data/m2/net/sf/kxml/kxml2/2.2.2/kxml2-2.2.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "kxml2", 
   "version": "2.2.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "kXML 2", 
   "description": "kXML2 is a small XmlPull parser aimed at J2ME/MIDP devices, e.g. mobile phones.", 
diff --git a/tests/packagedcode/data/m2/net/sf/kxml/kxml2/2.2.2/kxml2-2.2.2.pom.package.json b/tests/packagedcode/data/m2/net/sf/kxml/kxml2/2.2.2/kxml2-2.2.2.pom.package.json
index 229da1f9a9b..146789d8e46 100644
--- a/tests/packagedcode/data/m2/net/sf/kxml/kxml2/2.2.2/kxml2-2.2.2.pom.package.json
+++ b/tests/packagedcode/data/m2/net/sf/kxml/kxml2/2.2.2/kxml2-2.2.2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "net.sf.kxml:kxml2", 
+  "type": "maven", 
+  "namespace": "net.sf.kxml", 
+  "name": "kxml2", 
   "version": "2.2.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "kXML2 is a small XmlPull parser aimed at J2ME/MIDP devices, e.g. mobile phones.", 
+  "description": "kXML 2\nkXML2 is a small XmlPull parser aimed at J2ME/MIDP devices, e.g. mobile phones.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -33,24 +36,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The BSD License\nhttp://www.opensource.org/licenses/bsd-license.html", 
   "license_expression": null, 
+  "asserted_license": "The BSD License\nhttp://www.opensource.org/licenses/bsd-license.html", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "xmlpull:xmlpull", 
-        "version": "1.1.3.1"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.2"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:xmlpull/xmlpull", 
+      "requirement": "1.1.3.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.2", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/acegisecurity/acegi-security-parent/1.0.5/acegi-security-parent-1.0.5.pom.json b/tests/packagedcode/data/m2/org/acegisecurity/acegi-security-parent/1.0.5/acegi-security-parent-1.0.5.pom.json
index 80d2ba4578f..e7748057673 100644
--- a/tests/packagedcode/data/m2/org/acegisecurity/acegi-security-parent/1.0.5/acegi-security-parent-1.0.5.pom.json
+++ b/tests/packagedcode/data/m2/org/acegisecurity/acegi-security-parent/1.0.5/acegi-security-parent-1.0.5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "acegi-security-parent", 
   "version": "1.0.5", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Acegi Security", 
   "description": "Acegi Security System for Spring", 
diff --git a/tests/packagedcode/data/m2/org/acegisecurity/acegi-security-parent/1.0.5/acegi-security-parent-1.0.5.pom.package.json b/tests/packagedcode/data/m2/org/acegisecurity/acegi-security-parent/1.0.5/acegi-security-parent-1.0.5.pom.package.json
index 05628484d41..4973b7cd9ef 100644
--- a/tests/packagedcode/data/m2/org/acegisecurity/acegi-security-parent/1.0.5/acegi-security-parent-1.0.5.pom.package.json
+++ b/tests/packagedcode/data/m2/org/acegisecurity/acegi-security-parent/1.0.5/acegi-security-parent-1.0.5.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.acegisecurity:acegi-security-parent", 
+  "type": "maven", 
+  "namespace": "org.acegisecurity", 
+  "name": "acegi-security-parent", 
   "version": "1.0.5", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Acegi Security System for Spring", 
+  "description": "Acegi Security\nAcegi Security System for Spring", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -222,17 +227,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/acegisecurity/acegi-security-parent/1.0.7/acegi-security-parent-1.0.7.pom.json b/tests/packagedcode/data/m2/org/acegisecurity/acegi-security-parent/1.0.7/acegi-security-parent-1.0.7.pom.json
index 6d1e65decd1..e9b286a9934 100644
--- a/tests/packagedcode/data/m2/org/acegisecurity/acegi-security-parent/1.0.7/acegi-security-parent-1.0.7.pom.json
+++ b/tests/packagedcode/data/m2/org/acegisecurity/acegi-security-parent/1.0.7/acegi-security-parent-1.0.7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "acegi-security-parent", 
   "version": "1.0.7", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Acegi Security", 
   "description": "Acegi Security System for Spring", 
diff --git a/tests/packagedcode/data/m2/org/acegisecurity/acegi-security-parent/1.0.7/acegi-security-parent-1.0.7.pom.package.json b/tests/packagedcode/data/m2/org/acegisecurity/acegi-security-parent/1.0.7/acegi-security-parent-1.0.7.pom.package.json
index 792157c4ce6..6047e7086dc 100644
--- a/tests/packagedcode/data/m2/org/acegisecurity/acegi-security-parent/1.0.7/acegi-security-parent-1.0.7.pom.package.json
+++ b/tests/packagedcode/data/m2/org/acegisecurity/acegi-security-parent/1.0.7/acegi-security-parent-1.0.7.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.acegisecurity:acegi-security-parent", 
+  "type": "maven", 
+  "namespace": "org.acegisecurity", 
+  "name": "acegi-security-parent", 
   "version": "1.0.7", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Acegi Security System for Spring", 
+  "description": "Acegi Security\nAcegi Security System for Spring", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -222,17 +227,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/acegisecurity/acegi-security/1.0.5/acegi-security-1.0.5.pom.json b/tests/packagedcode/data/m2/org/acegisecurity/acegi-security/1.0.5/acegi-security-1.0.5.pom.json
index 29a3e26dbd2..44e05d8e9a7 100644
--- a/tests/packagedcode/data/m2/org/acegisecurity/acegi-security/1.0.5/acegi-security-1.0.5.pom.json
+++ b/tests/packagedcode/data/m2/org/acegisecurity/acegi-security/1.0.5/acegi-security-1.0.5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "acegi-security", 
   "version": "1.0.5", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.acegisecurity", 
     "artifact_id": "acegi-security-parent", 
diff --git a/tests/packagedcode/data/m2/org/acegisecurity/acegi-security/1.0.5/acegi-security-1.0.5.pom.package.json b/tests/packagedcode/data/m2/org/acegisecurity/acegi-security/1.0.5/acegi-security-1.0.5.pom.package.json
index 5f16cf6af69..3d979c8cac3 100644
--- a/tests/packagedcode/data/m2/org/acegisecurity/acegi-security/1.0.5/acegi-security-1.0.5.pom.package.json
+++ b/tests/packagedcode/data/m2/org/acegisecurity/acegi-security/1.0.5/acegi-security-1.0.5.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.acegisecurity:acegi-security", 
+  "type": "maven", 
+  "namespace": "org.acegisecurity", 
+  "name": "acegi-security", 
   "version": "1.0.5", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Acegi Security Core", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,131 +21,194 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-core", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-remoting", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-jdbc", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-web", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-mock", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-ldap", 
-        "version": "1.1.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "net.sf.ehcache:ehcache", 
-        "version": "1.2.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "cas:casclient", 
-        "version": "2.0.11"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-lang:commons-lang", 
-        "version": "2.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-codec:commons-codec", 
-        "version": "1.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "oro:oro", 
-        "version": "2.0.8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-collections:commons-collections", 
-        "version": "3.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "aspectj:aspectjrt", 
-        "version": "1.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:jsp-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:servlet-api", 
-        "version": "2.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "taglibs:standard", 
-        "version": "1.0.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "log4j:log4j", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "hsqldb:hsqldb", 
-        "version": "1.8.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.directory.server:apacheds-core", 
-        "version": "1.0.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.slf4j:slf4j-log4j12", 
-        "version": "1.0.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jmock:jmock", 
-        "version": "1.0.1"
-      }
-    ], 
-    "runtime": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-support", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.springframework/spring-core", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-remoting", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-jdbc", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-web", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-mock", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-ldap", 
+      "requirement": "1.1.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:net.sf.ehcache/ehcache", 
+      "requirement": "1.2.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:cas/casclient", 
+      "requirement": "2.0.11", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-lang/commons-lang", 
+      "requirement": "2.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-codec/commons-codec", 
+      "requirement": "1.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:oro/oro", 
+      "requirement": "2.0.8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-collections/commons-collections", 
+      "requirement": "3.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:aspectj/aspectjrt", 
+      "requirement": "1.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/jsp-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/servlet-api", 
+      "requirement": "2.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:taglibs/standard", 
+      "requirement": "1.0.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:log4j/log4j", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-support", 
+      "requirement": null, 
+      "scope": "runtime", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:hsqldb/hsqldb", 
+      "requirement": "1.8.0.4", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.directory.server/apacheds-core", 
+      "requirement": "1.0.0", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.slf4j/slf4j-log4j12", 
+      "requirement": "1.0.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jmock/jmock", 
+      "requirement": "1.0.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/acegisecurity/acegi-security/1.0.7/acegi-security-1.0.7.pom.json b/tests/packagedcode/data/m2/org/acegisecurity/acegi-security/1.0.7/acegi-security-1.0.7.pom.json
index 693683ff4d9..66c07f58de6 100644
--- a/tests/packagedcode/data/m2/org/acegisecurity/acegi-security/1.0.7/acegi-security-1.0.7.pom.json
+++ b/tests/packagedcode/data/m2/org/acegisecurity/acegi-security/1.0.7/acegi-security-1.0.7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "acegi-security", 
   "version": "1.0.7", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.acegisecurity", 
     "artifact_id": "acegi-security-parent", 
diff --git a/tests/packagedcode/data/m2/org/acegisecurity/acegi-security/1.0.7/acegi-security-1.0.7.pom.package.json b/tests/packagedcode/data/m2/org/acegisecurity/acegi-security/1.0.7/acegi-security-1.0.7.pom.package.json
index 2022a5e1f4f..e4362033885 100644
--- a/tests/packagedcode/data/m2/org/acegisecurity/acegi-security/1.0.7/acegi-security-1.0.7.pom.package.json
+++ b/tests/packagedcode/data/m2/org/acegisecurity/acegi-security/1.0.7/acegi-security-1.0.7.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.acegisecurity:acegi-security", 
+  "type": "maven", 
+  "namespace": "org.acegisecurity", 
+  "name": "acegi-security", 
   "version": "1.0.7", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Acegi Security Core", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,131 +21,194 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-core", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-remoting", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-jdbc", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-web", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-mock", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-ldap", 
-        "version": "1.1.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "net.sf.ehcache:ehcache", 
-        "version": "1.2.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "cas:casclient", 
-        "version": "2.0.11"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-lang:commons-lang", 
-        "version": "2.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-codec:commons-codec", 
-        "version": "1.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "oro:oro", 
-        "version": "2.0.8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-collections:commons-collections", 
-        "version": "3.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "aspectj:aspectjrt", 
-        "version": "1.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:jsp-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:servlet-api", 
-        "version": "2.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "taglibs:standard", 
-        "version": "1.0.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "log4j:log4j", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "hsqldb:hsqldb", 
-        "version": "1.8.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.directory.server:apacheds-core", 
-        "version": "1.0.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.slf4j:slf4j-log4j12", 
-        "version": "1.0.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jmock:jmock", 
-        "version": "1.0.1"
-      }
-    ], 
-    "runtime": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-support", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.springframework/spring-core", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-remoting", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-jdbc", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-web", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-mock", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-ldap", 
+      "requirement": "1.1.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:net.sf.ehcache/ehcache", 
+      "requirement": "1.2.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:cas/casclient", 
+      "requirement": "2.0.11", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-lang/commons-lang", 
+      "requirement": "2.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-codec/commons-codec", 
+      "requirement": "1.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:oro/oro", 
+      "requirement": "2.0.8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-collections/commons-collections", 
+      "requirement": "3.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:aspectj/aspectjrt", 
+      "requirement": "1.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/jsp-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/servlet-api", 
+      "requirement": "2.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:taglibs/standard", 
+      "requirement": "1.0.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:log4j/log4j", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-support", 
+      "requirement": null, 
+      "scope": "runtime", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:hsqldb/hsqldb", 
+      "requirement": "1.8.0.4", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.directory.server/apacheds-core", 
+      "requirement": "1.0.0", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.slf4j/slf4j-log4j12", 
+      "requirement": "1.0.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jmock/jmock", 
+      "requirement": "1.0.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/ajax4jsf/ajax4jsf/1.1.1/ajax4jsf-1.1.1.pom.json b/tests/packagedcode/data/m2/org/ajax4jsf/ajax4jsf/1.1.1/ajax4jsf-1.1.1.pom.json
index 02e68ebb4ee..7ad97b73700 100644
--- a/tests/packagedcode/data/m2/org/ajax4jsf/ajax4jsf/1.1.1/ajax4jsf-1.1.1.pom.json
+++ b/tests/packagedcode/data/m2/org/ajax4jsf/ajax4jsf/1.1.1/ajax4jsf-1.1.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "ajax4jsf", 
   "version": "1.1.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.ajax4jsf", 
     "artifact_id": "master", 
diff --git a/tests/packagedcode/data/m2/org/ajax4jsf/ajax4jsf/1.1.1/ajax4jsf-1.1.1.pom.package.json b/tests/packagedcode/data/m2/org/ajax4jsf/ajax4jsf/1.1.1/ajax4jsf-1.1.1.pom.package.json
index 2edc7e11314..6d1486ab03b 100644
--- a/tests/packagedcode/data/m2/org/ajax4jsf/ajax4jsf/1.1.1/ajax4jsf-1.1.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/ajax4jsf/ajax4jsf/1.1.1/ajax4jsf-1.1.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.ajax4jsf:ajax4jsf", 
+  "type": "maven", 
+  "namespace": "org.ajax4jsf", 
+  "name": "ajax4jsf", 
   "version": "1.1.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Java Server Faces AJAX framework", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,98 +21,138 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ], 
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "opensymphony:oscache", 
-        "version": "2.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.sun.facelets:jsf-facelets", 
-        "version": "1.1.11"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "nekohtml:nekohtml", 
-        "version": "0.9.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "net.sf.json-lib:json-lib", 
-        "version": "0.9"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "log4j:log4j", 
-        "version": "1.2.14"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-beanutils:commons-beanutils", 
-        "version": "1.7.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-digester:commons-digester", 
-        "version": "1.8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-collections:commons-collections", 
-        "version": "3.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.faces:jsf-api", 
-        "version": "1.1_02"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:jstl", 
-        "version": "1.0"
-      }
-    ], 
-    "runtime": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.faces:jsf-impl", 
-        "version": "1.1_02"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.el:el-api", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:servlet-api", 
-        "version": "2.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:jsp-api", 
-        "version": "2.0"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:opensymphony/oscache", 
+      "requirement": "2.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.sun.facelets/jsf-facelets", 
+      "requirement": "1.1.11", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:nekohtml/nekohtml", 
+      "requirement": "0.9.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:net.sf.json-lib/json-lib", 
+      "requirement": "0.9", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:log4j/log4j", 
+      "requirement": "1.2.14", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-beanutils/commons-beanutils", 
+      "requirement": "1.7.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-digester/commons-digester", 
+      "requirement": "1.8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-collections/commons-collections", 
+      "requirement": "3.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.faces/jsf-api", 
+      "requirement": "1.1_02", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/jstl", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.el/el-api", 
+      "requirement": "1.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/servlet-api", 
+      "requirement": "2.4", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/jsp-api", 
+      "requirement": "2.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.faces/jsf-impl", 
+      "requirement": "1.1_02", 
+      "scope": "runtime", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/ajax4jsf/master/1.1.1/master-1.1.1.pom.json b/tests/packagedcode/data/m2/org/ajax4jsf/master/1.1.1/master-1.1.1.pom.json
index 3c95ddff150..f01e981023c 100644
--- a/tests/packagedcode/data/m2/org/ajax4jsf/master/1.1.1/master-1.1.1.pom.json
+++ b/tests/packagedcode/data/m2/org/ajax4jsf/master/1.1.1/master-1.1.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "master", 
   "version": "1.1.1", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Ajax for Java Server faces core project", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/ajax4jsf/master/1.1.1/master-1.1.1.pom.package.json b/tests/packagedcode/data/m2/org/ajax4jsf/master/1.1.1/master-1.1.1.pom.package.json
index 51a27ad8a1c..23e5aa7c38e 100644
--- a/tests/packagedcode/data/m2/org/ajax4jsf/master/1.1.1/master-1.1.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/ajax4jsf/master/1.1.1/master-1.1.1.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.ajax4jsf:master", 
+  "type": "maven", 
+  "namespace": "org.ajax4jsf", 
+  "name": "master", 
   "version": "1.1.1", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Ajax for Java Server faces core project", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -40,9 +45,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "LGPL 2.1\nhttp://www.gnu.org/licenses/lgpl.html\nGNU LESSER GENERAL PUBLIC LICENSE Version 2.1", 
   "license_expression": null, 
+  "asserted_license": "LGPL 2.1\nhttp://www.gnu.org/licenses/lgpl.html\nGNU LESSER GENERAL PUBLIC LICENSE Version 2.1", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/apache/1/apache-1.pom.json b/tests/packagedcode/data/m2/org/apache/apache/1/apache-1.pom.json
index 56c6be9d902..c8e84ca03d2 100644
--- a/tests/packagedcode/data/m2/org/apache/apache/1/apache-1.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/apache/1/apache-1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "apache", 
   "version": "1", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "The Apache Software Foundation", 
   "description": "The Apache Software Foundation provides support for the Apache community of open-source software projects.\n    The Apache projects are characterized by a collaborative, consensus based development process, an open and\n    pragmatic software license, and a desire to create high quality software that leads the way in its field.\n    We consider ourselves not simply a group of projects sharing a server, but rather a community of developers\n    and users.", 
diff --git a/tests/packagedcode/data/m2/org/apache/apache/1/apache-1.pom.package.json b/tests/packagedcode/data/m2/org/apache/apache/1/apache-1.pom.package.json
index 558dc4f8ca4..1717d4648b8 100644
--- a/tests/packagedcode/data/m2/org/apache/apache/1/apache-1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/apache/1/apache-1.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache:apache", 
+  "type": "maven", 
+  "namespace": "org.apache", 
+  "name": "apache", 
   "version": "1", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "The Apache Software Foundation provides support for the Apache community of open-source software projects.\n    The Apache projects are characterized by a collaborative, consensus based development process, an open and\n    pragmatic software license, and a desire to create high quality software that leads the way in its field.\n    We consider ourselves not simply a group of projects sharing a server, but rather a community of developers\n    and users.", 
+  "description": "The Apache Software Foundation\nThe Apache Software Foundation provides support for the Apache community of open-source software projects.\n    The Apache projects are characterized by a collaborative, consensus based development process, an open and\n    pragmatic software license, and a desire to create high quality software that leads the way in its field.\n    We consider ourselves not simply a group of projects sharing a server, but rather a community of developers\n    and users.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,9 +31,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/apache/3/apache-3.pom.json b/tests/packagedcode/data/m2/org/apache/apache/3/apache-3.pom.json
index 02b4fdb0c56..fcf7e13c1b5 100644
--- a/tests/packagedcode/data/m2/org/apache/apache/3/apache-3.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/apache/3/apache-3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "apache", 
   "version": "3", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "The Apache Software Foundation", 
   "description": "The Apache Software Foundation provides support for the Apache community of open-source software projects.\n    The Apache projects are characterized by a collaborative, consensus based development process, an open and\n    pragmatic software license, and a desire to create high quality software that leads the way in its field.\n    We consider ourselves not simply a group of projects sharing a server, but rather a community of developers\n    and users.", 
diff --git a/tests/packagedcode/data/m2/org/apache/apache/3/apache-3.pom.package.json b/tests/packagedcode/data/m2/org/apache/apache/3/apache-3.pom.package.json
index a8023e76e12..d5c3d1cc540 100644
--- a/tests/packagedcode/data/m2/org/apache/apache/3/apache-3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/apache/3/apache-3.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache:apache", 
+  "type": "maven", 
+  "namespace": "org.apache", 
+  "name": "apache", 
   "version": "3", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "The Apache Software Foundation provides support for the Apache community of open-source software projects.\n    The Apache projects are characterized by a collaborative, consensus based development process, an open and\n    pragmatic software license, and a desire to create high quality software that leads the way in its field.\n    We consider ourselves not simply a group of projects sharing a server, but rather a community of developers\n    and users.", 
+  "description": "The Apache Software Foundation\nThe Apache Software Foundation provides support for the Apache community of open-source software projects.\n    The Apache projects are characterized by a collaborative, consensus based development process, an open and\n    pragmatic software license, and a desire to create high quality software that leads the way in its field.\n    We consider ourselves not simply a group of projects sharing a server, but rather a community of developers\n    and users.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,9 +31,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/apache/4/apache-4.pom.json b/tests/packagedcode/data/m2/org/apache/apache/4/apache-4.pom.json
index 861b3569ae5..bd56162c30e 100644
--- a/tests/packagedcode/data/m2/org/apache/apache/4/apache-4.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/apache/4/apache-4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "apache", 
   "version": "4", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "The Apache Software Foundation", 
   "description": "The Apache Software Foundation provides support for the Apache community of open-source software projects.\n    The Apache projects are characterized by a collaborative, consensus based development process, an open and\n    pragmatic software license, and a desire to create high quality software that leads the way in its field.\n    We consider ourselves not simply a group of projects sharing a server, but rather a community of developers\n    and users.", 
diff --git a/tests/packagedcode/data/m2/org/apache/apache/4/apache-4.pom.package.json b/tests/packagedcode/data/m2/org/apache/apache/4/apache-4.pom.package.json
index ceb64017d0f..2792d556cc2 100644
--- a/tests/packagedcode/data/m2/org/apache/apache/4/apache-4.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/apache/4/apache-4.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache:apache", 
+  "type": "maven", 
+  "namespace": "org.apache", 
+  "name": "apache", 
   "version": "4", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "The Apache Software Foundation provides support for the Apache community of open-source software projects.\n    The Apache projects are characterized by a collaborative, consensus based development process, an open and\n    pragmatic software license, and a desire to create high quality software that leads the way in its field.\n    We consider ourselves not simply a group of projects sharing a server, but rather a community of developers\n    and users.", 
+  "description": "The Apache Software Foundation\nThe Apache Software Foundation provides support for the Apache community of open-source software projects.\n    The Apache projects are characterized by a collaborative, consensus based development process, an open and\n    pragmatic software license, and a desire to create high quality software that leads the way in its field.\n    We consider ourselves not simply a group of projects sharing a server, but rather a community of developers\n    and users.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,9 +31,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/commons/commons-parent/5/commons-parent-5.pom.json b/tests/packagedcode/data/m2/org/apache/commons/commons-parent/5/commons-parent-5.pom.json
index e76068f7e30..c3d4edba0bd 100644
--- a/tests/packagedcode/data/m2/org/apache/commons/commons-parent/5/commons-parent-5.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/commons/commons-parent/5/commons-parent-5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-parent", 
   "version": "5", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache", 
     "artifact_id": "apache", 
diff --git a/tests/packagedcode/data/m2/org/apache/commons/commons-parent/5/commons-parent-5.pom.package.json b/tests/packagedcode/data/m2/org/apache/commons/commons-parent/5/commons-parent-5.pom.package.json
index aaa1efee879..2d6d3ee3a51 100644
--- a/tests/packagedcode/data/m2/org/apache/commons/commons-parent/5/commons-parent-5.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/commons/commons-parent/5/commons-parent-5.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.commons:commons-parent", 
+  "type": "maven", 
+  "namespace": "org.apache.commons", 
+  "name": "commons-parent", 
   "version": "5", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Commons Parent", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/commons/commons-parent/7/commons-parent-7.pom.json b/tests/packagedcode/data/m2/org/apache/commons/commons-parent/7/commons-parent-7.pom.json
index 0c71e8de81c..05869002316 100644
--- a/tests/packagedcode/data/m2/org/apache/commons/commons-parent/7/commons-parent-7.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/commons/commons-parent/7/commons-parent-7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-parent", 
   "version": "7", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache", 
     "artifact_id": "apache", 
diff --git a/tests/packagedcode/data/m2/org/apache/commons/commons-parent/7/commons-parent-7.pom.package.json b/tests/packagedcode/data/m2/org/apache/commons/commons-parent/7/commons-parent-7.pom.package.json
index 36c05e40213..d453ab1e559 100644
--- a/tests/packagedcode/data/m2/org/apache/commons/commons-parent/7/commons-parent-7.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/commons/commons-parent/7/commons-parent-7.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.commons:commons-parent", 
+  "type": "maven", 
+  "namespace": "org.apache.commons", 
+  "name": "commons-parent", 
   "version": "7", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Commons Parent", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/commons/commons-parent/9/commons-parent-9.pom.json b/tests/packagedcode/data/m2/org/apache/commons/commons-parent/9/commons-parent-9.pom.json
index 0cea9b5a74e..d623bf6883a 100644
--- a/tests/packagedcode/data/m2/org/apache/commons/commons-parent/9/commons-parent-9.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/commons/commons-parent/9/commons-parent-9.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-parent", 
   "version": "9", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache", 
     "artifact_id": "apache", 
diff --git a/tests/packagedcode/data/m2/org/apache/commons/commons-parent/9/commons-parent-9.pom.package.json b/tests/packagedcode/data/m2/org/apache/commons/commons-parent/9/commons-parent-9.pom.package.json
index 365a424e16b..3e0ca5dc3d8 100644
--- a/tests/packagedcode/data/m2/org/apache/commons/commons-parent/9/commons-parent-9.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/commons/commons-parent/9/commons-parent-9.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.commons:commons-parent", 
+  "type": "maven", 
+  "namespace": "org.apache.commons", 
+  "name": "commons-parent", 
   "version": "9", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Commons Parent", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/felix/felix/1.0.0/felix-1.0.0.pom.json b/tests/packagedcode/data/m2/org/apache/felix/felix/1.0.0/felix-1.0.0.pom.json
index 5f6fc61b410..ae09d827e03 100644
--- a/tests/packagedcode/data/m2/org/apache/felix/felix/1.0.0/felix-1.0.0.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/felix/felix/1.0.0/felix-1.0.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "felix", 
   "version": "1.0.0", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache", 
     "artifact_id": "apache", 
diff --git a/tests/packagedcode/data/m2/org/apache/felix/felix/1.0.0/felix-1.0.0.pom.package.json b/tests/packagedcode/data/m2/org/apache/felix/felix/1.0.0/felix-1.0.0.pom.package.json
index 3c8b5fc1fe0..bdf4df0d969 100644
--- a/tests/packagedcode/data/m2/org/apache/felix/felix/1.0.0/felix-1.0.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/felix/felix/1.0.0/felix-1.0.0.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.felix:felix", 
+  "type": "maven", 
+  "namespace": "org.apache.felix", 
+  "name": "felix", 
   "version": "1.0.0", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Apache felix is an OSGi implementation.", 
+  "description": "Apache Felix\nApache felix is an OSGi implementation.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,22 +23,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "easymock:easymock", 
-        "version": "1.2_Java1.3"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:easymock/easymock", 
+      "requirement": "1.2_Java1.3", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/felix/felix/1.0.2/felix-1.0.2.pom.json b/tests/packagedcode/data/m2/org/apache/felix/felix/1.0.2/felix-1.0.2.pom.json
index 979cc416445..42afbc624c0 100644
--- a/tests/packagedcode/data/m2/org/apache/felix/felix/1.0.2/felix-1.0.2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/felix/felix/1.0.2/felix-1.0.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "felix", 
   "version": "1.0.2", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache", 
     "artifact_id": "apache", 
diff --git a/tests/packagedcode/data/m2/org/apache/felix/felix/1.0.2/felix-1.0.2.pom.package.json b/tests/packagedcode/data/m2/org/apache/felix/felix/1.0.2/felix-1.0.2.pom.package.json
index f7c000fa905..e06b33f04aa 100644
--- a/tests/packagedcode/data/m2/org/apache/felix/felix/1.0.2/felix-1.0.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/felix/felix/1.0.2/felix-1.0.2.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.felix:felix", 
+  "type": "maven", 
+  "namespace": "org.apache.felix", 
+  "name": "felix", 
   "version": "1.0.2", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Apache felix is an OSGi implementation.", 
+  "description": "Apache Felix\nApache felix is an OSGi implementation.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,22 +23,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "easymock:easymock", 
-        "version": "1.2_Java1.3"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:easymock/easymock", 
+      "requirement": "1.2_Java1.3", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/felix/maven-bundle-plugin/1.4.0/maven-bundle-plugin-1.4.0.pom.json b/tests/packagedcode/data/m2/org/apache/felix/maven-bundle-plugin/1.4.0/maven-bundle-plugin-1.4.0.pom.json
index 0c04074669f..8f8e39de754 100644
--- a/tests/packagedcode/data/m2/org/apache/felix/maven-bundle-plugin/1.4.0/maven-bundle-plugin-1.4.0.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/felix/maven-bundle-plugin/1.4.0/maven-bundle-plugin-1.4.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-bundle-plugin", 
   "version": "1.4.0", 
   "classifier": null, 
-  "packaging ": "maven-plugin", 
+  "packaging": "maven-plugin", 
   "parent": {
     "group_id": "org.apache.felix", 
     "artifact_id": "felix", 
diff --git a/tests/packagedcode/data/m2/org/apache/felix/maven-bundle-plugin/1.4.0/maven-bundle-plugin-1.4.0.pom.package.json b/tests/packagedcode/data/m2/org/apache/felix/maven-bundle-plugin/1.4.0/maven-bundle-plugin-1.4.0.pom.package.json
index 98048327ddd..cf7efad9cb8 100644
--- a/tests/packagedcode/data/m2/org/apache/felix/maven-bundle-plugin/1.4.0/maven-bundle-plugin-1.4.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/felix/maven-bundle-plugin/1.4.0/maven-bundle-plugin-1.4.0.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.felix:maven-bundle-plugin", 
+  "type": "maven", 
+  "namespace": "org.apache.felix", 
+  "name": "maven-bundle-plugin", 
   "version": "1.4.0", 
+  "qualifiers": {
+    "packaging": "maven-plugin"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Provides a maven plugin that supports creating an OSGi bundle\n  from the contents of the compilation classpath along with its\n  resources and dependencies. Plus a zillion other features.\n  The plugin uses the Bnd tool (http://www.aqute.biz/Code/Bnd)", 
+  "description": "Maven Bundle Plugin\nProvides a maven plugin that supports creating an OSGi bundle\n  from the contents of the compilation classpath along with its\n  resources and dependencies. Plus a zillion other features.\n  The plugin uses the Bnd tool (http://www.aqute.biz/Code/Bnd)", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,109 +23,162 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "biz.aQute:bndlib", 
-        "version": "0.0.238"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "net.sf.kxml:kxml2", 
-        "version": "2.2.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "xmlpull:xmlpull", 
-        "version": "1.1.3.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.felix:org.osgi.core", 
-        "version": "1.0.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.felix:org.osgi.service.obr", 
-        "version": "1.0.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0.7"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "2.0.7"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0.7"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0.7"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-archiver", 
-        "version": "2.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact-manager", 
-        "version": "2.0.7"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-settings", 
-        "version": "2.0.7"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-dependency-tree", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-osgi", 
-        "version": "0.2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-provider-api", 
-        "version": "1.0-beta-2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-9-stable-1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-archiver", 
-        "version": "1.0-alpha-7"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.4.7"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-plugin-testing-harness", 
-        "version": "1.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:biz.aQute/bndlib", 
+      "requirement": "0.0.238", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:net.sf.kxml/kxml2", 
+      "requirement": "2.2.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:xmlpull/xmlpull", 
+      "requirement": "1.1.3.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.felix/org.osgi.core", 
+      "requirement": "1.0.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.felix/org.osgi.service.obr", 
+      "requirement": "1.0.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0.7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": "2.0.7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0.7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0.7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-archiver", 
+      "requirement": "2.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact-manager", 
+      "requirement": "2.0.7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-settings", 
+      "requirement": "2.0.7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-dependency-tree", 
+      "requirement": "1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-osgi", 
+      "requirement": "0.2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-provider-api", 
+      "requirement": "1.0-beta-2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-9-stable-1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-archiver", 
+      "requirement": "1.0-alpha-7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.4.7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-plugin-testing-harness", 
+      "requirement": "1.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/felix/org.osgi.core/1.0.0/org.osgi.core-1.0.0.pom.json b/tests/packagedcode/data/m2/org/apache/felix/org.osgi.core/1.0.0/org.osgi.core-1.0.0.pom.json
index faf287d8f3f..83675f0c9e6 100644
--- a/tests/packagedcode/data/m2/org/apache/felix/org.osgi.core/1.0.0/org.osgi.core-1.0.0.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/felix/org.osgi.core/1.0.0/org.osgi.core-1.0.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "org.osgi.core", 
   "version": "1.0.0", 
   "classifier": null, 
-  "packaging ": "bundle", 
+  "packaging": "bundle", 
   "parent": {
     "group_id": "org.apache.felix", 
     "artifact_id": "felix", 
diff --git a/tests/packagedcode/data/m2/org/apache/felix/org.osgi.core/1.0.0/org.osgi.core-1.0.0.pom.package.json b/tests/packagedcode/data/m2/org/apache/felix/org.osgi.core/1.0.0/org.osgi.core-1.0.0.pom.package.json
index 2c0a6e5e83a..20d3d4d21b2 100644
--- a/tests/packagedcode/data/m2/org/apache/felix/org.osgi.core/1.0.0/org.osgi.core-1.0.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/felix/org.osgi.core/1.0.0/org.osgi.core-1.0.0.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.felix:org.osgi.core", 
+  "type": "maven", 
+  "namespace": "org.apache.felix", 
+  "name": "org.osgi.core", 
   "version": "1.0.0", 
+  "qualifiers": {
+    "packaging": "bundle"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "OSGi Service Platform Release 4 Core Interfaces and Classes.", 
+  "description": "OSGi R4 Core Bundle\nOSGi Service Platform Release 4 Core Interfaces and Classes.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,9 +31,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/felix/org.osgi.service.obr/1.0.1/org.osgi.service.obr-1.0.1.pom.json b/tests/packagedcode/data/m2/org/apache/felix/org.osgi.service.obr/1.0.1/org.osgi.service.obr-1.0.1.pom.json
index ac17796fbcd..22c205fdd7f 100644
--- a/tests/packagedcode/data/m2/org/apache/felix/org.osgi.service.obr/1.0.1/org.osgi.service.obr-1.0.1.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/felix/org.osgi.service.obr/1.0.1/org.osgi.service.obr-1.0.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "org.osgi.service.obr", 
   "version": "1.0.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.felix", 
     "artifact_id": "felix", 
diff --git a/tests/packagedcode/data/m2/org/apache/felix/org.osgi.service.obr/1.0.1/org.osgi.service.obr-1.0.1.pom.package.json b/tests/packagedcode/data/m2/org/apache/felix/org.osgi.service.obr/1.0.1/org.osgi.service.obr-1.0.1.pom.package.json
index 6c1ea5a5355..4d36a8b154a 100644
--- a/tests/packagedcode/data/m2/org/apache/felix/org.osgi.service.obr/1.0.1/org.osgi.service.obr-1.0.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/felix/org.osgi.service.obr/1.0.1/org.osgi.service.obr-1.0.1.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.felix:org.osgi.service.obr", 
+  "type": "maven", 
+  "namespace": "org.apache.felix", 
+  "name": "org.osgi.service.obr", 
   "version": "1.0.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "OSGi OBR Service API", 
@@ -26,17 +29,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.felix:org.osgi.core", 
-        "version": "1.0.0"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.felix/org.osgi.core", 
+      "requirement": "1.0.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/geronimo/genesis/config/config/1.1/config-1.1.pom.json b/tests/packagedcode/data/m2/org/apache/geronimo/genesis/config/config/1.1/config-1.1.pom.json
index 5d95b8c2ef4..b031aa4b824 100644
--- a/tests/packagedcode/data/m2/org/apache/geronimo/genesis/config/config/1.1/config-1.1.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/geronimo/genesis/config/config/1.1/config-1.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "config", 
   "version": "1.1", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.geronimo.genesis", 
     "artifact_id": "genesis", 
diff --git a/tests/packagedcode/data/m2/org/apache/geronimo/genesis/config/config/1.1/config-1.1.pom.package.json b/tests/packagedcode/data/m2/org/apache/geronimo/genesis/config/config/1.1/config-1.1.pom.package.json
index 924a586ae01..cfe0e35dea8 100644
--- a/tests/packagedcode/data/m2/org/apache/geronimo/genesis/config/config/1.1/config-1.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/geronimo/genesis/config/config/1.1/config-1.1.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.geronimo.genesis.config:config", 
+  "type": "maven", 
+  "namespace": "org.apache.geronimo.genesis.config", 
+  "name": "config", 
   "version": "1.1", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Genesis Configuration", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/geronimo/genesis/config/project-config/1.1/project-config-1.1.pom.json b/tests/packagedcode/data/m2/org/apache/geronimo/genesis/config/project-config/1.1/project-config-1.1.pom.json
index e66478f1713..c244a8fe950 100644
--- a/tests/packagedcode/data/m2/org/apache/geronimo/genesis/config/project-config/1.1/project-config-1.1.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/geronimo/genesis/config/project-config/1.1/project-config-1.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "project-config", 
   "version": "1.1", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.geronimo.genesis.config", 
     "artifact_id": "config", 
diff --git a/tests/packagedcode/data/m2/org/apache/geronimo/genesis/config/project-config/1.1/project-config-1.1.pom.package.json b/tests/packagedcode/data/m2/org/apache/geronimo/genesis/config/project-config/1.1/project-config-1.1.pom.package.json
index 07f1955261e..31d52943bbe 100644
--- a/tests/packagedcode/data/m2/org/apache/geronimo/genesis/config/project-config/1.1/project-config-1.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/geronimo/genesis/config/project-config/1.1/project-config-1.1.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.geronimo.genesis.config:project-config", 
+  "type": "maven", 
+  "namespace": "org.apache.geronimo.genesis.config", 
+  "name": "project-config", 
   "version": "1.1", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Genesis project-config provides the common project configuration shared\n        by all Apache Geronimo projects.", 
+  "description": "Genesis Configuration :: Project\nGenesis project-config provides the common project configuration shared\n        by all Apache Geronimo projects.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,22 +31,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.geronimo.genesis.config:logging-config", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.geronimo.genesis.config/logging-config", 
+      "requirement": "1.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/geronimo/genesis/genesis/1.1/genesis-1.1.pom.json b/tests/packagedcode/data/m2/org/apache/geronimo/genesis/genesis/1.1/genesis-1.1.pom.json
index 2b3b1178a71..46d3abcb6ea 100644
--- a/tests/packagedcode/data/m2/org/apache/geronimo/genesis/genesis/1.1/genesis-1.1.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/geronimo/genesis/genesis/1.1/genesis-1.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "genesis", 
   "version": "1.1", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache", 
     "artifact_id": "apache", 
diff --git a/tests/packagedcode/data/m2/org/apache/geronimo/genesis/genesis/1.1/genesis-1.1.pom.package.json b/tests/packagedcode/data/m2/org/apache/geronimo/genesis/genesis/1.1/genesis-1.1.pom.package.json
index e21c9225ff4..6ee4089f57e 100644
--- a/tests/packagedcode/data/m2/org/apache/geronimo/genesis/genesis/1.1/genesis-1.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/geronimo/genesis/genesis/1.1/genesis-1.1.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.geronimo.genesis:genesis", 
+  "type": "maven", 
+  "namespace": "org.apache.geronimo.genesis", 
+  "name": "genesis", 
   "version": "1.1", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Genesis provides support for Maven2 builds; adding shared configurations\n        and common plugins.", 
+  "description": "Genesis\nGenesis provides support for Maven2 builds; adding shared configurations\n        and common plugins.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/geronimo/specs/geronimo-jsp_2.0_spec/1.1/geronimo-jsp_2.0_spec-1.1.pom.json b/tests/packagedcode/data/m2/org/apache/geronimo/specs/geronimo-jsp_2.0_spec/1.1/geronimo-jsp_2.0_spec-1.1.pom.json
index ff21fc45f74..4c0818f3183 100644
--- a/tests/packagedcode/data/m2/org/apache/geronimo/specs/geronimo-jsp_2.0_spec/1.1/geronimo-jsp_2.0_spec-1.1.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/geronimo/specs/geronimo-jsp_2.0_spec/1.1/geronimo-jsp_2.0_spec-1.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "geronimo-jsp_2.0_spec", 
   "version": "1.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.geronimo.specs", 
     "artifact_id": "specs", 
diff --git a/tests/packagedcode/data/m2/org/apache/geronimo/specs/geronimo-jsp_2.0_spec/1.1/geronimo-jsp_2.0_spec-1.1.pom.package.json b/tests/packagedcode/data/m2/org/apache/geronimo/specs/geronimo-jsp_2.0_spec/1.1/geronimo-jsp_2.0_spec-1.1.pom.package.json
index d0652fc5858..5f0261729a1 100644
--- a/tests/packagedcode/data/m2/org/apache/geronimo/specs/geronimo-jsp_2.0_spec/1.1/geronimo-jsp_2.0_spec-1.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/geronimo/specs/geronimo-jsp_2.0_spec/1.1/geronimo-jsp_2.0_spec-1.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.geronimo.specs:geronimo-jsp_2.0_spec", 
+  "type": "maven", 
+  "namespace": "org.apache.geronimo.specs", 
+  "name": "geronimo-jsp_2.0_spec", 
   "version": "1.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "JSP 2.0", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.geronimo.specs:geronimo-servlet_2.4_spec", 
-        "version": "1.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.geronimo.specs/geronimo-servlet_2.4_spec", 
+      "requirement": "1.1", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/geronimo/specs/geronimo-servlet_2.4_spec/1.1.1/geronimo-servlet_2.4_spec-1.1.1.pom.json b/tests/packagedcode/data/m2/org/apache/geronimo/specs/geronimo-servlet_2.4_spec/1.1.1/geronimo-servlet_2.4_spec-1.1.1.pom.json
index 58934555966..5e593811399 100644
--- a/tests/packagedcode/data/m2/org/apache/geronimo/specs/geronimo-servlet_2.4_spec/1.1.1/geronimo-servlet_2.4_spec-1.1.1.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/geronimo/specs/geronimo-servlet_2.4_spec/1.1.1/geronimo-servlet_2.4_spec-1.1.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "geronimo-servlet_2.4_spec", 
   "version": "1.1.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.geronimo.specs", 
     "artifact_id": "specs", 
diff --git a/tests/packagedcode/data/m2/org/apache/geronimo/specs/geronimo-servlet_2.4_spec/1.1.1/geronimo-servlet_2.4_spec-1.1.1.pom.package.json b/tests/packagedcode/data/m2/org/apache/geronimo/specs/geronimo-servlet_2.4_spec/1.1.1/geronimo-servlet_2.4_spec-1.1.1.pom.package.json
index ca689308ef8..817d530975c 100644
--- a/tests/packagedcode/data/m2/org/apache/geronimo/specs/geronimo-servlet_2.4_spec/1.1.1/geronimo-servlet_2.4_spec-1.1.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/geronimo/specs/geronimo-servlet_2.4_spec/1.1.1/geronimo-servlet_2.4_spec-1.1.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.geronimo.specs:geronimo-servlet_2.4_spec", 
+  "type": "maven", 
+  "namespace": "org.apache.geronimo.specs", 
+  "name": "geronimo-servlet_2.4_spec", 
   "version": "1.1.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Servlet 2.4", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/geronimo/specs/specs/1.2/specs-1.2.pom.json b/tests/packagedcode/data/m2/org/apache/geronimo/specs/specs/1.2/specs-1.2.pom.json
index e17f91bb705..836b48e97fe 100644
--- a/tests/packagedcode/data/m2/org/apache/geronimo/specs/specs/1.2/specs-1.2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/geronimo/specs/specs/1.2/specs-1.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "specs", 
   "version": "1.2", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.geronimo.genesis.config", 
     "artifact_id": "project-config", 
diff --git a/tests/packagedcode/data/m2/org/apache/geronimo/specs/specs/1.2/specs-1.2.pom.package.json b/tests/packagedcode/data/m2/org/apache/geronimo/specs/specs/1.2/specs-1.2.pom.package.json
index 6084d787f0f..af694879430 100644
--- a/tests/packagedcode/data/m2/org/apache/geronimo/specs/specs/1.2/specs-1.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/geronimo/specs/specs/1.2/specs-1.2.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.geronimo.specs:specs", 
+  "type": "maven", 
+  "namespace": "org.apache.geronimo.specs", 
+  "name": "specs", 
   "version": "1.2", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Provides open-source implementations of Sun specifications.", 
+  "description": "Geronimo Specifications\nProvides open-source implementations of Sun specifications.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +23,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-core/1.0-alpha-10/doxia-core-1.0-alpha-10.pom.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-core/1.0-alpha-10/doxia-core-1.0-alpha-10.pom.json
index 7dd11e644ed..e9857c7eb87 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-core/1.0-alpha-10/doxia-core-1.0-alpha-10.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-core/1.0-alpha-10/doxia-core-1.0-alpha-10.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "doxia-core", 
   "version": "1.0-alpha-10", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.doxia", 
     "artifact_id": "doxia", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-core/1.0-alpha-10/doxia-core-1.0-alpha-10.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-core/1.0-alpha-10/doxia-core-1.0-alpha-10.pom.package.json
index fec5c14f00a..8fa5e94b232 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-core/1.0-alpha-10/doxia-core-1.0-alpha-10.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-core/1.0-alpha-10/doxia-core-1.0-alpha-10.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.doxia:doxia-core", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.doxia", 
+  "name": "doxia-core", 
   "version": "1.0-alpha-10", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Doxia core classes and interfaces.", 
+  "description": "Doxia :: Core\nDoxia core classes and interfaces.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,27 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.doxia:doxia-sink-api", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven.doxia/doxia-sink-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-core/1.0-alpha-7/doxia-core-1.0-alpha-7.pom.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-core/1.0-alpha-7/doxia-core-1.0-alpha-7.pom.json
index 761d69084f2..389a4cebd17 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-core/1.0-alpha-7/doxia-core-1.0-alpha-7.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-core/1.0-alpha-7/doxia-core-1.0-alpha-7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "doxia-core", 
   "version": "1.0-alpha-7", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.doxia", 
     "artifact_id": "doxia", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-core/1.0-alpha-7/doxia-core-1.0-alpha-7.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-core/1.0-alpha-7/doxia-core-1.0-alpha-7.pom.package.json
index 6d017932402..f19fc1d5a0d 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-core/1.0-alpha-7/doxia-core-1.0-alpha-7.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-core/1.0-alpha-7/doxia-core-1.0-alpha-7.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.doxia:doxia-core", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.doxia", 
+  "name": "doxia-core", 
   "version": "1.0-alpha-7", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Doxia Core", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,34 +21,42 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "oro:oro", 
-        "version": "2.0.7"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.doxia:doxia-sink-api", 
-        "version": "1.0-alpha-7"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.0.4"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-8"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:oro/oro", 
+      "requirement": "2.0.7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.doxia/doxia-sink-api", 
+      "requirement": "1.0-alpha-7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-8", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-core/1.0-alpha-8/doxia-core-1.0-alpha-8.pom.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-core/1.0-alpha-8/doxia-core-1.0-alpha-8.pom.json
index 277edd9128b..3fa89ce65fa 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-core/1.0-alpha-8/doxia-core-1.0-alpha-8.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-core/1.0-alpha-8/doxia-core-1.0-alpha-8.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "doxia-core", 
   "version": "1.0-alpha-8", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.doxia", 
     "artifact_id": "doxia", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-core/1.0-alpha-8/doxia-core-1.0-alpha-8.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-core/1.0-alpha-8/doxia-core-1.0-alpha-8.pom.package.json
index 3f8743ac1eb..ab181a73665 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-core/1.0-alpha-8/doxia-core-1.0-alpha-8.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-core/1.0-alpha-8/doxia-core-1.0-alpha-8.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.doxia:doxia-core", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.doxia", 
+  "name": "doxia-core", 
   "version": "1.0-alpha-8", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Doxia Core", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,34 +21,42 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "oro:oro", 
-        "version": "2.0.7"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.doxia:doxia-sink-api", 
-        "version": "1.0-alpha-8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.0.4"
-      }
-    ], 
-    "runtime": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-8"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:oro/oro", 
+      "requirement": "2.0.7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.doxia/doxia-sink-api", 
+      "requirement": "1.0-alpha-8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-8", 
+      "scope": "runtime", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-decoration-model/1.0-alpha-10/doxia-decoration-model-1.0-alpha-10.pom.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-decoration-model/1.0-alpha-10/doxia-decoration-model-1.0-alpha-10.pom.json
index d3df76509e3..fa8b1360dd1 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-decoration-model/1.0-alpha-10/doxia-decoration-model-1.0-alpha-10.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-decoration-model/1.0-alpha-10/doxia-decoration-model-1.0-alpha-10.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "doxia-decoration-model", 
   "version": "1.0-alpha-10", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.doxia", 
     "artifact_id": "doxia-sitetools", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-decoration-model/1.0-alpha-10/doxia-decoration-model-1.0-alpha-10.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-decoration-model/1.0-alpha-10/doxia-decoration-model-1.0-alpha-10.pom.package.json
index ac104d853e4..eb2e6555544 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-decoration-model/1.0-alpha-10/doxia-decoration-model-1.0-alpha-10.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-decoration-model/1.0-alpha-10/doxia-decoration-model-1.0-alpha-10.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.doxia:doxia-decoration-model", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.doxia", 
+  "name": "doxia-decoration-model", 
   "version": "1.0-alpha-10", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "The Decoration Model handles the site descriptor, also known as site.xml.", 
+  "description": "Doxia Decoration Model\nThe Decoration Model handles the site descriptor, also known as site.xml.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-decoration-model/1.0-alpha-7/doxia-decoration-model-1.0-alpha-7.pom.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-decoration-model/1.0-alpha-7/doxia-decoration-model-1.0-alpha-7.pom.json
index f8ce9df9667..f887c659437 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-decoration-model/1.0-alpha-7/doxia-decoration-model-1.0-alpha-7.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-decoration-model/1.0-alpha-7/doxia-decoration-model-1.0-alpha-7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "doxia-decoration-model", 
   "version": "1.0-alpha-7", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.doxia", 
     "artifact_id": "doxia", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-decoration-model/1.0-alpha-7/doxia-decoration-model-1.0-alpha-7.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-decoration-model/1.0-alpha-7/doxia-decoration-model-1.0-alpha-7.pom.package.json
index 7edc6f14bde..3dfe8838a7a 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-decoration-model/1.0-alpha-7/doxia-decoration-model-1.0-alpha-7.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-decoration-model/1.0-alpha-7/doxia-decoration-model-1.0-alpha-7.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.doxia:doxia-decoration-model", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.doxia", 
+  "name": "doxia-decoration-model", 
   "version": "1.0-alpha-7", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Doxia Decoration Model", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,24 +21,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ], 
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.0.4"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-decoration-model/1.0-alpha-8/doxia-decoration-model-1.0-alpha-8.pom.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-decoration-model/1.0-alpha-8/doxia-decoration-model-1.0-alpha-8.pom.json
index d39580b2e66..0dad961657d 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-decoration-model/1.0-alpha-8/doxia-decoration-model-1.0-alpha-8.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-decoration-model/1.0-alpha-8/doxia-decoration-model-1.0-alpha-8.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "doxia-decoration-model", 
   "version": "1.0-alpha-8", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.doxia", 
     "artifact_id": "doxia", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-decoration-model/1.0-alpha-8/doxia-decoration-model-1.0-alpha-8.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-decoration-model/1.0-alpha-8/doxia-decoration-model-1.0-alpha-8.pom.package.json
index 1b227e70444..88721403c21 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-decoration-model/1.0-alpha-8/doxia-decoration-model-1.0-alpha-8.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-decoration-model/1.0-alpha-8/doxia-decoration-model-1.0-alpha-8.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.doxia:doxia-decoration-model", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.doxia", 
+  "name": "doxia-decoration-model", 
   "version": "1.0-alpha-8", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Doxia Decoration Model", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,24 +21,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ], 
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.0.4"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-apt/1.0-alpha-10/doxia-module-apt-1.0-alpha-10.pom.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-apt/1.0-alpha-10/doxia-module-apt-1.0-alpha-10.pom.json
index a569d819a2e..24cf3aba6b7 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-apt/1.0-alpha-10/doxia-module-apt-1.0-alpha-10.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-apt/1.0-alpha-10/doxia-module-apt-1.0-alpha-10.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "doxia-module-apt", 
   "version": "1.0-alpha-10", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.doxia", 
     "artifact_id": "doxia-modules", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-apt/1.0-alpha-10/doxia-module-apt-1.0-alpha-10.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-apt/1.0-alpha-10/doxia-module-apt-1.0-alpha-10.pom.package.json
index 5dbc3907487..37e43048c30 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-apt/1.0-alpha-10/doxia-module-apt-1.0-alpha-10.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-apt/1.0-alpha-10/doxia-module-apt-1.0-alpha-10.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.doxia:doxia-module-apt", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.doxia", 
+  "name": "doxia-module-apt", 
   "version": "1.0-alpha-10", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "A Doxia module for Almost Plain Text source documents.", 
+  "description": "Doxia :: APT Module\nA Doxia module for Almost Plain Text source documents.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-fml/1.0-alpha-10/doxia-module-fml-1.0-alpha-10.pom.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-fml/1.0-alpha-10/doxia-module-fml-1.0-alpha-10.pom.json
index 543ab1d8350..29ac680c57b 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-fml/1.0-alpha-10/doxia-module-fml-1.0-alpha-10.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-fml/1.0-alpha-10/doxia-module-fml-1.0-alpha-10.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "doxia-module-fml", 
   "version": "1.0-alpha-10", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.doxia", 
     "artifact_id": "doxia-modules", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-fml/1.0-alpha-10/doxia-module-fml-1.0-alpha-10.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-fml/1.0-alpha-10/doxia-module-fml-1.0-alpha-10.pom.package.json
index ebfbeb95222..65a0e72434a 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-fml/1.0-alpha-10/doxia-module-fml-1.0-alpha-10.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-fml/1.0-alpha-10/doxia-module-fml-1.0-alpha-10.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.doxia:doxia-module-fml", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.doxia", 
+  "name": "doxia-module-fml", 
   "version": "1.0-alpha-10", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "A Doxia module for FML source documents.", 
+  "description": "Doxia :: FML Module\nA Doxia module for FML source documents.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-xdoc/1.0-alpha-10/doxia-module-xdoc-1.0-alpha-10.pom.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-xdoc/1.0-alpha-10/doxia-module-xdoc-1.0-alpha-10.pom.json
index 9cfd6f4cbab..b34efc4d3b8 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-xdoc/1.0-alpha-10/doxia-module-xdoc-1.0-alpha-10.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-xdoc/1.0-alpha-10/doxia-module-xdoc-1.0-alpha-10.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "doxia-module-xdoc", 
   "version": "1.0-alpha-10", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.doxia", 
     "artifact_id": "doxia-modules", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-xdoc/1.0-alpha-10/doxia-module-xdoc-1.0-alpha-10.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-xdoc/1.0-alpha-10/doxia-module-xdoc-1.0-alpha-10.pom.package.json
index b143b053976..20f231b060e 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-xdoc/1.0-alpha-10/doxia-module-xdoc-1.0-alpha-10.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-xdoc/1.0-alpha-10/doxia-module-xdoc-1.0-alpha-10.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.doxia:doxia-module-xdoc", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.doxia", 
+  "name": "doxia-module-xdoc", 
   "version": "1.0-alpha-10", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "A Doxia module for Xdoc source documents.", 
+  "description": "Doxia :: XDoc Module\nA Doxia module for Xdoc source documents.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-xhtml/1.0-alpha-10/doxia-module-xhtml-1.0-alpha-10.pom.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-xhtml/1.0-alpha-10/doxia-module-xhtml-1.0-alpha-10.pom.json
index 959948ba031..8baa8c02b18 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-xhtml/1.0-alpha-10/doxia-module-xhtml-1.0-alpha-10.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-xhtml/1.0-alpha-10/doxia-module-xhtml-1.0-alpha-10.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "doxia-module-xhtml", 
   "version": "1.0-alpha-10", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.doxia", 
     "artifact_id": "doxia-modules", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-xhtml/1.0-alpha-10/doxia-module-xhtml-1.0-alpha-10.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-xhtml/1.0-alpha-10/doxia-module-xhtml-1.0-alpha-10.pom.package.json
index 2c2a481f212..8ae01f6e2f1 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-xhtml/1.0-alpha-10/doxia-module-xhtml-1.0-alpha-10.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-module-xhtml/1.0-alpha-10/doxia-module-xhtml-1.0-alpha-10.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.doxia:doxia-module-xhtml", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.doxia", 
+  "name": "doxia-module-xhtml", 
   "version": "1.0-alpha-10", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "A Doxia module for Xhtml source documents.", 
+  "description": "Doxia :: XHTML Module\nA Doxia module for Xhtml source documents.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-modules/1.0-alpha-10/doxia-modules-1.0-alpha-10.pom.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-modules/1.0-alpha-10/doxia-modules-1.0-alpha-10.pom.json
index 7d8d3daed31..c160113a4fa 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-modules/1.0-alpha-10/doxia-modules-1.0-alpha-10.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-modules/1.0-alpha-10/doxia-modules-1.0-alpha-10.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "doxia-modules", 
   "version": "1.0-alpha-10", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven.doxia", 
     "artifact_id": "doxia", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-modules/1.0-alpha-10/doxia-modules-1.0-alpha-10.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-modules/1.0-alpha-10/doxia-modules-1.0-alpha-10.pom.package.json
index 1ccd347745b..d79462fcbe5 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-modules/1.0-alpha-10/doxia-modules-1.0-alpha-10.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-modules/1.0-alpha-10/doxia-modules-1.0-alpha-10.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.doxia:doxia-modules", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.doxia", 
+  "name": "doxia-modules", 
   "version": "1.0-alpha-10", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Doxia modules for several markup languages.", 
+  "description": "Doxia :: Modules\nDoxia modules for several markup languages.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,29 +23,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.doxia:doxia-core", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.doxia:doxia-sink-api", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.doxia:doxia-core", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven.doxia/doxia-core", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.doxia/doxia-sink-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.doxia/doxia-core", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom.json
index c584ce1bedf..6f1e3092c25 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "doxia-sink-api", 
   "version": "1.0-alpha-10", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.doxia", 
     "artifact_id": "doxia", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom.package.json
index 1e6cd71e972..62c49a88a7b 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-10/doxia-sink-api-1.0-alpha-10.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.doxia:doxia-sink-api", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.doxia", 
+  "name": "doxia-sink-api", 
   "version": "1.0-alpha-10", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Doxia Sink API.", 
+  "description": "Doxia :: Sink API\nDoxia Sink API.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom.json
index 9e0d627d662..1f1f843886f 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "doxia-sink-api", 
   "version": "1.0-alpha-7", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.doxia", 
     "artifact_id": "doxia", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom.package.json
index f4e73bed67b..e18c878c964 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.doxia:doxia-sink-api", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.doxia", 
+  "name": "doxia-sink-api", 
   "version": "1.0-alpha-7", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Doxia Sink API", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-8/doxia-sink-api-1.0-alpha-8.pom.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-8/doxia-sink-api-1.0-alpha-8.pom.json
index 3240522ae60..3e69db9eb66 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-8/doxia-sink-api-1.0-alpha-8.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-8/doxia-sink-api-1.0-alpha-8.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "doxia-sink-api", 
   "version": "1.0-alpha-8", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.doxia", 
     "artifact_id": "doxia", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-8/doxia-sink-api-1.0-alpha-8.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-8/doxia-sink-api-1.0-alpha-8.pom.package.json
index ba1691f9a24..e714d677818 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-8/doxia-sink-api-1.0-alpha-8.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-8/doxia-sink-api-1.0-alpha-8.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.doxia:doxia-sink-api", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.doxia", 
+  "name": "doxia-sink-api", 
   "version": "1.0-alpha-8", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Doxia Sink API", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-9/doxia-sink-api-1.0-alpha-9.pom.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-9/doxia-sink-api-1.0-alpha-9.pom.json
index f24f56197ed..a8e6681fada 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-9/doxia-sink-api-1.0-alpha-9.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-9/doxia-sink-api-1.0-alpha-9.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "doxia-sink-api", 
   "version": "1.0-alpha-9", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.doxia", 
     "artifact_id": "doxia", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-9/doxia-sink-api-1.0-alpha-9.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-9/doxia-sink-api-1.0-alpha-9.pom.package.json
index 96688c42a3e..b1629b1f9c7 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-9/doxia-sink-api-1.0-alpha-9.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-9/doxia-sink-api-1.0-alpha-9.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.doxia:doxia-sink-api", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.doxia", 
+  "name": "doxia-sink-api", 
   "version": "1.0-alpha-9", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Doxia Sink API.", 
+  "description": "Doxia :: Sink API\nDoxia Sink API.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-site-renderer/1.0-alpha-10/doxia-site-renderer-1.0-alpha-10.pom.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-site-renderer/1.0-alpha-10/doxia-site-renderer-1.0-alpha-10.pom.json
index 93c769f117c..9ca80a50af2 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-site-renderer/1.0-alpha-10/doxia-site-renderer-1.0-alpha-10.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-site-renderer/1.0-alpha-10/doxia-site-renderer-1.0-alpha-10.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "doxia-site-renderer", 
   "version": "1.0-alpha-10", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.doxia", 
     "artifact_id": "doxia-sitetools", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-site-renderer/1.0-alpha-10/doxia-site-renderer-1.0-alpha-10.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-site-renderer/1.0-alpha-10/doxia-site-renderer-1.0-alpha-10.pom.package.json
index 9fe19e79f14..e6c5b69e417 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-site-renderer/1.0-alpha-10/doxia-site-renderer-1.0-alpha-10.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-site-renderer/1.0-alpha-10/doxia-site-renderer-1.0-alpha-10.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.doxia:doxia-site-renderer", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.doxia", 
+  "name": "doxia-site-renderer", 
   "version": "1.0-alpha-10", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "The Site Renderer handles the rendering of sites.", 
+  "description": "Doxia Site Renderer Component\nThe Site Renderer handles the rendering of sites.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,84 +29,122 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.doxia:doxia-core", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.doxia:doxia-sink-api", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-i18n", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-velocity", 
-        "version": "1.1.7"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.velocity:velocity", 
-        "version": "1.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.doxia:doxia-decoration-model", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-collections:commons-collections", 
-        "version": "3.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.doxia:doxia-module-apt", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.doxia:doxia-module-fml", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.doxia:doxia-module-xdoc", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.doxia:doxia-module-xhtml", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "htmlunit:htmlunit", 
-        "version": "1.9"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven.doxia/doxia-core", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.doxia/doxia-sink-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-i18n", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-velocity", 
+      "requirement": "1.1.7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.velocity/velocity", 
+      "requirement": "1.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.doxia/doxia-decoration-model", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-collections/commons-collections", 
+      "requirement": "3.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.doxia/doxia-module-apt", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.doxia/doxia-module-fml", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.doxia/doxia-module-xdoc", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.doxia/doxia-module-xhtml", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:htmlunit/htmlunit", 
+      "requirement": "1.9", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-site-renderer/1.0-alpha-7/doxia-site-renderer-1.0-alpha-7.pom.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-site-renderer/1.0-alpha-7/doxia-site-renderer-1.0-alpha-7.pom.json
index 659129b6016..9cf6e9bc521 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-site-renderer/1.0-alpha-7/doxia-site-renderer-1.0-alpha-7.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-site-renderer/1.0-alpha-7/doxia-site-renderer-1.0-alpha-7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "doxia-site-renderer", 
   "version": "1.0-alpha-7", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.doxia", 
     "artifact_id": "doxia", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-site-renderer/1.0-alpha-7/doxia-site-renderer-1.0-alpha-7.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-site-renderer/1.0-alpha-7/doxia-site-renderer-1.0-alpha-7.pom.package.json
index 89b1d9323ca..d8ae07a5961 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-site-renderer/1.0-alpha-7/doxia-site-renderer-1.0-alpha-7.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-site-renderer/1.0-alpha-7/doxia-site-renderer-1.0-alpha-7.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.doxia:doxia-site-renderer", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.doxia", 
+  "name": "doxia-site-renderer", 
   "version": "1.0-alpha-7", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Doxia Site Renderer Component", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,32 +29,42 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.doxia:doxia-core", 
-        "version": "1.0-alpha-7"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-i18n", 
-        "version": "1.0-beta-6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-velocity", 
-        "version": "1.1.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.doxia:doxia-decoration-model", 
-        "version": "1.0-alpha-7"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven.doxia/doxia-core", 
+      "requirement": "1.0-alpha-7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-i18n", 
+      "requirement": "1.0-beta-6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-velocity", 
+      "requirement": "1.1.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.doxia/doxia-decoration-model", 
+      "requirement": "1.0-alpha-7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-site-renderer/1.0-alpha-8/doxia-site-renderer-1.0-alpha-8.pom.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-site-renderer/1.0-alpha-8/doxia-site-renderer-1.0-alpha-8.pom.json
index 440de1544a4..da64aac2487 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-site-renderer/1.0-alpha-8/doxia-site-renderer-1.0-alpha-8.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-site-renderer/1.0-alpha-8/doxia-site-renderer-1.0-alpha-8.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "doxia-site-renderer", 
   "version": "1.0-alpha-8", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.doxia", 
     "artifact_id": "doxia", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-site-renderer/1.0-alpha-8/doxia-site-renderer-1.0-alpha-8.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-site-renderer/1.0-alpha-8/doxia-site-renderer-1.0-alpha-8.pom.package.json
index e68c27db317..c941e6553a3 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-site-renderer/1.0-alpha-8/doxia-site-renderer-1.0-alpha-8.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-site-renderer/1.0-alpha-8/doxia-site-renderer-1.0-alpha-8.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.doxia:doxia-site-renderer", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.doxia", 
+  "name": "doxia-site-renderer", 
   "version": "1.0-alpha-8", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Doxia Site Renderer Component", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,32 +29,42 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.doxia:doxia-core", 
-        "version": "1.0-alpha-8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-i18n", 
-        "version": "1.0-beta-6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-velocity", 
-        "version": "1.1.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.doxia:doxia-decoration-model", 
-        "version": "1.0-alpha-8"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven.doxia/doxia-core", 
+      "requirement": "1.0-alpha-8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-i18n", 
+      "requirement": "1.0-beta-6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-velocity", 
+      "requirement": "1.1.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.doxia/doxia-decoration-model", 
+      "requirement": "1.0-alpha-8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sitetools/1.0-alpha-10/doxia-sitetools-1.0-alpha-10.pom.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sitetools/1.0-alpha-10/doxia-sitetools-1.0-alpha-10.pom.json
index 87f72eac187..cd832455fd9 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sitetools/1.0-alpha-10/doxia-sitetools-1.0-alpha-10.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sitetools/1.0-alpha-10/doxia-sitetools-1.0-alpha-10.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "doxia-sitetools", 
   "version": "1.0-alpha-10", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven-parent", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sitetools/1.0-alpha-10/doxia-sitetools-1.0-alpha-10.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sitetools/1.0-alpha-10/doxia-sitetools-1.0-alpha-10.pom.package.json
index 3fc15fca425..905ed39f83f 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sitetools/1.0-alpha-10/doxia-sitetools-1.0-alpha-10.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia-sitetools/1.0-alpha-10/doxia-sitetools-1.0-alpha-10.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.doxia:doxia-sitetools", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.doxia", 
+  "name": "doxia-sitetools", 
   "version": "1.0-alpha-10", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Doxia Sitetools generates sites, consisting of static and dynamic content that was generated by Doxia.", 
+  "description": "Doxia Sitetools\nDoxia Sitetools generates sites, consisting of static and dynamic content that was generated by Doxia.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +23,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.2"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.2", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom.json
index 5faa3615ce5..2f1fe5fdc29 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "doxia", 
   "version": "1.0-alpha-10", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven-parent", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom.package.json
index a85197dbee7..934525af47a 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-10/doxia-1.0-alpha-10.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.doxia:doxia", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.doxia", 
+  "name": "doxia", 
   "version": "1.0-alpha-10", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Doxia is a content generation framework that provides powerful techniques for generating static and dynamic content, supporting a variety of markup languages.", 
+  "description": "Doxia\nDoxia is a content generation framework that provides powerful techniques for generating static and dynamic content, supporting a variety of markup languages.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +23,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.2"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.2", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom.json
index ab3a5a13037..f1c241435ea 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "doxia", 
   "version": "1.0-alpha-7", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Doxia", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom.package.json
index a0c3d9df812..5fe59ca6476 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.doxia:doxia", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.doxia", 
+  "name": "doxia", 
   "version": "1.0-alpha-7", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Doxia", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -40,9 +45,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-8/doxia-1.0-alpha-8.pom.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-8/doxia-1.0-alpha-8.pom.json
index e1bb8cf2282..cbcfeac95bb 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-8/doxia-1.0-alpha-8.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-8/doxia-1.0-alpha-8.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "doxia", 
   "version": "1.0-alpha-8", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven-parent", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-8/doxia-1.0-alpha-8.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-8/doxia-1.0-alpha-8.pom.package.json
index cb41eb907f7..a3a5a95548f 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-8/doxia-1.0-alpha-8.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-8/doxia-1.0-alpha-8.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.doxia:doxia", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.doxia", 
+  "name": "doxia", 
   "version": "1.0-alpha-8", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Doxia", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-9/doxia-1.0-alpha-9.pom.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-9/doxia-1.0-alpha-9.pom.json
index 612b1d20a6e..cc7973b6796 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-9/doxia-1.0-alpha-9.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-9/doxia-1.0-alpha-9.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "doxia", 
   "version": "1.0-alpha-9", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven-parent", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-9/doxia-1.0-alpha-9.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-9/doxia-1.0-alpha-9.pom.package.json
index bb343699e8f..6382ceaf24f 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-9/doxia-1.0-alpha-9.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/doxia/doxia/1.0-alpha-9/doxia-1.0-alpha-9.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.doxia:doxia", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.doxia", 
+  "name": "doxia", 
   "version": "1.0-alpha-9", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Doxia is a content generation framework that provides powerful techniques for generating static and dynamic content, supporting a variety of markup languages.", 
+  "description": "Doxia\nDoxia is a content generation framework that provides powerful techniques for generating static and dynamic content, supporting a variety of markup languages.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +23,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.2"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.2", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-archiver/2.2/maven-archiver-2.2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-archiver/2.2/maven-archiver-2.2.pom.json
index a7a918c94bd..1eb5f2d59ab 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-archiver/2.2/maven-archiver-2.2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-archiver/2.2/maven-archiver-2.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-archiver", 
   "version": "2.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.shared", 
     "artifact_id": "maven-shared-components", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-archiver/2.2/maven-archiver-2.2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-archiver/2.2/maven-archiver-2.2.pom.package.json
index aa5a3141d28..161e4b2beee 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-archiver/2.2/maven-archiver-2.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-archiver/2.2/maven-archiver-2.2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-archiver", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-archiver", 
   "version": "2.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Archiver", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,27 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-archiver", 
-        "version": "1.0-alpha-7"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-archiver", 
+      "requirement": "1.0-alpha-7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom.json
index d0ab9eb633e..3378b49ce4e 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-archiver", 
   "version": "2.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.shared", 
     "artifact_id": "maven-shared-components", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom.package.json
index 3dd9bf376a4..f8dd2b0f7be 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-archiver/2.3/maven-archiver-2.3.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-archiver", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-archiver", 
   "version": "2.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Archiver", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,44 +21,58 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-archiver", 
-        "version": "1.0-alpha-9"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.4.9"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-archiver", 
+      "requirement": "1.0-alpha-9", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.4.9", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.1/maven-artifact-manager-2.0.1.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.1/maven-artifact-manager-2.0.1.pom.json
index b22b8822737..9297dde4dab 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.1/maven-artifact-manager-2.0.1.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.1/maven-artifact-manager-2.0.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-artifact-manager", 
   "version": "2.0.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.1/maven-artifact-manager-2.0.1.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.1/maven-artifact-manager-2.0.1.pom.package.json
index 9a17c823f98..c263d3bb508 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.1/maven-artifact-manager-2.0.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.1/maven-artifact-manager-2.0.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-artifact-manager", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-artifact-manager", 
   "version": "2.0.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Artifact Manager", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,44 +21,58 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-repository-metadata", 
-        "version": "2.0.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-provider-api", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-file", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-repository-metadata", 
+      "requirement": "2.0.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-provider-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-file", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom.json
index ac1aa321d42..11296702960 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-artifact-manager", 
   "version": "2.0.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom.package.json
index ced70885540..c2f3f202d24 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.2/maven-artifact-manager-2.0.2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-artifact-manager", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-artifact-manager", 
   "version": "2.0.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Artifact Manager", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,44 +21,58 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-repository-metadata", 
-        "version": "2.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-provider-api", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-file", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-repository-metadata", 
+      "requirement": "2.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-provider-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-file", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.4/maven-artifact-manager-2.0.4.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.4/maven-artifact-manager-2.0.4.pom.json
index ef3b7223b7f..643642b44f1 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.4/maven-artifact-manager-2.0.4.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.4/maven-artifact-manager-2.0.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-artifact-manager", 
   "version": "2.0.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.4/maven-artifact-manager-2.0.4.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.4/maven-artifact-manager-2.0.4.pom.package.json
index 1391489424a..6c94fb4fc87 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.4/maven-artifact-manager-2.0.4.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.4/maven-artifact-manager-2.0.4.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-artifact-manager", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-artifact-manager", 
   "version": "2.0.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Artifact Manager", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,44 +21,58 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-repository-metadata", 
-        "version": "2.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-provider-api", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-file", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-repository-metadata", 
+      "requirement": "2.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-provider-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-file", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom.json
index d48d835e2f1..44c33376667 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-artifact-manager", 
   "version": "2.0.6", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom.package.json
index d08968d97d7..f9d13e68b1e 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-artifact-manager", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-artifact-manager", 
   "version": "2.0.6", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Artifact Manager", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,49 +21,66 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-repository-metadata", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-provider-api", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-file", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "easymock:easymock", 
-        "version": "1.2_Java1.3"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-repository-metadata", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-provider-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-file", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:easymock/easymock", 
+      "requirement": "1.2_Java1.3", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.7/maven-artifact-manager-2.0.7.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.7/maven-artifact-manager-2.0.7.pom.json
index e481fad87c9..93555ea7532 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.7/maven-artifact-manager-2.0.7.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.7/maven-artifact-manager-2.0.7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-artifact-manager", 
   "version": "2.0.7", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.7/maven-artifact-manager-2.0.7.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.7/maven-artifact-manager-2.0.7.pom.package.json
index 8d45159a773..2d00775f116 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.7/maven-artifact-manager-2.0.7.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.7/maven-artifact-manager-2.0.7.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-artifact-manager", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-artifact-manager", 
   "version": "2.0.7", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Artifact Manager", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,49 +21,66 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-repository-metadata", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-provider-api", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-file", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "easymock:easymock", 
-        "version": "1.2_Java1.3"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-repository-metadata", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-provider-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-file", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:easymock/easymock", 
+      "requirement": "1.2_Java1.3", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom.json
index 8092f487854..38c0577a84d 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-artifact-manager", 
   "version": "2.0.8", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom.package.json
index 782334d4fbe..ffe9259fa62 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-artifact-manager", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-artifact-manager", 
   "version": "2.0.8", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Artifact Manager", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,49 +21,66 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-repository-metadata", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-provider-api", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-file", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "easymock:easymock", 
-        "version": "1.2_Java1.3"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-repository-metadata", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-provider-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-file", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:easymock/easymock", 
+      "requirement": "1.2_Java1.3", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom.json
index a0a55f3161e..c0bf533a211 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-artifact-manager", 
   "version": "2.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom.package.json
index d19a13994bb..4ef700b1ab0 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-artifact-manager", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-artifact-manager", 
   "version": "2.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Artifact Manager", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,44 +21,58 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-repository-metadata", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-provider-api", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-file", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-repository-metadata", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-provider-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-file", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.pom.json
index 959306c9ca6..492efbe9dee 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-artifact", 
   "version": "2.0.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.pom.package.json
index 20746c5919f..adca06b71ac 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.1/maven-artifact-2.0.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-artifact", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-artifact", 
   "version": "2.0.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Artifact", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,24 +21,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom.json
index ac648ceb144..b6294bd3169 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-artifact", 
   "version": "2.0.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom.package.json
index 574f084dc64..efb2cedb36b 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.2/maven-artifact-2.0.2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-artifact", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-artifact", 
   "version": "2.0.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Artifact", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,24 +21,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.4/maven-artifact-2.0.4.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.4/maven-artifact-2.0.4.pom.json
index f7708caf16e..086d5ff8071 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.4/maven-artifact-2.0.4.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.4/maven-artifact-2.0.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-artifact", 
   "version": "2.0.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.4/maven-artifact-2.0.4.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.4/maven-artifact-2.0.4.pom.package.json
index f487c0efc3c..06a315d75bb 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.4/maven-artifact-2.0.4.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.4/maven-artifact-2.0.4.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-artifact", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-artifact", 
   "version": "2.0.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Artifact", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,24 +21,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom.json
index dbf179f2f79..b520094ec95 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-artifact", 
   "version": "2.0.5", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom.package.json
index c8fec2e2a99..becd2f1a033 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.5/maven-artifact-2.0.5.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-artifact", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-artifact", 
   "version": "2.0.5", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Artifact", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,24 +21,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom.json
index 10fce099a81..204540402b0 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-artifact", 
   "version": "2.0.6", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom.package.json
index 5ac034dd88d..b1174efb4c1 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-artifact", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-artifact", 
   "version": "2.0.6", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Artifact", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,24 +21,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.7/maven-artifact-2.0.7.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.7/maven-artifact-2.0.7.pom.json
index 62ad4360187..5040130ddff 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.7/maven-artifact-2.0.7.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.7/maven-artifact-2.0.7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-artifact", 
   "version": "2.0.7", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.7/maven-artifact-2.0.7.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.7/maven-artifact-2.0.7.pom.package.json
index 04110666255..d60a5339a4c 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.7/maven-artifact-2.0.7.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.7/maven-artifact-2.0.7.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-artifact", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-artifact", 
   "version": "2.0.7", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Artifact", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,24 +21,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom.json
index 7cf8d1902c6..d488f875616 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-artifact", 
   "version": "2.0.8", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom.package.json
index 9c079e82187..f63668cce4b 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-artifact", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-artifact", 
   "version": "2.0.8", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Artifact", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,24 +21,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom.json
index 347d5f5b44a..26e4519a9cc 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-artifact", 
   "version": "2.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom.package.json
index 9465bd33859..ec05d3d6649 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-artifact", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-artifact", 
   "version": "2.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Artifact", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,24 +21,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-core/2.0.8/maven-core-2.0.8.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-core/2.0.8/maven-core-2.0.8.pom.json
index 135feb690eb..4852a32b9e7 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-core/2.0.8/maven-core-2.0.8.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-core/2.0.8/maven-core-2.0.8.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-core", 
   "version": "2.0.8", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-core/2.0.8/maven-core-2.0.8.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-core/2.0.8/maven-core-2.0.8.pom.package.json
index c629266098a..a34fb6e6806 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-core/2.0.8/maven-core-2.0.8.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-core/2.0.8/maven-core-2.0.8.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-core", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-core", 
   "version": "2.0.8", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Core", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,129 +21,194 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-settings", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-parameter-documenter", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.reporting:maven-reporting-api", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-profile", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-provider-api", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-repository-metadata", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-error-diagnostics", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-cli:commons-cli", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-descriptor", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-interactivity-api", 
-        "version": "1.0-alpha-4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact-manager", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-monitor", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "classworlds:classworlds", 
-        "version": "latest.release"
-      }
-    ], 
-    "runtime": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-file", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-http-lightweight", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-ssh-external", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-ssh", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-settings", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-parameter-documenter", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.reporting/maven-reporting-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-profile", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-provider-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-repository-metadata", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-error-diagnostics", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-cli/commons-cli", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-descriptor", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-interactivity-api", 
+      "requirement": "1.0-alpha-4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact-manager", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-monitor", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:classworlds/classworlds", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-file", 
+      "requirement": null, 
+      "scope": "runtime", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-http-lightweight", 
+      "requirement": null, 
+      "scope": "runtime", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-ssh-external", 
+      "requirement": null, 
+      "scope": "runtime", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-ssh", 
+      "requirement": null, 
+      "scope": "runtime", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-core/2.0/maven-core-2.0.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-core/2.0/maven-core-2.0.pom.json
index 713a250bca4..e354718b3d7 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-core/2.0/maven-core-2.0.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-core/2.0/maven-core-2.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-core", 
   "version": "2.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-core/2.0/maven-core-2.0.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-core/2.0/maven-core-2.0.pom.package.json
index a3612017a7b..214b27b3729 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-core/2.0/maven-core-2.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-core/2.0/maven-core-2.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-core", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-core", 
   "version": "2.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,124 +21,186 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-settings", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-parameter-documenter", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.reporting:maven-reporting-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-profile", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-provider-api", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-repository-metadata", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-error-diagnostics", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-registry", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-cli:commons-cli", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-descriptor", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-interactivity-api", 
-        "version": "1.0-alpha-4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact-manager", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-monitor", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ], 
-    "runtime": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-file", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-http-lightweight", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-ssh", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-settings", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-parameter-documenter", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.reporting/maven-reporting-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-profile", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-provider-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-repository-metadata", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-error-diagnostics", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-registry", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-cli/commons-cli", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-descriptor", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-interactivity-api", 
+      "requirement": "1.0-alpha-4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact-manager", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-monitor", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-file", 
+      "requirement": null, 
+      "scope": "runtime", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-http-lightweight", 
+      "requirement": null, 
+      "scope": "runtime", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-ssh", 
+      "requirement": null, 
+      "scope": "runtime", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-error-diagnostics/2.0.8/maven-error-diagnostics-2.0.8.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-error-diagnostics/2.0.8/maven-error-diagnostics-2.0.8.pom.json
index b5645f9ad38..dd4872396aa 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-error-diagnostics/2.0.8/maven-error-diagnostics-2.0.8.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-error-diagnostics/2.0.8/maven-error-diagnostics-2.0.8.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-error-diagnostics", 
   "version": "2.0.8", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-error-diagnostics/2.0.8/maven-error-diagnostics-2.0.8.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-error-diagnostics/2.0.8/maven-error-diagnostics-2.0.8.pom.package.json
index 737c93406a4..3aef6998968 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-error-diagnostics/2.0.8/maven-error-diagnostics-2.0.8.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-error-diagnostics/2.0.8/maven-error-diagnostics-2.0.8.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-error-diagnostics", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-error-diagnostics", 
   "version": "2.0.8", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Provides a manager component which will process a given Throwable instance through a set of diagnostic\n    sub-components, and return a String message with user-friendly information about the error and possibly\n    how to fix it.", 
+  "description": "Maven Error Diagnostics\nProvides a manager component which will process a given Throwable instance through a set of diagnostic\n    sub-components, and return a String message with user-friendly information about the error and possibly\n    how to fix it.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom.json
index 5f218fa7f8c..b5f10f3cc2c 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-error-diagnostics", 
   "version": "2.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom.package.json
index 237a232906b..fe58f3b44fd 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-error-diagnostics", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-error-diagnostics", 
   "version": "2.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Provides a manager component which will process a given Throwable instance through a set of diagnostic\n    sub-components, and return a String message with user-friendly information about the error and possibly\n    how to fix it.", 
+  "description": "Maven Error Diagnostics\nProvides a manager component which will process a given Throwable instance through a set of diagnostic\n    sub-components, and return a String message with user-friendly information about the error and possibly\n    how to fix it.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.1/maven-model-2.0.1.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.1/maven-model-2.0.1.pom.json
index 0672d526aca..b4bf40c2190 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.1/maven-model-2.0.1.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.1/maven-model-2.0.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-model", 
   "version": "2.0.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.1/maven-model-2.0.1.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.1/maven-model-2.0.1.pom.package.json
index b617833b5a0..b77bf8b0526 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.1/maven-model-2.0.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.1/maven-model-2.0.1.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-model", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-model", 
   "version": "2.0.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Maven Model", 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.2/maven-model-2.0.2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.2/maven-model-2.0.2.pom.json
index fda136aa8f1..2ed1029d805 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.2/maven-model-2.0.2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.2/maven-model-2.0.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-model", 
   "version": "2.0.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.2/maven-model-2.0.2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.2/maven-model-2.0.2.pom.package.json
index 924697e109f..aaf6217aa73 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.2/maven-model-2.0.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.2/maven-model-2.0.2.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-model", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-model", 
   "version": "2.0.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Maven Model", 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.4/maven-model-2.0.4.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.4/maven-model-2.0.4.pom.json
index e00cd6f272d..10f3a59e994 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.4/maven-model-2.0.4.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.4/maven-model-2.0.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-model", 
   "version": "2.0.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.4/maven-model-2.0.4.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.4/maven-model-2.0.4.pom.package.json
index f3063950020..3c520b7481f 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.4/maven-model-2.0.4.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.4/maven-model-2.0.4.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-model", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-model", 
   "version": "2.0.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Maven Model", 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom.json
index 0cf015ed88b..6ae41db917a 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-model", 
   "version": "2.0.5", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom.package.json
index 7c7a814bf92..42eda9223f6 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.5/maven-model-2.0.5.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-model", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-model", 
   "version": "2.0.5", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Maven Model", 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom.json
index ef6c28704b1..52f90076400 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-model", 
   "version": "2.0.6", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom.package.json
index 65e8bb4fedc..968a2b95b2b 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-model", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-model", 
   "version": "2.0.6", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Maven Model", 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.7/maven-model-2.0.7.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.7/maven-model-2.0.7.pom.json
index 96d1d4351ed..cbbabea07e1 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.7/maven-model-2.0.7.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.7/maven-model-2.0.7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-model", 
   "version": "2.0.7", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.7/maven-model-2.0.7.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.7/maven-model-2.0.7.pom.package.json
index 46ef20724f6..7c267f5b515 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.7/maven-model-2.0.7.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.7/maven-model-2.0.7.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-model", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-model", 
   "version": "2.0.7", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Maven Model", 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom.json
index 7fd63368662..f7f6643de19 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-model", 
   "version": "2.0.8", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom.package.json
index f436bba931d..77bd87285a3 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-model", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-model", 
   "version": "2.0.8", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Maven Model", 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0/maven-model-2.0.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0/maven-model-2.0.pom.json
index a4f8e37933c..f9d6a4d49b2 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0/maven-model-2.0.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0/maven-model-2.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-model", 
   "version": "2.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0/maven-model-2.0.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0/maven-model-2.0.pom.package.json
index 97e96d14b7c..916f07464bb 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0/maven-model-2.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-model/2.0/maven-model-2.0.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-model", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-model", 
   "version": "2.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Maven Model", 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-monitor/2.0.8/maven-monitor-2.0.8.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-monitor/2.0.8/maven-monitor-2.0.8.pom.json
index 5111947b993..2aeed9f82bd 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-monitor/2.0.8/maven-monitor-2.0.8.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-monitor/2.0.8/maven-monitor-2.0.8.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-monitor", 
   "version": "2.0.8", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-monitor/2.0.8/maven-monitor-2.0.8.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-monitor/2.0.8/maven-monitor-2.0.8.pom.package.json
index 63b8332300f..17c3850309b 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-monitor/2.0.8/maven-monitor-2.0.8.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-monitor/2.0.8/maven-monitor-2.0.8.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-monitor", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-monitor", 
   "version": "2.0.8", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Monitor", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom.json
index 6bc9a8aa93d..522be26a005 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-monitor", 
   "version": "2.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom.package.json
index 1e02951f5a9..28b08f738f6 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-monitor/2.0/maven-monitor-2.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-monitor", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-monitor", 
   "version": "2.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Monitor", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-parent/1/maven-parent-1.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-parent/1/maven-parent-1.pom.json
index d888007b9e4..479565f92e1 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-parent/1/maven-parent-1.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-parent/1/maven-parent-1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-parent", 
   "version": "1", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache", 
     "artifact_id": "apache", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-parent/1/maven-parent-1.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-parent/1/maven-parent-1.pom.package.json
index 9f4a95bde64..ba8ac3ada00 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-parent/1/maven-parent-1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-parent/1/maven-parent-1.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-parent", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-parent", 
   "version": "1", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Maven is a software project management and comprehension tool. Based on the concept of a project object model\n    (POM), Maven can manage a project's build, reporting and documentation from a central piece of information.", 
+  "description": "Apache Maven\nMaven is a software project management and comprehension tool. Based on the concept of a project object model\n    (POM), Maven can manage a project's build, reporting and documentation from a central piece of information.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -103,9 +108,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-parent/4/maven-parent-4.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-parent/4/maven-parent-4.pom.json
index 53658fcf023..30176759116 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-parent/4/maven-parent-4.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-parent/4/maven-parent-4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-parent", 
   "version": "4", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache", 
     "artifact_id": "apache", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-parent/4/maven-parent-4.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-parent/4/maven-parent-4.pom.package.json
index 0241d846d1d..bb776d714f7 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-parent/4/maven-parent-4.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-parent/4/maven-parent-4.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-parent", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-parent", 
   "version": "4", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Maven is a software project management and comprehension tool. Based on the concept of a project object model\n    (POM), Maven can manage a project's build, reporting and documentation from a central piece of information.", 
+  "description": "Apache Maven\nMaven is a software project management and comprehension tool. Based on the concept of a project object model\n    (POM), Maven can manage a project's build, reporting and documentation from a central piece of information.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -117,9 +122,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-parent/5/maven-parent-5.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-parent/5/maven-parent-5.pom.json
index 21961e180a1..fedee4cb326 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-parent/5/maven-parent-5.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-parent/5/maven-parent-5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-parent", 
   "version": "5", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache", 
     "artifact_id": "apache", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-parent/5/maven-parent-5.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-parent/5/maven-parent-5.pom.package.json
index 77134e8e996..19125afc0e7 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-parent/5/maven-parent-5.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-parent/5/maven-parent-5.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-parent", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-parent", 
   "version": "5", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Maven is a software project management and comprehension tool. Based on the concept of a project object model\n    (POM), Maven can manage a project's build, reporting and documentation from a central piece of information.", 
+  "description": "Apache Maven\nMaven is a software project management and comprehension tool. Based on the concept of a project object model\n    (POM), Maven can manage a project's build, reporting and documentation from a central piece of information.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -159,9 +164,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-parent/6/maven-parent-6.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-parent/6/maven-parent-6.pom.json
index 241ad2017ab..c5733cbaeb8 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-parent/6/maven-parent-6.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-parent/6/maven-parent-6.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-parent", 
   "version": "6", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache", 
     "artifact_id": "apache", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-parent/6/maven-parent-6.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-parent/6/maven-parent-6.pom.package.json
index 657085f73cd..64814c62bad 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-parent/6/maven-parent-6.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-parent/6/maven-parent-6.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-parent", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-parent", 
   "version": "6", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Maven is a software project management and comprehension tool. Based on the concept of a project object model   (POM), Maven can manage a project's build, reporting and documentation from a central piece of information.", 
+  "description": "Apache Maven\nMaven is a software project management and comprehension tool. Based on the concept of a project object model   (POM), Maven can manage a project's build, reporting and documentation from a central piece of information.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -313,9 +318,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-parent/7/maven-parent-7.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-parent/7/maven-parent-7.pom.json
index 358092de1a4..c3e6d4a9b34 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-parent/7/maven-parent-7.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-parent/7/maven-parent-7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-parent", 
   "version": "7", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache", 
     "artifact_id": "apache", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-parent/7/maven-parent-7.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-parent/7/maven-parent-7.pom.package.json
index dab4d7d350e..5c90d386238 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-parent/7/maven-parent-7.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-parent/7/maven-parent-7.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-parent", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-parent", 
   "version": "7", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Maven is a software project management and comprehension tool. Based on the concept of a project object model   (POM), Maven can manage a project's build, reporting and documentation from a central piece of information.", 
+  "description": "Apache Maven\nMaven is a software project management and comprehension tool. Based on the concept of a project object model   (POM), Maven can manage a project's build, reporting and documentation from a central piece of information.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -327,9 +332,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-parent/8/maven-parent-8.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-parent/8/maven-parent-8.pom.json
index f49a5ba4791..102bae39836 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-parent/8/maven-parent-8.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-parent/8/maven-parent-8.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-parent", 
   "version": "8", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache", 
     "artifact_id": "apache", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-parent/8/maven-parent-8.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-parent/8/maven-parent-8.pom.package.json
index 86dc081884b..1c4eb962a67 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-parent/8/maven-parent-8.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-parent/8/maven-parent-8.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-parent", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-parent", 
   "version": "8", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, reporting and documentation from a central piece of information.", 
+  "description": "Apache Maven\nMaven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, reporting and documentation from a central piece of information.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -341,9 +346,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom.json
index 873771e1894..4a19bc10393 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-plugin-api", 
   "version": "2.0.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom.package.json
index 56ddd2cb94b..a60fcd23303 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.1/maven-plugin-api-2.0.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-plugin-api", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-plugin-api", 
   "version": "2.0.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Plugin API", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.2/maven-plugin-api-2.0.2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.2/maven-plugin-api-2.0.2.pom.json
index f190fe7aa56..278a13a0233 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.2/maven-plugin-api-2.0.2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.2/maven-plugin-api-2.0.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-plugin-api", 
   "version": "2.0.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.2/maven-plugin-api-2.0.2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.2/maven-plugin-api-2.0.2.pom.package.json
index b43b05f549a..0d29eccae7d 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.2/maven-plugin-api-2.0.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.2/maven-plugin-api-2.0.2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-plugin-api", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-plugin-api", 
   "version": "2.0.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Plugin API", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.4/maven-plugin-api-2.0.4.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.4/maven-plugin-api-2.0.4.pom.json
index 21554f94dc0..0904fd896fe 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.4/maven-plugin-api-2.0.4.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.4/maven-plugin-api-2.0.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-plugin-api", 
   "version": "2.0.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.4/maven-plugin-api-2.0.4.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.4/maven-plugin-api-2.0.4.pom.package.json
index 0d5198ad1e6..e3511c1a485 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.4/maven-plugin-api-2.0.4.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.4/maven-plugin-api-2.0.4.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-plugin-api", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-plugin-api", 
   "version": "2.0.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Plugin API", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom.json
index 5c039c256e4..c6e689e890d 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-plugin-api", 
   "version": "2.0.6", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom.package.json
index 0e348f511c8..375a60f6578 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-plugin-api", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-plugin-api", 
   "version": "2.0.6", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Plugin API", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.7/maven-plugin-api-2.0.7.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.7/maven-plugin-api-2.0.7.pom.json
index 6204ff402d3..cef2325d1b5 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.7/maven-plugin-api-2.0.7.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.7/maven-plugin-api-2.0.7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-plugin-api", 
   "version": "2.0.7", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.7/maven-plugin-api-2.0.7.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.7/maven-plugin-api-2.0.7.pom.package.json
index acd5bef7ab2..98b543400e3 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.7/maven-plugin-api-2.0.7.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.7/maven-plugin-api-2.0.7.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-plugin-api", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-plugin-api", 
   "version": "2.0.7", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Plugin API", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom.json
index cc3e5a4410e..b5c2f692dcb 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-plugin-api", 
   "version": "2.0.8", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom.package.json
index 746b8decfb7..10c0fb03ce1 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-plugin-api", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-plugin-api", 
   "version": "2.0.8", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Plugin API", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom.json
index 4808e0be48b..20f66bebd32 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-plugin-api", 
   "version": "2.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom.package.json
index d38a1a8db03..591413da1fe 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-plugin-api", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-plugin-api", 
   "version": "2.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Plugin API", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-descriptor/2.0.8/maven-plugin-descriptor-2.0.8.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-descriptor/2.0.8/maven-plugin-descriptor-2.0.8.pom.json
index 2751a3e621f..38006d5765f 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-descriptor/2.0.8/maven-plugin-descriptor-2.0.8.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-descriptor/2.0.8/maven-plugin-descriptor-2.0.8.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-plugin-descriptor", 
   "version": "2.0.8", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-descriptor/2.0.8/maven-plugin-descriptor-2.0.8.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-descriptor/2.0.8/maven-plugin-descriptor-2.0.8.pom.package.json
index 0fe929b5114..0ef283ac938 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-descriptor/2.0.8/maven-plugin-descriptor-2.0.8.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-descriptor/2.0.8/maven-plugin-descriptor-2.0.8.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-plugin-descriptor", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-plugin-descriptor", 
   "version": "2.0.8", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Plugin Descriptor Model", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,27 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom.json
index dde19279283..c7f0a2e3c94 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-plugin-descriptor", 
   "version": "2.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom.package.json
index e94f660fb4c..c32a56b337f 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-descriptor/2.0/maven-plugin-descriptor-2.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-plugin-descriptor", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-plugin-descriptor", 
   "version": "2.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Plugin Descriptor Model", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,27 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-parameter-documenter/2.0.8/maven-plugin-parameter-documenter-2.0.8.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-parameter-documenter/2.0.8/maven-plugin-parameter-documenter-2.0.8.pom.json
index 2add7b12ceb..9c863263b2d 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-parameter-documenter/2.0.8/maven-plugin-parameter-documenter-2.0.8.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-parameter-documenter/2.0.8/maven-plugin-parameter-documenter-2.0.8.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-plugin-parameter-documenter", 
   "version": "2.0.8", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-parameter-documenter/2.0.8/maven-plugin-parameter-documenter-2.0.8.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-parameter-documenter/2.0.8/maven-plugin-parameter-documenter-2.0.8.pom.package.json
index bec1590f7bb..cb64061db7c 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-parameter-documenter/2.0.8/maven-plugin-parameter-documenter-2.0.8.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-parameter-documenter/2.0.8/maven-plugin-parameter-documenter-2.0.8.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-plugin-parameter-documenter", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-plugin-parameter-documenter", 
   "version": "2.0.8", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Plugin Parameter Documenter API", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,22 +21,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom.json
index 5b9e0aaacf4..45f3f2b9ea9 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-plugin-parameter-documenter", 
   "version": "2.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom.package.json
index 82a7a5d1154..b58fe81a6c1 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-parameter-documenter/2.0/maven-plugin-parameter-documenter-2.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-plugin-parameter-documenter", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-plugin-parameter-documenter", 
   "version": "2.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Plugin Parameter Documenter API", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,22 +21,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom.json
index d7ea308b465..87a51276321 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-plugin-registry", 
   "version": "2.0.6", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom.package.json
index a250aad67da..45b11d8881e 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-plugin-registry", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-plugin-registry", 
   "version": "2.0.6", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Plugin Registry Model", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,22 +21,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0.7/maven-plugin-registry-2.0.7.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0.7/maven-plugin-registry-2.0.7.pom.json
index f064a3be23b..49a2e2a3320 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0.7/maven-plugin-registry-2.0.7.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0.7/maven-plugin-registry-2.0.7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-plugin-registry", 
   "version": "2.0.7", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0.7/maven-plugin-registry-2.0.7.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0.7/maven-plugin-registry-2.0.7.pom.package.json
index 043330eae7b..f26af9ef80b 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0.7/maven-plugin-registry-2.0.7.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0.7/maven-plugin-registry-2.0.7.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-plugin-registry", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-plugin-registry", 
   "version": "2.0.7", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Plugin Registry Model", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,22 +21,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom.json
index 9dd8cd33f14..315b713e153 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-plugin-registry", 
   "version": "2.0.8", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom.package.json
index aa125cda819..39b4db95d3b 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-plugin-registry", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-plugin-registry", 
   "version": "2.0.8", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Plugin Registry Model", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,22 +21,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom.json
index 388a581a211..e61bc359911 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-plugin-registry", 
   "version": "2.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom.package.json
index 0d7f1428268..aaaedaabe64 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-plugin-registry/2.0/maven-plugin-registry-2.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-plugin-registry", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-plugin-registry", 
   "version": "2.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Plugin Registry Model", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,22 +21,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.1/maven-profile-2.0.1.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.1/maven-profile-2.0.1.pom.json
index 0a1c2a9fbda..61b79fc2d84 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.1/maven-profile-2.0.1.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.1/maven-profile-2.0.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-profile", 
   "version": "2.0.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.1/maven-profile-2.0.1.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.1/maven-profile-2.0.1.pom.package.json
index 05ae840abb7..318d119c9ca 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.1/maven-profile-2.0.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.1/maven-profile-2.0.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-profile", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-profile", 
   "version": "2.0.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Profile Model", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,27 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "2.0.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": "2.0.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.2/maven-profile-2.0.2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.2/maven-profile-2.0.2.pom.json
index 5ee373a5c66..6c346c70ad6 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.2/maven-profile-2.0.2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.2/maven-profile-2.0.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-profile", 
   "version": "2.0.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.2/maven-profile-2.0.2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.2/maven-profile-2.0.2.pom.package.json
index fd8d90b9fe0..f2fe463c302 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.2/maven-profile-2.0.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.2/maven-profile-2.0.2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-profile", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-profile", 
   "version": "2.0.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Profile Model", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,27 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "2.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": "2.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.4/maven-profile-2.0.4.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.4/maven-profile-2.0.4.pom.json
index 6738747a467..92efec248d2 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.4/maven-profile-2.0.4.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.4/maven-profile-2.0.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-profile", 
   "version": "2.0.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.4/maven-profile-2.0.4.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.4/maven-profile-2.0.4.pom.package.json
index dc215299b6d..2771fba499a 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.4/maven-profile-2.0.4.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.4/maven-profile-2.0.4.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-profile", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-profile", 
   "version": "2.0.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Profile Model", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,27 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "2.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": "2.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom.json
index 430d01fd026..2f6c1ccdf04 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-profile", 
   "version": "2.0.6", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom.package.json
index 60e8c5520a4..05cc239b5d8 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-profile", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-profile", 
   "version": "2.0.6", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Profile Model", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,27 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.7/maven-profile-2.0.7.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.7/maven-profile-2.0.7.pom.json
index 5a1efee7232..99070f9282d 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.7/maven-profile-2.0.7.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.7/maven-profile-2.0.7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-profile", 
   "version": "2.0.7", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.7/maven-profile-2.0.7.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.7/maven-profile-2.0.7.pom.package.json
index 8a70ac2c76a..f71a3de3ad0 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.7/maven-profile-2.0.7.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.7/maven-profile-2.0.7.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-profile", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-profile", 
   "version": "2.0.7", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Profile Model", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,27 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom.json
index c9f849100a6..d3ac0b2937b 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-profile", 
   "version": "2.0.8", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom.package.json
index 577d76d821a..f91c860d1ff 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-profile", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-profile", 
   "version": "2.0.8", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Profile Model", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,27 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom.json
index 207ac18f68d..8d96ef70483 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-profile", 
   "version": "2.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom.package.json
index f8e0c60343c..b4db5ee2902 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-profile/2.0/maven-profile-2.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-profile", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-profile", 
   "version": "2.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Profile Model", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,27 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.1/maven-project-2.0.1.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.1/maven-project-2.0.1.pom.json
index ecba1cf6dd0..603b20048bd 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.1/maven-project-2.0.1.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.1/maven-project-2.0.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-project", 
   "version": "2.0.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.1/maven-project-2.0.1.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.1/maven-project-2.0.1.pom.package.json
index 662261add02..7ab3db9003a 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.1/maven-project-2.0.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.1/maven-project-2.0.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-project", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-project", 
   "version": "2.0.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "This library is used to not only read Maven project object model files, but to assemble inheritence\n    and to retrieve remote models as required.", 
+  "description": "Maven Project Builder\nThis library is used to not only read Maven project object model files, but to assemble inheritence\n    and to retrieve remote models as required.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,49 +21,66 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact-test", 
-        "version": "2.0.1"
-      }
-    ], 
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-profile", 
-        "version": "2.0.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "2.0.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact-manager", 
-        "version": "2.0.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact-test", 
+      "requirement": "2.0.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-profile", 
+      "requirement": "2.0.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": "2.0.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact-manager", 
+      "requirement": "2.0.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.2/maven-project-2.0.2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.2/maven-project-2.0.2.pom.json
index ef9f6b49f4f..679731a5423 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.2/maven-project-2.0.2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.2/maven-project-2.0.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-project", 
   "version": "2.0.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.2/maven-project-2.0.2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.2/maven-project-2.0.2.pom.package.json
index 66da54ccaa0..c40c2ce1042 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.2/maven-project-2.0.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.2/maven-project-2.0.2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-project", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-project", 
   "version": "2.0.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "This library is used to not only read Maven project object model files, but to assemble inheritence\n    and to retrieve remote models as required.", 
+  "description": "Maven Project Builder\nThis library is used to not only read Maven project object model files, but to assemble inheritence\n    and to retrieve remote models as required.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,49 +21,66 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact-test", 
-        "version": "2.0.2"
-      }
-    ], 
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-profile", 
-        "version": "2.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "2.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact-manager", 
-        "version": "2.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact-test", 
+      "requirement": "2.0.2", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-profile", 
+      "requirement": "2.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": "2.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact-manager", 
+      "requirement": "2.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.4/maven-project-2.0.4.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.4/maven-project-2.0.4.pom.json
index 1b69d6aa0d1..e7f335ffbf7 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.4/maven-project-2.0.4.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.4/maven-project-2.0.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-project", 
   "version": "2.0.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.4/maven-project-2.0.4.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.4/maven-project-2.0.4.pom.package.json
index 6fd0e26c863..9c60d010bb3 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.4/maven-project-2.0.4.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.4/maven-project-2.0.4.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-project", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-project", 
   "version": "2.0.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "This library is used to not only read Maven project object model files, but to assemble inheritence\n    and to retrieve remote models as required.", 
+  "description": "Maven Project Builder\nThis library is used to not only read Maven project object model files, but to assemble inheritence\n    and to retrieve remote models as required.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,54 +21,74 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-settings", 
-        "version": "2.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-profile", 
-        "version": "2.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "2.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact-manager", 
-        "version": "2.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact-test", 
-        "version": "2.0.4"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-settings", 
+      "requirement": "2.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-profile", 
+      "requirement": "2.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": "2.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact-manager", 
+      "requirement": "2.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact-test", 
+      "requirement": "2.0.4", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom.json
index 04cb30de6a4..5fb660f174e 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-project", 
   "version": "2.0.5", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom.package.json
index be115ec764a..b60d8caddc9 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-project", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-project", 
   "version": "2.0.5", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "This library is used to not only read Maven project object model files, but to assemble inheritence\n    and to retrieve remote models as required.", 
+  "description": "Maven Project Builder\nThis library is used to not only read Maven project object model files, but to assemble inheritence\n    and to retrieve remote models as required.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,54 +21,74 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-settings", 
-        "version": "2.0.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-profile", 
-        "version": "2.0.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "2.0.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact-manager", 
-        "version": "2.0.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact-test", 
-        "version": "2.0.5"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-settings", 
+      "requirement": "2.0.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-profile", 
+      "requirement": "2.0.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": "2.0.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact-manager", 
+      "requirement": "2.0.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact-test", 
+      "requirement": "2.0.5", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom.json
index de1e2cfb847..b394bb7ed27 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-project", 
   "version": "2.0.6", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom.package.json
index f1cc4ed5d41..5d16e116197 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-project", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-project", 
   "version": "2.0.6", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "This library is used to not only read Maven project object model files, but to assemble inheritence\n    and to retrieve remote models as required.", 
+  "description": "Maven Project Builder\nThis library is used to not only read Maven project object model files, but to assemble inheritence\n    and to retrieve remote models as required.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,59 +21,82 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-settings", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-profile", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact-manager", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-registry", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact-test", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-settings", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-profile", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact-manager", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-registry", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact-test", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.7/maven-project-2.0.7.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.7/maven-project-2.0.7.pom.json
index 71e2753f568..c99788a3095 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.7/maven-project-2.0.7.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.7/maven-project-2.0.7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-project", 
   "version": "2.0.7", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.7/maven-project-2.0.7.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.7/maven-project-2.0.7.pom.package.json
index 59f7fb4c2be..3e4f73d5662 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.7/maven-project-2.0.7.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.7/maven-project-2.0.7.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-project", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-project", 
   "version": "2.0.7", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "This library is used to not only read Maven project object model files, but to assemble inheritence\n    and to retrieve remote models as required.", 
+  "description": "Maven Project Builder\nThis library is used to not only read Maven project object model files, but to assemble inheritence\n    and to retrieve remote models as required.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,59 +21,82 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-settings", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-profile", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact-manager", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-registry", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact-test", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-settings", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-profile", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact-manager", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-registry", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact-test", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom.json
index b0b309b6def..41fb855f6e4 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-project", 
   "version": "2.0.8", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom.package.json
index bc15b6356f7..a6013d40845 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-project", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-project", 
   "version": "2.0.8", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "This library is used to not only read Maven project object model files, but to assemble inheritence\n    and to retrieve remote models as required.", 
+  "description": "Maven Project Builder\nThis library is used to not only read Maven project object model files, but to assemble inheritence\n    and to retrieve remote models as required.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,59 +21,82 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-settings", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-profile", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact-manager", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-registry", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact-test", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-settings", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-profile", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact-manager", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-registry", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact-test", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0/maven-project-2.0.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0/maven-project-2.0.pom.json
index b1af8be554c..cef4de1c89c 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0/maven-project-2.0.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0/maven-project-2.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-project", 
   "version": "2.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0/maven-project-2.0.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0/maven-project-2.0.pom.package.json
index a948a12d7d4..de1b183fd26 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0/maven-project-2.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-project/2.0/maven-project-2.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-project", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-project", 
   "version": "2.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "This library is used to not only read Maven project object model files, but to assemble inheritence\n    and to retrieve remote models as required.", 
+  "description": "Maven Project Builder\nThis library is used to not only read Maven project object model files, but to assemble inheritence\n    and to retrieve remote models as required.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,49 +21,66 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact-test", 
-        "version": "2.0"
-      }
-    ], 
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-profile", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact-manager", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact-test", 
+      "requirement": "2.0", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-profile", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact-manager", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.1/maven-repository-metadata-2.0.1.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.1/maven-repository-metadata-2.0.1.pom.json
index db7694f6e45..e0870b3d39c 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.1/maven-repository-metadata-2.0.1.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.1/maven-repository-metadata-2.0.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-repository-metadata", 
   "version": "2.0.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.1/maven-repository-metadata-2.0.1.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.1/maven-repository-metadata-2.0.1.pom.package.json
index 4a710f13127..f9bde53263e 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.1/maven-repository-metadata-2.0.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.1/maven-repository-metadata-2.0.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-repository-metadata", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-repository-metadata", 
   "version": "2.0.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Maven Plugin Mapping", 
+  "description": "Maven Repository Metadata Model\nMaven Plugin Mapping", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom.json
index 93cad49b18f..02fb03c94c3 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-repository-metadata", 
   "version": "2.0.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom.package.json
index 53882d1f2f2..c8edd57447d 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.2/maven-repository-metadata-2.0.2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-repository-metadata", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-repository-metadata", 
   "version": "2.0.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Maven Plugin Mapping", 
+  "description": "Maven Repository Metadata Model\nMaven Plugin Mapping", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.4/maven-repository-metadata-2.0.4.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.4/maven-repository-metadata-2.0.4.pom.json
index 0eaed990413..a8cbb2ccd3c 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.4/maven-repository-metadata-2.0.4.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.4/maven-repository-metadata-2.0.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-repository-metadata", 
   "version": "2.0.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.4/maven-repository-metadata-2.0.4.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.4/maven-repository-metadata-2.0.4.pom.package.json
index 30e50499416..8883ab124fd 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.4/maven-repository-metadata-2.0.4.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.4/maven-repository-metadata-2.0.4.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-repository-metadata", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-repository-metadata", 
   "version": "2.0.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Maven Plugin Mapping", 
+  "description": "Maven Repository Metadata Model\nMaven Plugin Mapping", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom.json
index 4e2e544d5d1..72e5df52eb3 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-repository-metadata", 
   "version": "2.0.6", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom.package.json
index d4273145467..c54cba3ec36 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-repository-metadata", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-repository-metadata", 
   "version": "2.0.6", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Maven Plugin Mapping", 
+  "description": "Maven Repository Metadata Model\nMaven Plugin Mapping", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.7/maven-repository-metadata-2.0.7.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.7/maven-repository-metadata-2.0.7.pom.json
index efdc6b9b3a8..26914f33c70 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.7/maven-repository-metadata-2.0.7.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.7/maven-repository-metadata-2.0.7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-repository-metadata", 
   "version": "2.0.7", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.7/maven-repository-metadata-2.0.7.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.7/maven-repository-metadata-2.0.7.pom.package.json
index 44649e1d920..bb5e3582b20 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.7/maven-repository-metadata-2.0.7.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.7/maven-repository-metadata-2.0.7.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-repository-metadata", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-repository-metadata", 
   "version": "2.0.7", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Maven Plugin Mapping", 
+  "description": "Maven Repository Metadata Model\nMaven Plugin Mapping", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom.json
index 8cf2cc66fc5..bffac31334e 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-repository-metadata", 
   "version": "2.0.8", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom.package.json
index 86d3a8f11ec..15344e38000 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-repository-metadata", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-repository-metadata", 
   "version": "2.0.8", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Maven Plugin Mapping", 
+  "description": "Maven Repository Metadata Model\nMaven Plugin Mapping", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom.json
index b1f934b7a13..8bbe02c2030 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-repository-metadata", 
   "version": "2.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom.package.json
index cf5c3b4858d..de39903c25e 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-repository-metadata", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-repository-metadata", 
   "version": "2.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Maven Plugin Mapping", 
+  "description": "Maven Repository Metadata Model\nMaven Plugin Mapping", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.2/maven-settings-2.0.2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.2/maven-settings-2.0.2.pom.json
index 764a4280599..6b51613c786 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.2/maven-settings-2.0.2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.2/maven-settings-2.0.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-settings", 
   "version": "2.0.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.2/maven-settings-2.0.2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.2/maven-settings-2.0.2.pom.package.json
index b52f9d30506..b5e16aaa596 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.2/maven-settings-2.0.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.2/maven-settings-2.0.2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-settings", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-settings", 
   "version": "2.0.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Local Settings Model", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,27 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "2.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": "2.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.4/maven-settings-2.0.4.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.4/maven-settings-2.0.4.pom.json
index c5691e54210..d3409d22472 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.4/maven-settings-2.0.4.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.4/maven-settings-2.0.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-settings", 
   "version": "2.0.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.4/maven-settings-2.0.4.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.4/maven-settings-2.0.4.pom.package.json
index ad0c5d38c26..b252f3326a2 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.4/maven-settings-2.0.4.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.4/maven-settings-2.0.4.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-settings", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-settings", 
   "version": "2.0.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Local Settings Model", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,27 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "2.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": "2.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom.json
index e483797daf3..dd56181c235 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-settings", 
   "version": "2.0.6", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom.package.json
index 6c03bcb3722..77a565035ff 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-settings", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-settings", 
   "version": "2.0.6", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Local Settings Model", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,27 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.7/maven-settings-2.0.7.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.7/maven-settings-2.0.7.pom.json
index d5c5f81f9fe..4079ab242f3 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.7/maven-settings-2.0.7.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.7/maven-settings-2.0.7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-settings", 
   "version": "2.0.7", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.7/maven-settings-2.0.7.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.7/maven-settings-2.0.7.pom.package.json
index 6a44697f25c..2df1d17d04c 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.7/maven-settings-2.0.7.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.7/maven-settings-2.0.7.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-settings", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-settings", 
   "version": "2.0.7", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Local Settings Model", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,27 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom.json
index c0f7e329751..d54f6900607 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-settings", 
   "version": "2.0.8", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom.package.json
index 8d2f4117bfe..2503a38c460 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-settings", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-settings", 
   "version": "2.0.8", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Local Settings Model", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,27 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom.json
index 195ab7cdf7d..58df76a6847 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-settings", 
   "version": "2.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom.package.json
index 556445fd52f..8df6167da5d 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven-settings/2.0/maven-settings-2.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven-settings", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven-settings", 
   "version": "2.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Local Settings Model", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,27 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.1/maven-2.0.1.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.1/maven-2.0.1.pom.json
index 35af0f38db0..560c0972c09 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.1/maven-2.0.1.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.1/maven-2.0.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven", 
   "version": "2.0.1", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Maven", 
   "description": "Maven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process.", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.1/maven-2.0.1.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.1/maven-2.0.1.pom.package.json
index 3475ca4f42a..b24c12d250e 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.1/maven-2.0.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.1/maven-2.0.1.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven", 
   "version": "2.0.1", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Maven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process.", 
+  "description": "Maven\nMaven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -82,17 +87,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.2/maven-2.0.2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.2/maven-2.0.2.pom.json
index f963b321561..080ab73b58c 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.2/maven-2.0.2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.2/maven-2.0.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven", 
   "version": "2.0.2", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Maven", 
   "description": "Maven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process.", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.2/maven-2.0.2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.2/maven-2.0.2.pom.package.json
index 9241950c009..ff42bb9a339 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.2/maven-2.0.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.2/maven-2.0.2.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven", 
   "version": "2.0.2", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Maven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process.", 
+  "description": "Maven\nMaven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -82,17 +87,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.4/maven-2.0.4.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.4/maven-2.0.4.pom.json
index 58d00fe7c12..0dd6ee64fd5 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.4/maven-2.0.4.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.4/maven-2.0.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven", 
   "version": "2.0.4", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Maven", 
   "description": "Maven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process.", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.4/maven-2.0.4.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.4/maven-2.0.4.pom.package.json
index 74856265f90..7c99c6df7ce 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.4/maven-2.0.4.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.4/maven-2.0.4.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven", 
   "version": "2.0.4", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Maven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process.", 
+  "description": "Maven\nMaven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -82,17 +87,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.5/maven-2.0.5.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.5/maven-2.0.5.pom.json
index f1ee028ad6c..cbbce37ecc9 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.5/maven-2.0.5.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.5/maven-2.0.5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven", 
   "version": "2.0.5", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven-parent", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.5/maven-2.0.5.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.5/maven-2.0.5.pom.package.json
index 9ba79c04664..d56d63917b6 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.5/maven-2.0.5.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.5/maven-2.0.5.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven", 
   "version": "2.0.5", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Maven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process.", 
+  "description": "Maven\nMaven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +23,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.6/maven-2.0.6.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.6/maven-2.0.6.pom.json
index 86d91f096c2..bf5088dacff 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.6/maven-2.0.6.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.6/maven-2.0.6.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven", 
   "version": "2.0.6", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven-parent", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.6/maven-2.0.6.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.6/maven-2.0.6.pom.package.json
index 37ba3d03ade..92461104513 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.6/maven-2.0.6.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.6/maven-2.0.6.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven", 
   "version": "2.0.6", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Maven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process.", 
+  "description": "Maven\nMaven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +23,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.7/maven-2.0.7.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.7/maven-2.0.7.pom.json
index 9516b54ab54..5012021c119 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.7/maven-2.0.7.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.7/maven-2.0.7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven", 
   "version": "2.0.7", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven-parent", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.7/maven-2.0.7.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.7/maven-2.0.7.pom.package.json
index f9b1da6205d..aa9091677f4 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.7/maven-2.0.7.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.7/maven-2.0.7.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven", 
   "version": "2.0.7", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Maven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process.", 
+  "description": "Maven\nMaven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +23,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.8/maven-2.0.8.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.8/maven-2.0.8.pom.json
index a381a725e8e..08eb207ec4c 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.8/maven-2.0.8.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.8/maven-2.0.8.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven", 
   "version": "2.0.8", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven-parent", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.8/maven-2.0.8.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.8/maven-2.0.8.pom.package.json
index 03677655a45..2a557e6f582 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.8/maven-2.0.8.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0.8/maven-2.0.8.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven", 
   "version": "2.0.8", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Maven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process.", 
+  "description": "Maven\nMaven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +23,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0/maven-2.0.pom.json b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0/maven-2.0.pom.json
index 59eab1aa741..abcf702646c 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0/maven-2.0.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0/maven-2.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven", 
   "version": "2.0", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Maven", 
   "description": "Maven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process.", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0/maven-2.0.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0/maven-2.0.pom.package.json
index fab66673850..f285a8259ec 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/maven/2.0/maven-2.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/maven/2.0/maven-2.0.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven:maven", 
+  "type": "maven", 
+  "namespace": "org.apache.maven", 
+  "name": "maven", 
   "version": "2.0", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Maven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process.", 
+  "description": "Maven\nMaven is a project development management and comprehension tool. Based on the concept of a project object model: builds, dependency management, documentation creation, site publication, and distribution publication are all controlled from the declarative file. Maven can be extended by plugins to utilise a number of other development tools for reporting or the build process.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -82,17 +87,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-antrun-plugin/1.1/maven-antrun-plugin-1.1.pom.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-antrun-plugin/1.1/maven-antrun-plugin-1.1.pom.json
index 65ef14bfdf1..5be8e2c8bc3 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-antrun-plugin/1.1/maven-antrun-plugin-1.1.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-antrun-plugin/1.1/maven-antrun-plugin-1.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-antrun-plugin", 
   "version": "1.1", 
   "classifier": null, 
-  "packaging ": "maven-plugin", 
+  "packaging": "maven-plugin", 
   "parent": {
     "group_id": "org.apache.maven.plugins", 
     "artifact_id": "maven-plugin-parent", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-antrun-plugin/1.1/maven-antrun-plugin-1.1.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-antrun-plugin/1.1/maven-antrun-plugin-1.1.pom.package.json
index 5ef68dd26f5..049647c4b8b 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-antrun-plugin/1.1/maven-antrun-plugin-1.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-antrun-plugin/1.1/maven-antrun-plugin-1.1.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.plugins:maven-antrun-plugin", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.plugins", 
+  "name": "maven-antrun-plugin", 
   "version": "1.1", 
+  "qualifiers": {
+    "packaging": "maven-plugin"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Runs ant scripts embedded in the POM", 
+  "description": "Maven AntRun Plugin\nRuns ant scripts embedded in the POM", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,29 +31,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "ant:ant", 
-        "version": "1.6.5"
-      }
-    ], 
-    "runtime": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "ant:ant-launcher", 
-        "version": "1.6.5"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:ant/ant", 
+      "requirement": "1.6.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:ant/ant-launcher", 
+      "requirement": "1.6.5", 
+      "scope": "runtime", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-assembly-plugin/2.2-beta-2/maven-assembly-plugin-2.2-beta-2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-assembly-plugin/2.2-beta-2/maven-assembly-plugin-2.2-beta-2.pom.json
index 57d98ca701f..a1ad4c7fc4c 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-assembly-plugin/2.2-beta-2/maven-assembly-plugin-2.2-beta-2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-assembly-plugin/2.2-beta-2/maven-assembly-plugin-2.2-beta-2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-assembly-plugin", 
   "version": "2.2-beta-2", 
   "classifier": null, 
-  "packaging ": "maven-plugin", 
+  "packaging": "maven-plugin", 
   "parent": {
     "group_id": "org.apache.maven.plugins", 
     "artifact_id": "maven-plugins", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-assembly-plugin/2.2-beta-2/maven-assembly-plugin-2.2-beta-2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-assembly-plugin/2.2-beta-2/maven-assembly-plugin-2.2-beta-2.pom.package.json
index d6162d9b5ee..c55cc7af94b 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-assembly-plugin/2.2-beta-2/maven-assembly-plugin-2.2-beta-2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-assembly-plugin/2.2-beta-2/maven-assembly-plugin-2.2-beta-2.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.plugins:maven-assembly-plugin", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.plugins", 
+  "name": "maven-assembly-plugin", 
   "version": "2.2-beta-2", 
+  "qualifiers": {
+    "packaging": "maven-plugin"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Assembly Plugin", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,124 +23,186 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "aspectj:aspectjrt", 
-        "version": "1.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-archiver", 
-        "version": "1.0-alpha-10"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:file-management", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-shared-io", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-active-collections", 
-        "version": "1.0-beta-2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-io", 
-        "version": "1.0-alpha-2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-archiver", 
-        "version": "2.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-9-stable-1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.5.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "2.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-repository-builder", 
-        "version": "1.0-alpha-2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-common-artifact-filters", 
-        "version": "1.0"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-plugin-testing-tools", 
-        "version": "1.0-alpha-1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-test-tools", 
-        "version": "1.0-alpha-1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "easymock:easymock", 
-        "version": "1.2_Java1.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jdom:jdom", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jaxen:jaxen", 
-        "version": "1.0-FCS"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "saxpath:saxpath", 
-        "version": "1.0-FCS"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:aspectj/aspectjrt", 
+      "requirement": "1.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-archiver", 
+      "requirement": "1.0-alpha-10", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/file-management", 
+      "requirement": "1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-shared-io", 
+      "requirement": "1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-active-collections", 
+      "requirement": "1.0-beta-2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-io", 
+      "requirement": "1.0-alpha-2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-archiver", 
+      "requirement": "2.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-9-stable-1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.5.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": "2.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-repository-builder", 
+      "requirement": "1.0-alpha-2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-common-artifact-filters", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-plugin-testing-tools", 
+      "requirement": "1.0-alpha-1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-test-tools", 
+      "requirement": "1.0-alpha-1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:easymock/easymock", 
+      "requirement": "1.2_Java1.3", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jdom/jdom", 
+      "requirement": "1.0", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jaxen/jaxen", 
+      "requirement": "1.0-FCS", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:saxpath/saxpath", 
+      "requirement": "1.0-FCS", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-checkstyle-plugin/2.1/maven-checkstyle-plugin-2.1.pom.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-checkstyle-plugin/2.1/maven-checkstyle-plugin-2.1.pom.json
index ef5ff2328a2..04322431310 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-checkstyle-plugin/2.1/maven-checkstyle-plugin-2.1.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-checkstyle-plugin/2.1/maven-checkstyle-plugin-2.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-checkstyle-plugin", 
   "version": "2.1", 
   "classifier": null, 
-  "packaging ": "maven-plugin", 
+  "packaging": "maven-plugin", 
   "parent": {
     "group_id": "org.apache.maven.plugins", 
     "artifact_id": "maven-plugins", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-checkstyle-plugin/2.1/maven-checkstyle-plugin-2.1.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-checkstyle-plugin/2.1/maven-checkstyle-plugin-2.1.pom.package.json
index 21d8f05f18b..8d50b0cd8b6 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-checkstyle-plugin/2.1/maven-checkstyle-plugin-2.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-checkstyle-plugin/2.1/maven-checkstyle-plugin-2.1.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.plugins:maven-checkstyle-plugin", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.plugins", 
+  "name": "maven-checkstyle-plugin", 
   "version": "2.1", 
+  "qualifiers": {
+    "packaging": "maven-plugin"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Checkstyle Plugin", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,49 +31,66 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "checkstyle:checkstyle", 
-        "version": "4.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.reporting:maven-reporting-impl", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-velocity", 
-        "version": "1.1.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "checkstyle:checkstyle-optional", 
-        "version": "4.1"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-plugin-testing-harness", 
-        "version": "1.0-beta-1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:checkstyle/checkstyle", 
+      "requirement": "4.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.reporting/maven-reporting-impl", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-velocity", 
+      "requirement": "1.1.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:checkstyle/checkstyle-optional", 
+      "requirement": "4.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-plugin-testing-harness", 
+      "requirement": "1.0-beta-1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-checkstyle-plugin/2.2/maven-checkstyle-plugin-2.2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-checkstyle-plugin/2.2/maven-checkstyle-plugin-2.2.pom.json
index a1f7261c366..e9e2a782a8a 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-checkstyle-plugin/2.2/maven-checkstyle-plugin-2.2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-checkstyle-plugin/2.2/maven-checkstyle-plugin-2.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-checkstyle-plugin", 
   "version": "2.2", 
   "classifier": null, 
-  "packaging ": "maven-plugin", 
+  "packaging": "maven-plugin", 
   "parent": {
     "group_id": "org.apache.maven.plugins", 
     "artifact_id": "maven-plugins", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-checkstyle-plugin/2.2/maven-checkstyle-plugin-2.2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-checkstyle-plugin/2.2/maven-checkstyle-plugin-2.2.pom.package.json
index bd939061d11..46f5ba09cc4 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-checkstyle-plugin/2.2/maven-checkstyle-plugin-2.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-checkstyle-plugin/2.2/maven-checkstyle-plugin-2.2.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.plugins:maven-checkstyle-plugin", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.plugins", 
+  "name": "maven-checkstyle-plugin", 
   "version": "2.2", 
+  "qualifiers": {
+    "packaging": "maven-plugin"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Checkstyle Plugin", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,84 +31,122 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.reporting:maven-reporting-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.reporting:maven-reporting-impl", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-doxia-tools", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-9"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-resources", 
-        "version": "1.0-alpha-4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.4.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-velocity", 
-        "version": "1.1.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "checkstyle:checkstyle", 
-        "version": "4.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "checkstyle:checkstyle-optional", 
-        "version": "4.4"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-plugin-testing-harness", 
-        "version": "1.0-beta-1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.reporting/maven-reporting-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.reporting/maven-reporting-impl", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-doxia-tools", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-9", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-resources", 
+      "requirement": "1.0-alpha-4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.4.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-velocity", 
+      "requirement": "1.1.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:checkstyle/checkstyle", 
+      "requirement": "4.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:checkstyle/checkstyle-optional", 
+      "requirement": "4.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-plugin-testing-harness", 
+      "requirement": "1.0-beta-1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-clean-plugin/2.2/maven-clean-plugin-2.2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-clean-plugin/2.2/maven-clean-plugin-2.2.pom.json
index 8750083b18e..eab24b9326b 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-clean-plugin/2.2/maven-clean-plugin-2.2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-clean-plugin/2.2/maven-clean-plugin-2.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-clean-plugin", 
   "version": "2.2", 
   "classifier": null, 
-  "packaging ": "maven-plugin", 
+  "packaging": "maven-plugin", 
   "parent": {
     "group_id": "org.apache.maven.plugins", 
     "artifact_id": "maven-plugins", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-clean-plugin/2.2/maven-clean-plugin-2.2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-clean-plugin/2.2/maven-clean-plugin-2.2.pom.package.json
index a1e264aed3e..cf19c0c2d73 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-clean-plugin/2.2/maven-clean-plugin-2.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-clean-plugin/2.2/maven-clean-plugin-2.2.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.plugins:maven-clean-plugin", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.plugins", 
+  "name": "maven-clean-plugin", 
   "version": "2.2", 
+  "qualifiers": {
+    "packaging": "maven-plugin"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "The Maven Clean Plugin is a plugin that removes files generated at build-time in a project's directory.", 
+  "description": "Maven Clean Plugin\nThe Maven Clean Plugin is a plugin that removes files generated at build-time in a project's directory.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,39 +31,50 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:file-management", 
-        "version": "1.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.1"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-plugin-testing-harness", 
-        "version": "1.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/file-management", 
+      "requirement": "1.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-plugin-testing-harness", 
+      "requirement": "1.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-compiler-plugin/2.0.2/maven-compiler-plugin-2.0.2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-compiler-plugin/2.0.2/maven-compiler-plugin-2.0.2.pom.json
index 75a03589ea2..18d32806f5c 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-compiler-plugin/2.0.2/maven-compiler-plugin-2.0.2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-compiler-plugin/2.0.2/maven-compiler-plugin-2.0.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-compiler-plugin", 
   "version": "2.0.2", 
   "classifier": null, 
-  "packaging ": "maven-plugin", 
+  "packaging": "maven-plugin", 
   "parent": {
     "group_id": "org.apache.maven.plugins", 
     "artifact_id": "maven-plugins", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-compiler-plugin/2.0.2/maven-compiler-plugin-2.0.2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-compiler-plugin/2.0.2/maven-compiler-plugin-2.0.2.pom.package.json
index d2e71747939..f41bcfa6e7b 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-compiler-plugin/2.0.2/maven-compiler-plugin-2.0.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-compiler-plugin/2.0.2/maven-compiler-plugin-2.0.2.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.plugins:maven-compiler-plugin", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.plugins", 
+  "name": "maven-compiler-plugin", 
   "version": "2.0.2", 
+  "qualifiers": {
+    "packaging": "maven-plugin"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Compiler Plugin", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,51 +23,66 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-compiler-api", 
-        "version": "1.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-compiler-manager", 
-        "version": "1.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-plugin-testing-harness", 
-        "version": "1.0-beta-1"
-      }
-    ], 
-    "runtime": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-compiler-javac", 
-        "version": "1.5.3"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-compiler-api", 
+      "requirement": "1.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-compiler-manager", 
+      "requirement": "1.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-compiler-javac", 
+      "requirement": "1.5.3", 
+      "scope": "runtime", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-plugin-testing-harness", 
+      "requirement": "1.0-beta-1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-dependency-plugin/2.0/maven-dependency-plugin-2.0.pom.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-dependency-plugin/2.0/maven-dependency-plugin-2.0.pom.json
index ffdd85528eb..0f965e4362f 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-dependency-plugin/2.0/maven-dependency-plugin-2.0.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-dependency-plugin/2.0/maven-dependency-plugin-2.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-dependency-plugin", 
   "version": "2.0", 
   "classifier": null, 
-  "packaging ": "maven-plugin", 
+  "packaging": "maven-plugin", 
   "parent": {
     "group_id": "org.apache.maven.plugins", 
     "artifact_id": "maven-plugins", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-dependency-plugin/2.0/maven-dependency-plugin-2.0.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-dependency-plugin/2.0/maven-dependency-plugin-2.0.pom.package.json
index acf275c62c0..8628ae8b1a7 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-dependency-plugin/2.0/maven-dependency-plugin-2.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-dependency-plugin/2.0/maven-dependency-plugin-2.0.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.plugins:maven-dependency-plugin", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.plugins", 
+  "name": "maven-dependency-plugin", 
   "version": "2.0", 
+  "qualifiers": {
+    "packaging": "maven-plugin"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Dependency Plugin", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -40,114 +45,170 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "Apache License 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "Apache License 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0.8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0.8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0.8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "2.0.8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-core", 
-        "version": "2.0.8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-archiver", 
-        "version": "1.0-alpha-9"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.4.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:file-management", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-9-stable-1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-dependency-analyzer", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-dependency-tree", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-common-artifact-filters", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-io", 
-        "version": "1.0-alpha-1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.reporting:maven-reporting-api", 
-        "version": "2.0.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.reporting:maven-reporting-impl", 
-        "version": "2.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.doxia:doxia-sink-api", 
-        "version": "1.0-alpha-8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.doxia:doxia-site-renderer", 
-        "version": "1.0-alpha-8"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-plugin-testing-tools", 
-        "version": "1.0-alpha-3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-plugin-testing-harness", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.2"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0.8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0.8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0.8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": "2.0.8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-core", 
+      "requirement": "2.0.8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-archiver", 
+      "requirement": "1.0-alpha-9", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.4.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/file-management", 
+      "requirement": "1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-9-stable-1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-dependency-analyzer", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-dependency-tree", 
+      "requirement": "1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-common-artifact-filters", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-io", 
+      "requirement": "1.0-alpha-1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.reporting/maven-reporting-api", 
+      "requirement": "2.0.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.reporting/maven-reporting-impl", 
+      "requirement": "2.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.doxia/doxia-sink-api", 
+      "requirement": "1.0-alpha-8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.doxia/doxia-site-renderer", 
+      "requirement": "1.0-alpha-8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-plugin-testing-tools", 
+      "requirement": "1.0-alpha-3", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-plugin-testing-harness", 
+      "requirement": "1.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.2", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-install-plugin/2.2/maven-install-plugin-2.2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-install-plugin/2.2/maven-install-plugin-2.2.pom.json
index 94050002704..8b8cf685386 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-install-plugin/2.2/maven-install-plugin-2.2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-install-plugin/2.2/maven-install-plugin-2.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-install-plugin", 
   "version": "2.2", 
   "classifier": null, 
-  "packaging ": "maven-plugin", 
+  "packaging": "maven-plugin", 
   "parent": {
     "group_id": "org.apache.maven.plugins", 
     "artifact_id": "maven-plugins", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-install-plugin/2.2/maven-install-plugin-2.2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-install-plugin/2.2/maven-install-plugin-2.2.pom.package.json
index a2bc37b41f7..7de9df46fd6 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-install-plugin/2.2/maven-install-plugin-2.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-install-plugin/2.2/maven-install-plugin-2.2.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.plugins:maven-install-plugin", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.plugins", 
+  "name": "maven-install-plugin", 
   "version": "2.2", 
+  "qualifiers": {
+    "packaging": "maven-plugin"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Install Plugin", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,44 +23,58 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact-manager", 
-        "version": "2.0.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-digest", 
-        "version": "1.0"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-plugin-testing-harness", 
-        "version": "1.0-beta-1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact-manager", 
+      "requirement": "2.0.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-digest", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-plugin-testing-harness", 
+      "requirement": "1.0-beta-1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-jar-plugin/2.2/maven-jar-plugin-2.2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-jar-plugin/2.2/maven-jar-plugin-2.2.pom.json
index 7d494f5e13c..f6594b8b57c 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-jar-plugin/2.2/maven-jar-plugin-2.2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-jar-plugin/2.2/maven-jar-plugin-2.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-jar-plugin", 
   "version": "2.2", 
   "classifier": null, 
-  "packaging ": "maven-plugin", 
+  "packaging": "maven-plugin", 
   "parent": {
     "group_id": "org.apache.maven.plugins", 
     "artifact_id": "maven-plugins", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-jar-plugin/2.2/maven-jar-plugin-2.2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-jar-plugin/2.2/maven-jar-plugin-2.2.pom.package.json
index 4c01082c276..2ae3c504133 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-jar-plugin/2.2/maven-jar-plugin-2.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-jar-plugin/2.2/maven-jar-plugin-2.2.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.plugins:maven-jar-plugin", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.plugins", 
+  "name": "maven-jar-plugin", 
   "version": "2.2", 
+  "qualifiers": {
+    "packaging": "maven-plugin"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Jar Plugin", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,54 +31,74 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0.7"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-archiver", 
-        "version": "2.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-archiver", 
-        "version": "1.0-alpha-9"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-io", 
-        "version": "1.0-alpha-1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-lang:commons-lang", 
-        "version": "2.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.4.9"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-plugin-testing-harness", 
-        "version": "1.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0.7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-archiver", 
+      "requirement": "2.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-archiver", 
+      "requirement": "1.0-alpha-9", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-io", 
+      "requirement": "1.0-alpha-1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-lang/commons-lang", 
+      "requirement": "2.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.4.9", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-plugin-testing-harness", 
+      "requirement": "1.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugin-parent/2.0.1/maven-plugin-parent-2.0.1.pom.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugin-parent/2.0.1/maven-plugin-parent-2.0.1.pom.json
index 513648941af..87a5719c65b 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugin-parent/2.0.1/maven-plugin-parent-2.0.1.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugin-parent/2.0.1/maven-plugin-parent-2.0.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-plugin-parent", 
   "version": "2.0.1", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Maven Plugins", 
   "description": "Maven Plugins", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugin-parent/2.0.1/maven-plugin-parent-2.0.1.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugin-parent/2.0.1/maven-plugin-parent-2.0.1.pom.package.json
index 51cae95b341..91a0a5ca6ec 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugin-parent/2.0.1/maven-plugin-parent-2.0.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugin-parent/2.0.1/maven-plugin-parent-2.0.1.pom.package.json
@@ -1,7 +1,12 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.plugins:maven-plugin-parent", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.plugins", 
+  "name": "maven-plugin-parent", 
   "version": "2.0.1", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Maven Plugins", 
@@ -82,24 +87,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ], 
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/1/maven-plugins-1.pom.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/1/maven-plugins-1.pom.json
index ad472bcc878..dcdb96c4ff7 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/1/maven-plugins-1.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/1/maven-plugins-1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-plugins", 
   "version": "1", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven-parent", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/1/maven-plugins-1.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/1/maven-plugins-1.pom.package.json
index b45b1a4e3ea..42736e604c8 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/1/maven-plugins-1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/1/maven-plugins-1.pom.package.json
@@ -1,7 +1,12 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.plugins:maven-plugins", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.plugins", 
+  "name": "maven-plugins", 
   "version": "1", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Maven Plugins", 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/10/maven-plugins-10.pom.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/10/maven-plugins-10.pom.json
index 077d46e9192..b131b0bfed6 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/10/maven-plugins-10.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/10/maven-plugins-10.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-plugins", 
   "version": "10", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven-parent", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/10/maven-plugins-10.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/10/maven-plugins-10.pom.package.json
index e950932923b..e80958e1478 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/10/maven-plugins-10.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/10/maven-plugins-10.pom.package.json
@@ -1,7 +1,12 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.plugins:maven-plugins", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.plugins", 
+  "name": "maven-plugins", 
   "version": "10", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Maven Plugins", 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/11/maven-plugins-11.pom.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/11/maven-plugins-11.pom.json
index 31893427066..a0306d5f927 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/11/maven-plugins-11.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/11/maven-plugins-11.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-plugins", 
   "version": "11", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven-parent", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/11/maven-plugins-11.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/11/maven-plugins-11.pom.package.json
index 1e7ecc64c05..3cfdc425845 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/11/maven-plugins-11.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/11/maven-plugins-11.pom.package.json
@@ -1,7 +1,12 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.plugins:maven-plugins", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.plugins", 
+  "name": "maven-plugins", 
   "version": "11", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Maven Plugins", 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/8/maven-plugins-8.pom.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/8/maven-plugins-8.pom.json
index 12233a3bcc0..81a82dae1e8 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/8/maven-plugins-8.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/8/maven-plugins-8.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-plugins", 
   "version": "8", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven-parent", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/8/maven-plugins-8.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/8/maven-plugins-8.pom.package.json
index 05157c23101..0dfa9bc5fd7 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/8/maven-plugins-8.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-plugins/8/maven-plugins-8.pom.package.json
@@ -1,7 +1,12 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.plugins:maven-plugins", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.plugins", 
+  "name": "maven-plugins", 
   "version": "8", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Maven Plugins", 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-pmd-plugin/2.3/maven-pmd-plugin-2.3.pom.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-pmd-plugin/2.3/maven-pmd-plugin-2.3.pom.json
index 8c1065e8340..830e59411ad 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-pmd-plugin/2.3/maven-pmd-plugin-2.3.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-pmd-plugin/2.3/maven-pmd-plugin-2.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-pmd-plugin", 
   "version": "2.3", 
   "classifier": null, 
-  "packaging ": "maven-plugin", 
+  "packaging": "maven-plugin", 
   "parent": {
     "group_id": "org.apache.maven.plugins", 
     "artifact_id": "maven-plugins", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-pmd-plugin/2.3/maven-pmd-plugin-2.3.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-pmd-plugin/2.3/maven-pmd-plugin-2.3.pom.package.json
index 31a93f905bd..479284610b2 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-pmd-plugin/2.3/maven-pmd-plugin-2.3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-pmd-plugin/2.3/maven-pmd-plugin-2.3.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.plugins:maven-pmd-plugin", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.plugins", 
+  "name": "maven-pmd-plugin", 
   "version": "2.3", 
+  "qualifiers": {
+    "packaging": "maven-plugin"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "A Maven plugin for the PMD toolkit, that produces a report on both code rule violations and detected copy and paste\n    fragments,\n    as well as being able to fail the build based on these metrics.", 
+  "description": "Maven PMD Plugin\nA Maven plugin for the PMD toolkit, that produces a report on both code rule violations and detected copy and paste\n    fragments,\n    as well as being able to fail the build based on these metrics.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,64 +31,90 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.reporting:maven-reporting-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.reporting:maven-reporting-impl", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-plugin-testing-harness", 
-        "version": "1.0-beta-1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-resources", 
-        "version": "1.0-alpha-4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.4.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "pmd:pmd-jdk14", 
-        "version": "4.1.1"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.reporting/maven-reporting-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.reporting/maven-reporting-impl", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-plugin-testing-harness", 
+      "requirement": "1.0-beta-1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-resources", 
+      "requirement": "1.0-alpha-4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.4.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:pmd/pmd-jdk14", 
+      "requirement": "4.1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-release-plugin/2.0-beta-7/maven-release-plugin-2.0-beta-7.pom.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-release-plugin/2.0-beta-7/maven-release-plugin-2.0-beta-7.pom.json
index db81919e4f4..b76e2468be8 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-release-plugin/2.0-beta-7/maven-release-plugin-2.0-beta-7.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-release-plugin/2.0-beta-7/maven-release-plugin-2.0-beta-7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-release-plugin", 
   "version": "2.0-beta-7", 
   "classifier": null, 
-  "packaging ": "maven-plugin", 
+  "packaging": "maven-plugin", 
   "parent": {
     "group_id": "org.apache.maven.release", 
     "artifact_id": "maven-release", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-release-plugin/2.0-beta-7/maven-release-plugin-2.0-beta-7.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-release-plugin/2.0-beta-7/maven-release-plugin-2.0-beta-7.pom.package.json
index 702b628229a..31446b573a6 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-release-plugin/2.0-beta-7/maven-release-plugin-2.0-beta-7.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-release-plugin/2.0-beta-7/maven-release-plugin-2.0-beta-7.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.plugins:maven-release-plugin", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.plugins", 
+  "name": "maven-release-plugin", 
   "version": "2.0-beta-7", 
+  "qualifiers": {
+    "packaging": "maven-plugin"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Release Plugin", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,39 +23,50 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.release:maven-release-manager", 
-        "version": "1.0-alpha-4"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "jmock:jmock-cglib", 
-        "version": "1.0.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.scm:maven-scm-test", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-plugin-testing-harness", 
-        "version": "1.0-beta-1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.release/maven-release-manager", 
+      "requirement": "1.0-alpha-4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jmock/jmock-cglib", 
+      "requirement": "1.0.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.scm/maven-scm-test", 
+      "requirement": "1.0", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-plugin-testing-harness", 
+      "requirement": "1.0-beta-1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-resources-plugin/2.2/maven-resources-plugin-2.2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-resources-plugin/2.2/maven-resources-plugin-2.2.pom.json
index 17c35542db8..95cb30f091e 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-resources-plugin/2.2/maven-resources-plugin-2.2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-resources-plugin/2.2/maven-resources-plugin-2.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-resources-plugin", 
   "version": "2.2", 
   "classifier": null, 
-  "packaging ": "maven-plugin", 
+  "packaging": "maven-plugin", 
   "parent": {
     "group_id": "org.apache.maven.plugins", 
     "artifact_id": "maven-plugins", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-resources-plugin/2.2/maven-resources-plugin-2.2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-resources-plugin/2.2/maven-resources-plugin-2.2.pom.package.json
index b89c2837905..f01f397aca2 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-resources-plugin/2.2/maven-resources-plugin-2.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-resources-plugin/2.2/maven-resources-plugin-2.2.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.plugins:maven-resources-plugin", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.plugins", 
+  "name": "maven-resources-plugin", 
   "version": "2.2", 
+  "qualifiers": {
+    "packaging": "maven-plugin"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Resources Plugin", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,34 +23,42 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "2.0"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-plugin-testing-harness", 
-        "version": "1.0-beta-1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-plugin-testing-harness", 
+      "requirement": "1.0-beta-1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-site-plugin/2.0-beta-6/maven-site-plugin-2.0-beta-6.pom.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-site-plugin/2.0-beta-6/maven-site-plugin-2.0-beta-6.pom.json
index 0b84c989247..74d2264dca7 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-site-plugin/2.0-beta-6/maven-site-plugin-2.0-beta-6.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-site-plugin/2.0-beta-6/maven-site-plugin-2.0-beta-6.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-site-plugin", 
   "version": "2.0-beta-6", 
   "classifier": null, 
-  "packaging ": "maven-plugin", 
+  "packaging": "maven-plugin", 
   "parent": {
     "group_id": "org.apache.maven.plugins", 
     "artifact_id": "maven-plugins", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-site-plugin/2.0-beta-6/maven-site-plugin-2.0-beta-6.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-site-plugin/2.0-beta-6/maven-site-plugin-2.0-beta-6.pom.package.json
index 498b9f4a68c..1a8880a323e 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-site-plugin/2.0-beta-6/maven-site-plugin-2.0-beta-6.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-site-plugin/2.0-beta-6/maven-site-plugin-2.0-beta-6.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.plugins:maven-site-plugin", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.plugins", 
+  "name": "maven-site-plugin", 
   "version": "2.0-beta-6", 
+  "qualifiers": {
+    "packaging": "maven-plugin"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Site plugin", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -110,104 +115,154 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact-manager", 
-        "version": "2.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "2.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-settings", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.doxia:doxia-module-xhtml", 
-        "version": "1.0-alpha-10"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.doxia:doxia-sink-api", 
-        "version": "1.0-alpha-10"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.doxia:doxia-decoration-model", 
-        "version": "1.0-alpha-10"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.doxia:doxia-site-renderer", 
-        "version": "1.0-alpha-10"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.reporting:maven-reporting-api", 
-        "version": "2.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-provider-api", 
-        "version": "1.0-beta-2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-archiver", 
-        "version": "1.0-alpha-7"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-9"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-i18n", 
-        "version": "1.0-beta-7"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.4.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.mortbay.jetty:jetty", 
-        "version": "6.1.5"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-plugin-testing-harness", 
-        "version": "1.0-beta-1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact-manager", 
+      "requirement": "2.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": "2.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-settings", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.doxia/doxia-module-xhtml", 
+      "requirement": "1.0-alpha-10", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.doxia/doxia-sink-api", 
+      "requirement": "1.0-alpha-10", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.doxia/doxia-decoration-model", 
+      "requirement": "1.0-alpha-10", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.doxia/doxia-site-renderer", 
+      "requirement": "1.0-alpha-10", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.reporting/maven-reporting-api", 
+      "requirement": "2.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-provider-api", 
+      "requirement": "1.0-beta-2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-archiver", 
+      "requirement": "1.0-alpha-7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-9", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-i18n", 
+      "requirement": "1.0-beta-7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.4.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.mortbay.jetty/jetty", 
+      "requirement": "6.1.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-plugin-testing-harness", 
+      "requirement": "1.0-beta-1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-source-plugin/2.0.4/maven-source-plugin-2.0.4.pom.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-source-plugin/2.0.4/maven-source-plugin-2.0.4.pom.json
index 81407f74c4f..7fcd758f4c7 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-source-plugin/2.0.4/maven-source-plugin-2.0.4.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-source-plugin/2.0.4/maven-source-plugin-2.0.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-source-plugin", 
   "version": "2.0.4", 
   "classifier": null, 
-  "packaging ": "maven-plugin", 
+  "packaging": "maven-plugin", 
   "parent": {
     "group_id": "org.apache.maven.plugins", 
     "artifact_id": "maven-plugins", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-source-plugin/2.0.4/maven-source-plugin-2.0.4.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-source-plugin/2.0.4/maven-source-plugin-2.0.4.pom.package.json
index cf308344996..66894e8f830 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-source-plugin/2.0.4/maven-source-plugin-2.0.4.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-source-plugin/2.0.4/maven-source-plugin-2.0.4.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.plugins:maven-source-plugin", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.plugins", 
+  "name": "maven-source-plugin", 
   "version": "2.0.4", 
+  "qualifiers": {
+    "packaging": "maven-plugin"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Source Plugin", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,59 +23,82 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-archiver", 
-        "version": "1.0-alpha-7"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-9"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-plugin-testing-harness", 
-        "version": "1.0-beta-1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-archiver", 
+      "requirement": "1.0-alpha-7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-9", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-plugin-testing-harness", 
+      "requirement": "1.0-beta-1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-surefire-plugin/2.4.2/maven-surefire-plugin-2.4.2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-surefire-plugin/2.4.2/maven-surefire-plugin-2.4.2.pom.json
index 1d20989e164..35520928da0 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-surefire-plugin/2.4.2/maven-surefire-plugin-2.4.2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-surefire-plugin/2.4.2/maven-surefire-plugin-2.4.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-surefire-plugin", 
   "version": "2.4.2", 
   "classifier": null, 
-  "packaging ": "maven-plugin", 
+  "packaging": "maven-plugin", 
   "parent": {
     "group_id": "org.apache.maven.surefire", 
     "artifact_id": "surefire", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-surefire-plugin/2.4.2/maven-surefire-plugin-2.4.2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-surefire-plugin/2.4.2/maven-surefire-plugin-2.4.2.pom.package.json
index 8755fd8f924..e98b8fbf96f 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-surefire-plugin/2.4.2/maven-surefire-plugin-2.4.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-surefire-plugin/2.4.2/maven-surefire-plugin-2.4.2.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.plugins:maven-surefire-plugin", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.plugins", 
+  "name": "maven-surefire-plugin", 
   "version": "2.4.2", 
+  "qualifiers": {
+    "packaging": "maven-plugin"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Surefire Plugin", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,42 +31,58 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.surefire:surefire-booter", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-core", 
-        "version": "2.0"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.surefire/surefire-booter", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-core", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-war-plugin/2.1-alpha-1/maven-war-plugin-2.1-alpha-1.pom.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-war-plugin/2.1-alpha-1/maven-war-plugin-2.1-alpha-1.pom.json
index 4cd96e5376d..3133280ed92 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-war-plugin/2.1-alpha-1/maven-war-plugin-2.1-alpha-1.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-war-plugin/2.1-alpha-1/maven-war-plugin-2.1-alpha-1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-war-plugin", 
   "version": "2.1-alpha-1", 
   "classifier": null, 
-  "packaging ": "maven-plugin", 
+  "packaging": "maven-plugin", 
   "parent": {
     "group_id": "org.apache.maven.plugins", 
     "artifact_id": "maven-plugins", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-war-plugin/2.1-alpha-1/maven-war-plugin-2.1-alpha-1.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-war-plugin/2.1-alpha-1/maven-war-plugin-2.1-alpha-1.pom.package.json
index d9358678ac3..93c5a55d12b 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-war-plugin/2.1-alpha-1/maven-war-plugin-2.1-alpha-1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/plugins/maven-war-plugin/2.1-alpha-1/maven-war-plugin-2.1-alpha-1.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.plugins:maven-war-plugin", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.plugins", 
+  "name": "maven-war-plugin", 
   "version": "2.1-alpha-1", 
+  "qualifiers": {
+    "packaging": "maven-plugin"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven War Plugin", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,49 +23,66 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-archiver", 
-        "version": "2.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.4.7"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.thoughtworks.xstream:xstream", 
-        "version": "1.2.2"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-plugin-testing-harness", 
-        "version": "1.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-archiver", 
+      "requirement": "2.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.4.7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.thoughtworks.xstream/xstream", 
+      "requirement": "1.2.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-plugin-testing-harness", 
+      "requirement": "1.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/release/maven-release/4/maven-release-4.pom.json b/tests/packagedcode/data/m2/org/apache/maven/release/maven-release/4/maven-release-4.pom.json
index 5c6d84ff5a5..e6a470ca526 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/release/maven-release/4/maven-release-4.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/release/maven-release/4/maven-release-4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-release", 
   "version": "4", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven-parent", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/release/maven-release/4/maven-release-4.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/release/maven-release/4/maven-release-4.pom.package.json
index 07ef1d8fb1f..0091545feac 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/release/maven-release/4/maven-release-4.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/release/maven-release/4/maven-release-4.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.release:maven-release", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.release", 
+  "name": "maven-release", 
   "version": "4", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Release", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0.4/maven-reporting-api-2.0.4.pom.json b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0.4/maven-reporting-api-2.0.4.pom.json
index 76136a15533..079a9182ff5 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0.4/maven-reporting-api-2.0.4.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0.4/maven-reporting-api-2.0.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-reporting-api", 
   "version": "2.0.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.reporting", 
     "artifact_id": "maven-reporting", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0.4/maven-reporting-api-2.0.4.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0.4/maven-reporting-api-2.0.4.pom.package.json
index 922786d0a12..bb16f3cfffd 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0.4/maven-reporting-api-2.0.4.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0.4/maven-reporting-api-2.0.4.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.reporting:maven-reporting-api", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.reporting", 
+  "name": "maven-reporting-api", 
   "version": "2.0.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Reporting API", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,17 +29,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.doxia:doxia-sink-api", 
-        "version": "1.0-alpha-7"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven.doxia/doxia-sink-api", 
+      "requirement": "1.0-alpha-7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom.json b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom.json
index 32403c6a80e..02d10e14414 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-reporting-api", 
   "version": "2.0.6", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.reporting", 
     "artifact_id": "maven-reporting", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom.package.json
index da76fc32d1b..e134bcc8963 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.reporting:maven-reporting-api", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.reporting", 
+  "name": "maven-reporting-api", 
   "version": "2.0.6", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Reporting API", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,17 +29,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.doxia:doxia-sink-api", 
-        "version": "1.0-alpha-7"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven.doxia/doxia-sink-api", 
+      "requirement": "1.0-alpha-7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0.8/maven-reporting-api-2.0.8.pom.json b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0.8/maven-reporting-api-2.0.8.pom.json
index f1c4f4672f3..c1562fbf43c 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0.8/maven-reporting-api-2.0.8.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0.8/maven-reporting-api-2.0.8.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-reporting-api", 
   "version": "2.0.8", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.reporting", 
     "artifact_id": "maven-reporting", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0.8/maven-reporting-api-2.0.8.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0.8/maven-reporting-api-2.0.8.pom.package.json
index 31831f367e2..f6a8f2b1b94 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0.8/maven-reporting-api-2.0.8.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0.8/maven-reporting-api-2.0.8.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.reporting:maven-reporting-api", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.reporting", 
+  "name": "maven-reporting-api", 
   "version": "2.0.8", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Reporting API", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,17 +29,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.doxia:doxia-sink-api", 
-        "version": "1.0-alpha-9"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven.doxia/doxia-sink-api", 
+      "requirement": "1.0-alpha-9", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0/maven-reporting-api-2.0.pom.json b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0/maven-reporting-api-2.0.pom.json
index de727530354..0df84fd365b 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0/maven-reporting-api-2.0.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0/maven-reporting-api-2.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-reporting-api", 
   "version": "2.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.reporting", 
     "artifact_id": "maven-reporting", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0/maven-reporting-api-2.0.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0/maven-reporting-api-2.0.pom.package.json
index 3d8914a6e3d..d41a74d61df 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0/maven-reporting-api-2.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-api/2.0/maven-reporting-api-2.0.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.reporting:maven-reporting-api", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.reporting", 
+  "name": "maven-reporting-api", 
   "version": "2.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -26,17 +29,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "doxia:doxia-sink-api", 
-        "version": "1.0-alpha-4"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:doxia/doxia-sink-api", 
+      "requirement": "1.0-alpha-4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-impl/2.0.4/maven-reporting-impl-2.0.4.pom.json b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-impl/2.0.4/maven-reporting-impl-2.0.4.pom.json
index f1ffae7c8dd..2214f738597 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-impl/2.0.4/maven-reporting-impl-2.0.4.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-impl/2.0.4/maven-reporting-impl-2.0.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-reporting-impl", 
   "version": "2.0.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.reporting", 
     "artifact_id": "maven-reporting", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-impl/2.0.4/maven-reporting-impl-2.0.4.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-impl/2.0.4/maven-reporting-impl-2.0.4.pom.package.json
index 9667a9624b3..b4a118a95e6 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-impl/2.0.4/maven-reporting-impl-2.0.4.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-impl/2.0.4/maven-reporting-impl-2.0.4.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.reporting:maven-reporting-impl", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.reporting", 
+  "name": "maven-reporting-impl", 
   "version": "2.0.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Reporting Implementation", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,47 +29,66 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-validator:commons-validator", 
-        "version": "1.2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.doxia:doxia-core", 
-        "version": "1.0-alpha-7"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "oro:oro", 
-        "version": "2.0.7"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.reporting:maven-reporting-api", 
-        "version": "2.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.doxia:doxia-site-renderer", 
-        "version": "1.0-alpha-7"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-validator/commons-validator", 
+      "requirement": "1.2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.doxia/doxia-core", 
+      "requirement": "1.0-alpha-7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:oro/oro", 
+      "requirement": "2.0.7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.reporting/maven-reporting-api", 
+      "requirement": "2.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.doxia/doxia-site-renderer", 
+      "requirement": "1.0-alpha-7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-impl/2.0/maven-reporting-impl-2.0.pom.json b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-impl/2.0/maven-reporting-impl-2.0.pom.json
index e7a3b82d5fc..6b63a3e1d79 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-impl/2.0/maven-reporting-impl-2.0.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-impl/2.0/maven-reporting-impl-2.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-reporting-impl", 
   "version": "2.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.reporting", 
     "artifact_id": "maven-reporting", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-impl/2.0/maven-reporting-impl-2.0.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-impl/2.0/maven-reporting-impl-2.0.pom.package.json
index 460d173a207..28d4695ff40 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-impl/2.0/maven-reporting-impl-2.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting-impl/2.0/maven-reporting-impl-2.0.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.reporting:maven-reporting-impl", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.reporting", 
+  "name": "maven-reporting-impl", 
   "version": "2.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -26,42 +29,58 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-validator:commons-validator", 
-        "version": "1.1.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "oro:oro", 
-        "version": "2.0.7"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.reporting:maven-reporting-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "doxia:doxia-core", 
-        "version": "1.0-alpha-4"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-validator/commons-validator", 
+      "requirement": "1.1.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:oro/oro", 
+      "requirement": "2.0.7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.reporting/maven-reporting-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:doxia/doxia-core", 
+      "requirement": "1.0-alpha-4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0.4/maven-reporting-2.0.4.pom.json b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0.4/maven-reporting-2.0.4.pom.json
index abc78e8d1ca..b7f50dbdaf2 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0.4/maven-reporting-2.0.4.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0.4/maven-reporting-2.0.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-reporting", 
   "version": "2.0.4", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0.4/maven-reporting-2.0.4.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0.4/maven-reporting-2.0.4.pom.package.json
index 998e2087774..20844d0f2b1 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0.4/maven-reporting-2.0.4.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0.4/maven-reporting-2.0.4.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.reporting:maven-reporting", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.reporting", 
+  "name": "maven-reporting", 
   "version": "2.0.4", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Reporting", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom.json b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom.json
index 860736e9ff4..bfa21e6deb7 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-reporting", 
   "version": "2.0.6", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom.package.json
index 3dd9836e4b7..0cf212eb0bb 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.reporting:maven-reporting", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.reporting", 
+  "name": "maven-reporting", 
   "version": "2.0.6", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Reporting", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0.8/maven-reporting-2.0.8.pom.json b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0.8/maven-reporting-2.0.8.pom.json
index 619ff7e1d07..86c2292d220 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0.8/maven-reporting-2.0.8.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0.8/maven-reporting-2.0.8.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-reporting", 
   "version": "2.0.8", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0.8/maven-reporting-2.0.8.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0.8/maven-reporting-2.0.8.pom.package.json
index a6ced9205d8..6e746627246 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0.8/maven-reporting-2.0.8.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0.8/maven-reporting-2.0.8.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.reporting:maven-reporting", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.reporting", 
+  "name": "maven-reporting", 
   "version": "2.0.8", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Reporting", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom.json b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom.json
index 7a54e5fe093..7d2d1a1cbe1 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-reporting", 
   "version": "2.0", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom.package.json
index 5dd4cf977bc..c835d410a2c 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/reporting/maven-reporting/2.0/maven-reporting-2.0.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.reporting:maven-reporting", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.reporting", 
+  "name": "maven-reporting", 
   "version": "2.0", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Reporting", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-api/1.0-beta-3/maven-scm-api-1.0-beta-3.pom.json b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-api/1.0-beta-3/maven-scm-api-1.0-beta-3.pom.json
index a8ace519ea3..e301326f455 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-api/1.0-beta-3/maven-scm-api-1.0-beta-3.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-api/1.0-beta-3/maven-scm-api-1.0-beta-3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-scm-api", 
   "version": "1.0-beta-3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.scm", 
     "artifact_id": "maven-scm", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-api/1.0-beta-3/maven-scm-api-1.0-beta-3.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-api/1.0-beta-3/maven-scm-api-1.0-beta-3.pom.package.json
index 7f1ec9264d8..7fed1fbbea6 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-api/1.0-beta-3/maven-scm-api-1.0-beta-3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-api/1.0-beta-3/maven-scm-api-1.0-beta-3.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.scm:maven-scm-api", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.scm", 
+  "name": "maven-scm-api", 
   "version": "1.0-beta-3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven SCM API", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-manager-plexus/1.0-beta-3/maven-scm-manager-plexus-1.0-beta-3.pom.json b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-manager-plexus/1.0-beta-3/maven-scm-manager-plexus-1.0-beta-3.pom.json
index 204f67ec8dc..4e98f46ecfc 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-manager-plexus/1.0-beta-3/maven-scm-manager-plexus-1.0-beta-3.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-manager-plexus/1.0-beta-3/maven-scm-manager-plexus-1.0-beta-3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-scm-manager-plexus", 
   "version": "1.0-beta-3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.scm", 
     "artifact_id": "maven-scm-managers", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-manager-plexus/1.0-beta-3/maven-scm-manager-plexus-1.0-beta-3.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-manager-plexus/1.0-beta-3/maven-scm-manager-plexus-1.0-beta-3.pom.package.json
index c106abf7dcf..ddd50b61db3 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-manager-plexus/1.0-beta-3/maven-scm-manager-plexus-1.0-beta-3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-manager-plexus/1.0-beta-3/maven-scm-manager-plexus-1.0-beta-3.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.scm:maven-scm-manager-plexus", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.scm", 
+  "name": "maven-scm-manager-plexus", 
   "version": "1.0-beta-3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven SCM Manager for Plexus", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-9"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-9", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-managers/1.0-beta-3/maven-scm-managers-1.0-beta-3.pom.json b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-managers/1.0-beta-3/maven-scm-managers-1.0-beta-3.pom.json
index a26d6f6d934..d9ea1c1409f 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-managers/1.0-beta-3/maven-scm-managers-1.0-beta-3.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-managers/1.0-beta-3/maven-scm-managers-1.0-beta-3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-scm-managers", 
   "version": "1.0-beta-3", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven.scm", 
     "artifact_id": "maven-scm", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-managers/1.0-beta-3/maven-scm-managers-1.0-beta-3.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-managers/1.0-beta-3/maven-scm-managers-1.0-beta-3.pom.package.json
index 16006f9db2b..423860a0302 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-managers/1.0-beta-3/maven-scm-managers-1.0-beta-3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-managers/1.0-beta-3/maven-scm-managers-1.0-beta-3.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.scm:maven-scm-managers", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.scm", 
+  "name": "maven-scm-managers", 
   "version": "1.0-beta-3", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven SCM Managers", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +23,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.scm:maven-scm-api", 
-        "version": "1.0-beta-3"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven.scm/maven-scm-api", 
+      "requirement": "1.0-beta-3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-clearcase/1.0-beta-3/maven-scm-provider-clearcase-1.0-beta-3.pom.json b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-clearcase/1.0-beta-3/maven-scm-provider-clearcase-1.0-beta-3.pom.json
index ecf12f9df72..86cddb99d1b 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-clearcase/1.0-beta-3/maven-scm-provider-clearcase-1.0-beta-3.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-clearcase/1.0-beta-3/maven-scm-provider-clearcase-1.0-beta-3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-scm-provider-clearcase", 
   "version": "1.0-beta-3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.scm", 
     "artifact_id": "maven-scm-providers", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-clearcase/1.0-beta-3/maven-scm-provider-clearcase-1.0-beta-3.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-clearcase/1.0-beta-3/maven-scm-provider-clearcase-1.0-beta-3.pom.package.json
index 7223d8de9e7..6e556d572de 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-clearcase/1.0-beta-3/maven-scm-provider-clearcase-1.0-beta-3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-clearcase/1.0-beta-3/maven-scm-provider-clearcase-1.0-beta-3.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.scm:maven-scm-provider-clearcase", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.scm", 
+  "name": "maven-scm-provider-clearcase", 
   "version": "1.0-beta-3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven SCM Clearcase Provider", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-cvs-commons/1.0-beta-3/maven-scm-provider-cvs-commons-1.0-beta-3.pom.json b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-cvs-commons/1.0-beta-3/maven-scm-provider-cvs-commons-1.0-beta-3.pom.json
index 855dab72fd2..8fba0887e92 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-cvs-commons/1.0-beta-3/maven-scm-provider-cvs-commons-1.0-beta-3.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-cvs-commons/1.0-beta-3/maven-scm-provider-cvs-commons-1.0-beta-3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-scm-provider-cvs-commons", 
   "version": "1.0-beta-3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.scm", 
     "artifact_id": "maven-scm-providers-cvs", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-cvs-commons/1.0-beta-3/maven-scm-provider-cvs-commons-1.0-beta-3.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-cvs-commons/1.0-beta-3/maven-scm-provider-cvs-commons-1.0-beta-3.pom.package.json
index 501e5de0a04..8551a3e3e50 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-cvs-commons/1.0-beta-3/maven-scm-provider-cvs-commons-1.0-beta-3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-cvs-commons/1.0-beta-3/maven-scm-provider-cvs-commons-1.0-beta-3.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.scm:maven-scm-provider-cvs-commons", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.scm", 
+  "name": "maven-scm-provider-cvs-commons", 
   "version": "1.0-beta-3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven SCM CVS Provider - Common library", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.scm:maven-scm-provider-cvstest", 
-        "version": "1.0-beta-3"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven.scm/maven-scm-provider-cvstest", 
+      "requirement": "1.0-beta-3", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-cvsexe/1.0-beta-3/maven-scm-provider-cvsexe-1.0-beta-3.pom.json b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-cvsexe/1.0-beta-3/maven-scm-provider-cvsexe-1.0-beta-3.pom.json
index 312beb00cce..20d26cd5bfc 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-cvsexe/1.0-beta-3/maven-scm-provider-cvsexe-1.0-beta-3.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-cvsexe/1.0-beta-3/maven-scm-provider-cvsexe-1.0-beta-3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-scm-provider-cvsexe", 
   "version": "1.0-beta-3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.scm", 
     "artifact_id": "maven-scm-providers-cvs", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-cvsexe/1.0-beta-3/maven-scm-provider-cvsexe-1.0-beta-3.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-cvsexe/1.0-beta-3/maven-scm-provider-cvsexe-1.0-beta-3.pom.package.json
index 6a6998521b3..541a337d7f9 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-cvsexe/1.0-beta-3/maven-scm-provider-cvsexe-1.0-beta-3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-cvsexe/1.0-beta-3/maven-scm-provider-cvsexe-1.0-beta-3.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.scm:maven-scm-provider-cvsexe", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.scm", 
+  "name": "maven-scm-provider-cvsexe", 
   "version": "1.0-beta-3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven SCM CVS Provider - CVS Executable Impl.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,24 +21,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.scm:maven-scm-provider-cvstest", 
-        "version": "1.0-beta-3"
-      }
-    ], 
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.scm:maven-scm-provider-cvs-commons", 
-        "version": "1.0-beta-3"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven.scm/maven-scm-provider-cvstest", 
+      "requirement": "1.0-beta-3", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.scm/maven-scm-provider-cvs-commons", 
+      "requirement": "1.0-beta-3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-perforce/1.0-beta-3/maven-scm-provider-perforce-1.0-beta-3.pom.json b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-perforce/1.0-beta-3/maven-scm-provider-perforce-1.0-beta-3.pom.json
index 961edb72170..895214e2efb 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-perforce/1.0-beta-3/maven-scm-provider-perforce-1.0-beta-3.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-perforce/1.0-beta-3/maven-scm-provider-perforce-1.0-beta-3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-scm-provider-perforce", 
   "version": "1.0-beta-3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.scm", 
     "artifact_id": "maven-scm-providers", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-perforce/1.0-beta-3/maven-scm-provider-perforce-1.0-beta-3.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-perforce/1.0-beta-3/maven-scm-provider-perforce-1.0-beta-3.pom.package.json
index 3ab8847c0cc..75422fc3b93 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-perforce/1.0-beta-3/maven-scm-provider-perforce-1.0-beta-3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-perforce/1.0-beta-3/maven-scm-provider-perforce-1.0-beta-3.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.scm:maven-scm-provider-perforce", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.scm", 
+  "name": "maven-scm-provider-perforce", 
   "version": "1.0-beta-3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven SCM Perforce Provider", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "regexp:regexp", 
-        "version": "1.3"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:regexp/regexp", 
+      "requirement": "1.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-starteam/1.0-beta-3/maven-scm-provider-starteam-1.0-beta-3.pom.json b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-starteam/1.0-beta-3/maven-scm-provider-starteam-1.0-beta-3.pom.json
index bd4dd20de96..e96ceea7956 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-starteam/1.0-beta-3/maven-scm-provider-starteam-1.0-beta-3.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-starteam/1.0-beta-3/maven-scm-provider-starteam-1.0-beta-3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-scm-provider-starteam", 
   "version": "1.0-beta-3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.scm", 
     "artifact_id": "maven-scm-providers", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-starteam/1.0-beta-3/maven-scm-provider-starteam-1.0-beta-3.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-starteam/1.0-beta-3/maven-scm-provider-starteam-1.0-beta-3.pom.package.json
index 728a90b6265..758578ef34b 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-starteam/1.0-beta-3/maven-scm-provider-starteam-1.0-beta-3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-starteam/1.0-beta-3/maven-scm-provider-starteam-1.0-beta-3.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.scm:maven-scm-provider-starteam", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.scm", 
+  "name": "maven-scm-provider-starteam", 
   "version": "1.0-beta-3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven SCM Starteam Provider", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-svn-commons/1.0-beta-3/maven-scm-provider-svn-commons-1.0-beta-3.pom.json b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-svn-commons/1.0-beta-3/maven-scm-provider-svn-commons-1.0-beta-3.pom.json
index 727f2e2e8a4..e34c7336f06 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-svn-commons/1.0-beta-3/maven-scm-provider-svn-commons-1.0-beta-3.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-svn-commons/1.0-beta-3/maven-scm-provider-svn-commons-1.0-beta-3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-scm-provider-svn-commons", 
   "version": "1.0-beta-3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.scm", 
     "artifact_id": "maven-scm-providers-svn", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-svn-commons/1.0-beta-3/maven-scm-provider-svn-commons-1.0-beta-3.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-svn-commons/1.0-beta-3/maven-scm-provider-svn-commons-1.0-beta-3.pom.package.json
index a3a0bd99df6..73105e56f62 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-svn-commons/1.0-beta-3/maven-scm-provider-svn-commons-1.0-beta-3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-svn-commons/1.0-beta-3/maven-scm-provider-svn-commons-1.0-beta-3.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.scm:maven-scm-provider-svn-commons", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.scm", 
+  "name": "maven-scm-provider-svn-commons", 
   "version": "1.0-beta-3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven SCM Subversion Provider - Common library", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-svnexe/1.0-beta-3/maven-scm-provider-svnexe-1.0-beta-3.pom.json b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-svnexe/1.0-beta-3/maven-scm-provider-svnexe-1.0-beta-3.pom.json
index c034e75bcba..2883d30c3b2 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-svnexe/1.0-beta-3/maven-scm-provider-svnexe-1.0-beta-3.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-svnexe/1.0-beta-3/maven-scm-provider-svnexe-1.0-beta-3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-scm-provider-svnexe", 
   "version": "1.0-beta-3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.scm", 
     "artifact_id": "maven-scm-providers-svn", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-svnexe/1.0-beta-3/maven-scm-provider-svnexe-1.0-beta-3.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-svnexe/1.0-beta-3/maven-scm-provider-svnexe-1.0-beta-3.pom.package.json
index 3f4388aa915..33162f1d83d 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-svnexe/1.0-beta-3/maven-scm-provider-svnexe-1.0-beta-3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-provider-svnexe/1.0-beta-3/maven-scm-provider-svnexe-1.0-beta-3.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.scm:maven-scm-provider-svnexe", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.scm", 
+  "name": "maven-scm-provider-svnexe", 
   "version": "1.0-beta-3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven SCM Subversion Provider - SVN Executable Impl.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,29 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.scm:maven-scm-provider-svn-commons", 
-        "version": "1.0-beta-3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "regexp:regexp", 
-        "version": "1.3"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.scm:maven-scm-provider-svntest", 
-        "version": "1.0-beta-3"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven.scm/maven-scm-provider-svn-commons", 
+      "requirement": "1.0-beta-3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:regexp/regexp", 
+      "requirement": "1.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.scm/maven-scm-provider-svntest", 
+      "requirement": "1.0-beta-3", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-providers-cvs/1.0-beta-3/maven-scm-providers-cvs-1.0-beta-3.pom.json b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-providers-cvs/1.0-beta-3/maven-scm-providers-cvs-1.0-beta-3.pom.json
index 0f5eec15801..02a36f57283 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-providers-cvs/1.0-beta-3/maven-scm-providers-cvs-1.0-beta-3.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-providers-cvs/1.0-beta-3/maven-scm-providers-cvs-1.0-beta-3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-scm-providers-cvs", 
   "version": "1.0-beta-3", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven.scm", 
     "artifact_id": "maven-scm-providers", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-providers-cvs/1.0-beta-3/maven-scm-providers-cvs-1.0-beta-3.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-providers-cvs/1.0-beta-3/maven-scm-providers-cvs-1.0-beta-3.pom.package.json
index c2e3cc38da7..fc540af06c1 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-providers-cvs/1.0-beta-3/maven-scm-providers-cvs-1.0-beta-3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-providers-cvs/1.0-beta-3/maven-scm-providers-cvs-1.0-beta-3.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.scm:maven-scm-providers-cvs", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.scm", 
+  "name": "maven-scm-providers-cvs", 
   "version": "1.0-beta-3", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven SCM CVS Provider - Parent", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-providers-svn/1.0-beta-3/maven-scm-providers-svn-1.0-beta-3.pom.json b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-providers-svn/1.0-beta-3/maven-scm-providers-svn-1.0-beta-3.pom.json
index e79f2b712e7..5f266fed86e 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-providers-svn/1.0-beta-3/maven-scm-providers-svn-1.0-beta-3.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-providers-svn/1.0-beta-3/maven-scm-providers-svn-1.0-beta-3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-scm-providers-svn", 
   "version": "1.0-beta-3", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven.scm", 
     "artifact_id": "maven-scm-providers", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-providers-svn/1.0-beta-3/maven-scm-providers-svn-1.0-beta-3.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-providers-svn/1.0-beta-3/maven-scm-providers-svn-1.0-beta-3.pom.package.json
index f0ea9716a84..2a82a786f51 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-providers-svn/1.0-beta-3/maven-scm-providers-svn-1.0-beta-3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-providers-svn/1.0-beta-3/maven-scm-providers-svn-1.0-beta-3.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.scm:maven-scm-providers-svn", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.scm", 
+  "name": "maven-scm-providers-svn", 
   "version": "1.0-beta-3", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven SCM Subversion Provider - Parent", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-providers/1.0-beta-3/maven-scm-providers-1.0-beta-3.pom.json b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-providers/1.0-beta-3/maven-scm-providers-1.0-beta-3.pom.json
index d4897d90dff..7aa9158eb9d 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-providers/1.0-beta-3/maven-scm-providers-1.0-beta-3.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-providers/1.0-beta-3/maven-scm-providers-1.0-beta-3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-scm-providers", 
   "version": "1.0-beta-3", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven.scm", 
     "artifact_id": "maven-scm", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-providers/1.0-beta-3/maven-scm-providers-1.0-beta-3.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-providers/1.0-beta-3/maven-scm-providers-1.0-beta-3.pom.package.json
index 8a8c9526cbf..14658cb01dd 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-providers/1.0-beta-3/maven-scm-providers-1.0-beta-3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm-providers/1.0-beta-3/maven-scm-providers-1.0-beta-3.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.scm:maven-scm-providers", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.scm", 
+  "name": "maven-scm-providers", 
   "version": "1.0-beta-3", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven SCM Providers", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,24 +23,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.scm:maven-scm-api", 
-        "version": "1.0-beta-3"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.scm:maven-scm-test", 
-        "version": "1.0-beta-3"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven.scm/maven-scm-api", 
+      "requirement": "1.0-beta-3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.scm/maven-scm-test", 
+      "requirement": "1.0-beta-3", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm/1.0-beta-3/maven-scm-1.0-beta-3.pom.json b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm/1.0-beta-3/maven-scm-1.0-beta-3.pom.json
index eb22820d695..6a2c48ad746 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm/1.0-beta-3/maven-scm-1.0-beta-3.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm/1.0-beta-3/maven-scm-1.0-beta-3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-scm", 
   "version": "1.0-beta-3", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven-parent", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm/1.0-beta-3/maven-scm-1.0-beta-3.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm/1.0-beta-3/maven-scm-1.0-beta-3.pom.package.json
index ae47f9e97cb..0e5c90d80ed 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm/1.0-beta-3/maven-scm-1.0-beta-3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/scm/maven-scm/1.0-beta-3/maven-scm-1.0-beta-3.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.scm:maven-scm", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.scm", 
+  "name": "maven-scm", 
   "version": "1.0-beta-3", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven SCM", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +23,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/file-management/1.1/file-management-1.1.pom.json b/tests/packagedcode/data/m2/org/apache/maven/shared/file-management/1.1/file-management-1.1.pom.json
index 94de69d5d28..88af7ae4e68 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/file-management/1.1/file-management-1.1.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/file-management/1.1/file-management-1.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "file-management", 
   "version": "1.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.shared", 
     "artifact_id": "maven-shared-components", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/file-management/1.1/file-management-1.1.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/shared/file-management/1.1/file-management-1.1.pom.package.json
index 9e4e262d60b..8fe9458f0a2 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/file-management/1.1/file-management-1.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/file-management/1.1/file-management-1.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.shared:file-management", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.shared", 
+  "name": "file-management", 
   "version": "1.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Basic API for lightweight logging", 
+  "description": "Maven Shared File Management API\nBasic API for lightweight logging", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,39 +29,50 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-shared-io", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-9"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-shared-io", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-9", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/file-management/1.2/file-management-1.2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/shared/file-management/1.2/file-management-1.2.pom.json
index b796cd042c5..d4f212d49fe 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/file-management/1.2/file-management-1.2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/file-management/1.2/file-management-1.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "file-management", 
   "version": "1.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.shared", 
     "artifact_id": "maven-shared-components", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/file-management/1.2/file-management-1.2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/shared/file-management/1.2/file-management-1.2.pom.package.json
index 6ca957992cd..4e7cb238515 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/file-management/1.2/file-management-1.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/file-management/1.2/file-management-1.2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.shared:file-management", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.shared", 
+  "name": "file-management", 
   "version": "1.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "API to collect files from a given directory using several include/exclude rules.", 
+  "description": "Maven Shared File Management API\nAPI to collect files from a given directory using several include/exclude rules.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,39 +29,50 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-shared-io", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.4.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-9"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-shared-io", 
+      "requirement": "1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.4.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-9", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-common-artifact-filters/1.0-alpha-1/maven-common-artifact-filters-1.0-alpha-1.pom.json b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-common-artifact-filters/1.0-alpha-1/maven-common-artifact-filters-1.0-alpha-1.pom.json
index 9c7f5b2b8aa..a082e0ce424 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-common-artifact-filters/1.0-alpha-1/maven-common-artifact-filters-1.0-alpha-1.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-common-artifact-filters/1.0-alpha-1/maven-common-artifact-filters-1.0-alpha-1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-common-artifact-filters", 
   "version": "1.0-alpha-1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.shared", 
     "artifact_id": "maven-shared-components", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-common-artifact-filters/1.0-alpha-1/maven-common-artifact-filters-1.0-alpha-1.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-common-artifact-filters/1.0-alpha-1/maven-common-artifact-filters-1.0-alpha-1.pom.package.json
index 5942b7ef263..adf7d9e92ed 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-common-artifact-filters/1.0-alpha-1/maven-common-artifact-filters-1.0-alpha-1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-common-artifact-filters/1.0-alpha-1/maven-common-artifact-filters-1.0-alpha-1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.shared:maven-common-artifact-filters", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.shared", 
+  "name": "maven-common-artifact-filters", 
   "version": "1.0-alpha-1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Common Artifact Filters", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,39 +21,50 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-9"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-test-tools", 
-        "version": "1.0-alpha-1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "easymock:easymock", 
-        "version": "1.2_Java1.3"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-9", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-test-tools", 
+      "requirement": "1.0-alpha-1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:easymock/easymock", 
+      "requirement": "1.2_Java1.3", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom.json b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom.json
index 5654b0d6ce3..de2f0d9af88 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-common-artifact-filters", 
   "version": "1.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.shared", 
     "artifact_id": "maven-shared-components", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom.package.json
index 6e809776acd..7772d619e9d 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-common-artifact-filters/1.0/maven-common-artifact-filters-1.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.shared:maven-common-artifact-filters", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.shared", 
+  "name": "maven-common-artifact-filters", 
   "version": "1.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Common Artifact Filters", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,44 +21,58 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0.8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-9"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-plugin-testing-harness", 
-        "version": "1.1"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-test-tools", 
-        "version": "1.0-alpha-2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "easymock:easymock", 
-        "version": "1.2_Java1.3"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0.8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-9", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-plugin-testing-harness", 
+      "requirement": "1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-test-tools", 
+      "requirement": "1.0-alpha-2", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:easymock/easymock", 
+      "requirement": "1.2_Java1.3", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-dependency-analyzer/1.0/maven-dependency-analyzer-1.0.pom.json b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-dependency-analyzer/1.0/maven-dependency-analyzer-1.0.pom.json
index 92238962d40..11cd784595b 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-dependency-analyzer/1.0/maven-dependency-analyzer-1.0.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-dependency-analyzer/1.0/maven-dependency-analyzer-1.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-dependency-analyzer", 
   "version": "1.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.shared", 
     "artifact_id": "maven-shared-components", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-dependency-analyzer/1.0/maven-dependency-analyzer-1.0.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-dependency-analyzer/1.0/maven-dependency-analyzer-1.0.pom.package.json
index 58b957a2e37..6fe4c191cc3 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-dependency-analyzer/1.0/maven-dependency-analyzer-1.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-dependency-analyzer/1.0/maven-dependency-analyzer-1.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.shared:maven-dependency-analyzer", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.shared", 
+  "name": "maven-dependency-analyzer", 
   "version": "1.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Dependency Analyzer", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,54 +21,74 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "asm:asm", 
-        "version": "3.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.4.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-model", 
-        "version": "2.0.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0.5"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-plugin-testing-tools", 
-        "version": "1.0-alpha-3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jmock:jmock", 
-        "version": "1.1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:asm/asm", 
+      "requirement": "3.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.4.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-model", 
+      "requirement": "2.0.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-plugin-testing-tools", 
+      "requirement": "1.0-alpha-3", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jmock/jmock", 
+      "requirement": "1.1.0", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-dependency-tree/1.1/maven-dependency-tree-1.1.pom.json b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-dependency-tree/1.1/maven-dependency-tree-1.1.pom.json
index 5a3406d6c31..ef863fd4f6e 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-dependency-tree/1.1/maven-dependency-tree-1.1.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-dependency-tree/1.1/maven-dependency-tree-1.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-dependency-tree", 
   "version": "1.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.shared", 
     "artifact_id": "maven-shared-components", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-dependency-tree/1.1/maven-dependency-tree-1.1.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-dependency-tree/1.1/maven-dependency-tree-1.1.pom.package.json
index 18f1ed438ca..a3c529051d5 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-dependency-tree/1.1/maven-dependency-tree-1.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-dependency-tree/1.1/maven-dependency-tree-1.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.shared:maven-dependency-tree", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.shared", 
+  "name": "maven-dependency-tree", 
   "version": "1.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Dependency Tree", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,29 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0.8"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "jmock:jmock", 
-        "version": "1.2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-plugin-testing-harness", 
-        "version": "1.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0.8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jmock/jmock", 
+      "requirement": "1.2.0", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-plugin-testing-harness", 
+      "requirement": "1.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-osgi/0.2.0/maven-osgi-0.2.0.pom.json b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-osgi/0.2.0/maven-osgi-0.2.0.pom.json
index 0c1008b4cba..5562c64769e 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-osgi/0.2.0/maven-osgi-0.2.0.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-osgi/0.2.0/maven-osgi-0.2.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-osgi", 
   "version": "0.2.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.shared", 
     "artifact_id": "maven-shared-components", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-osgi/0.2.0/maven-osgi-0.2.0.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-osgi/0.2.0/maven-osgi-0.2.0.pom.package.json
index 46d1e027856..20cdce11bcf 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-osgi/0.2.0/maven-osgi-0.2.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-osgi/0.2.0/maven-osgi-0.2.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.shared:maven-osgi", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.shared", 
+  "name": "maven-osgi", 
   "version": "0.2.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Library for Maven-OSGi integration", 
+  "description": "Maven OSGi integration\nLibrary for Maven-OSGi integration", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,29 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "biz.aQute:bndlib", 
-        "version": "0.0.203"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-plugin-testing-harness", 
-        "version": "1.0"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:biz.aQute/bndlib", 
+      "requirement": "0.0.203", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-plugin-testing-harness", 
+      "requirement": "1.0", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom.json b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom.json
index 4911020e068..56e541fddba 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-plugin-testing-harness", 
   "version": "1.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.shared", 
     "artifact_id": "maven-shared-components", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom.package.json
index 1e78e03154d..f0c6ff571fc 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-plugin-testing-harness/1.1/maven-plugin-testing-harness-1.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.shared:maven-plugin-testing-harness", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.shared", 
+  "name": "maven-plugin-testing-harness", 
   "version": "1.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Plugin Testing Mechanism", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,37 +21,50 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-core", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.4.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-archiver", 
-        "version": "1.0-alpha-7"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-core", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.4.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-archiver", 
+      "requirement": "1.0-alpha-7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-repository-builder/1.0-alpha-2/maven-repository-builder-1.0-alpha-2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-repository-builder/1.0-alpha-2/maven-repository-builder-1.0-alpha-2.pom.json
index b5534109e75..547d9d52685 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-repository-builder/1.0-alpha-2/maven-repository-builder-1.0-alpha-2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-repository-builder/1.0-alpha-2/maven-repository-builder-1.0-alpha-2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-repository-builder", 
   "version": "1.0-alpha-2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.shared", 
     "artifact_id": "maven-shared-components", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-repository-builder/1.0-alpha-2/maven-repository-builder-1.0-alpha-2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-repository-builder/1.0-alpha-2/maven-repository-builder-1.0-alpha-2.pom.package.json
index c0ff85474b2..44df54ab867 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-repository-builder/1.0-alpha-2/maven-repository-builder-1.0-alpha-2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-repository-builder/1.0-alpha-2/maven-repository-builder-1.0-alpha-2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.shared:maven-repository-builder", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.shared", 
+  "name": "maven-repository-builder", 
   "version": "1.0-alpha-2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Repository Builder", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,59 +21,82 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact-manager", 
-        "version": "2.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-common-artifact-filters", 
-        "version": "1.0-alpha-1"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-test-tools", 
-        "version": "1.0-alpha-1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "easymock:easymock", 
-        "version": "1.2_Java1.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-file", 
-        "version": "1.0-beta-2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-http-lightweight", 
-        "version": "1.0-beta-2"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact-manager", 
+      "requirement": "2.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-common-artifact-filters", 
+      "requirement": "1.0-alpha-1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-test-tools", 
+      "requirement": "1.0-alpha-1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:easymock/easymock", 
+      "requirement": "1.2_Java1.3", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-file", 
+      "requirement": "1.0-beta-2", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-http-lightweight", 
+      "requirement": "1.0-beta-2", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/3/maven-shared-components-3.pom.json b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/3/maven-shared-components-3.pom.json
index 75407e8029f..f1d4d7e387a 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/3/maven-shared-components-3.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/3/maven-shared-components-3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-shared-components", 
   "version": "3", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven-parent", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/3/maven-shared-components-3.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/3/maven-shared-components-3.pom.package.json
index c4af8adaa06..6fde16a2ab5 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/3/maven-shared-components-3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/3/maven-shared-components-3.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.shared:maven-shared-components", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.shared", 
+  "name": "maven-shared-components", 
   "version": "3", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Maven shared components", 
+  "description": "Maven Shared Components\nMaven shared components", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/4/maven-shared-components-4.pom.json b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/4/maven-shared-components-4.pom.json
index 542b5b05655..b34fb31df8d 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/4/maven-shared-components-4.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/4/maven-shared-components-4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-shared-components", 
   "version": "4", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven-parent", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/4/maven-shared-components-4.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/4/maven-shared-components-4.pom.package.json
index c0f42b78c78..df6b1c53e0e 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/4/maven-shared-components-4.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/4/maven-shared-components-4.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.shared:maven-shared-components", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.shared", 
+  "name": "maven-shared-components", 
   "version": "4", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Maven shared components", 
+  "description": "Maven Shared Components\nMaven shared components", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/6/maven-shared-components-6.pom.json b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/6/maven-shared-components-6.pom.json
index ca0329a5194..bcf14e58836 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/6/maven-shared-components-6.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/6/maven-shared-components-6.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-shared-components", 
   "version": "6", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven-parent", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/6/maven-shared-components-6.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/6/maven-shared-components-6.pom.package.json
index 8fadf0ca94f..0e47a17db89 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/6/maven-shared-components-6.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/6/maven-shared-components-6.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.shared:maven-shared-components", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.shared", 
+  "name": "maven-shared-components", 
   "version": "6", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Maven shared components", 
+  "description": "Maven Shared Components\nMaven shared components", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom.json b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom.json
index b3d2818db06..e37b5397a0b 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-shared-components", 
   "version": "7", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven-parent", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom.package.json
index 7497dbf03b5..6fe0968dc9e 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/7/maven-shared-components-7.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.shared:maven-shared-components", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.shared", 
+  "name": "maven-shared-components", 
   "version": "7", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Maven shared components", 
+  "description": "Maven Shared Components\nMaven shared components", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom.json b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom.json
index f5810050f81..703cb5992af 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-shared-components", 
   "version": "8", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven-parent", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom.package.json
index a051556beaf..76fe8b3e36f 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-components/8/maven-shared-components-8.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.shared:maven-shared-components", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.shared", 
+  "name": "maven-shared-components", 
   "version": "8", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Maven shared components", 
+  "description": "Maven Shared Components\nMaven shared components", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-io/1.0/maven-shared-io-1.0.pom.json b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-io/1.0/maven-shared-io-1.0.pom.json
index 45e823c6a70..28f1abe4cb6 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-io/1.0/maven-shared-io-1.0.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-io/1.0/maven-shared-io-1.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-shared-io", 
   "version": "1.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.shared", 
     "artifact_id": "maven-shared-components", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-io/1.0/maven-shared-io-1.0.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-io/1.0/maven-shared-io-1.0.pom.package.json
index fe0e3a8c421..adc7eb0bbca 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-io/1.0/maven-shared-io-1.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-io/1.0/maven-shared-io-1.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.shared:maven-shared-io", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.shared", 
+  "name": "maven-shared-io", 
   "version": "1.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Basic API for lightweight logging", 
+  "description": "Maven Shared I/O API\nBasic API for lightweight logging", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,49 +29,66 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "easymock:easymock", 
-        "version": "1.2_Java1.3"
-      }
-    ], 
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact-manager", 
-        "version": "2.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-provider-api", 
-        "version": "1.0-alpha-6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-9"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:easymock/easymock", 
+      "requirement": "1.2_Java1.3", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact-manager", 
+      "requirement": "2.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-provider-api", 
+      "requirement": "1.0-alpha-6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-9", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom.json b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom.json
index 4052212cdba..6b900721992 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-shared-io", 
   "version": "1.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.shared", 
     "artifact_id": "maven-shared-components", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom.package.json
index 5702b41c4c7..4fabd6f970f 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/shared/maven-shared-io/1.1/maven-shared-io-1.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.shared:maven-shared-io", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.shared", 
+  "name": "maven-shared-io", 
   "version": "1.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "API for I/O support like logging, download or file scanning.", 
+  "description": "Maven Shared I/O API\nAPI for I/O support like logging, download or file scanning.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,49 +29,66 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact-manager", 
-        "version": "2.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-provider-api", 
-        "version": "1.0-alpha-6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.4.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-9"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "easymock:easymock", 
-        "version": "1.2_Java1.3"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact-manager", 
+      "requirement": "2.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-provider-api", 
+      "requirement": "1.0-alpha-6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.4.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-9", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:easymock/easymock", 
+      "requirement": "1.2_Java1.3", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-api/2.4.2/surefire-api-2.4.2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-api/2.4.2/surefire-api-2.4.2.pom.json
index 96d04ede277..908928ffb31 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-api/2.4.2/surefire-api-2.4.2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-api/2.4.2/surefire-api-2.4.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "surefire-api", 
   "version": "2.4.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.surefire", 
     "artifact_id": "surefire", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-api/2.4.2/surefire-api-2.4.2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-api/2.4.2/surefire-api-2.4.2.pom.package.json
index c99677e36a1..6a54054a500 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-api/2.4.2/surefire-api-2.4.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-api/2.4.2/surefire-api-2.4.2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.surefire:surefire-api", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.surefire", 
+  "name": "surefire-api", 
   "version": "2.4.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "SureFire API", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,22 +21,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jmock:jmock", 
-        "version": "1.0.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jmock/jmock", 
+      "requirement": "1.0.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-booter/2.4.2/surefire-booter-2.4.2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-booter/2.4.2/surefire-booter-2.4.2.pom.json
index 87c4aa0dbf9..92d5d58981b 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-booter/2.4.2/surefire-booter-2.4.2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-booter/2.4.2/surefire-booter-2.4.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "surefire-booter", 
   "version": "2.4.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.surefire", 
     "artifact_id": "surefire", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-booter/2.4.2/surefire-booter-2.4.2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-booter/2.4.2/surefire-booter-2.4.2.pom.package.json
index 8b169f89f0d..da70b22c99f 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-booter/2.4.2/surefire-booter-2.4.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-booter/2.4.2/surefire-booter-2.4.2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.surefire:surefire-booter", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.surefire", 
+  "name": "surefire-booter", 
   "version": "2.4.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "SureFire Booter", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,29 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jmock:jmock", 
-        "version": "1.0.1"
-      }
-    ], 
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.surefire:surefire-api", 
-        "version": "2.4.2"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jmock/jmock", 
+      "requirement": "1.0.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.surefire/surefire-api", 
+      "requirement": "2.4.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-providers/2.4.2/surefire-providers-2.4.2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-providers/2.4.2/surefire-providers-2.4.2.pom.json
index 297dff576c6..548e4f9653f 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-providers/2.4.2/surefire-providers-2.4.2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-providers/2.4.2/surefire-providers-2.4.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "surefire-providers", 
   "version": "2.4.2", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven.surefire", 
     "artifact_id": "surefire", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-providers/2.4.2/surefire-providers-2.4.2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-providers/2.4.2/surefire-providers-2.4.2.pom.package.json
index 0c2b0c08d73..33d10074c41 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-providers/2.4.2/surefire-providers-2.4.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-providers/2.4.2/surefire-providers-2.4.2.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.surefire:surefire-providers", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.surefire", 
+  "name": "surefire-providers", 
   "version": "2.4.2", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "SureFire Providers", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +23,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.surefire:surefire-api", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven.surefire/surefire-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-testng/2.4.2/surefire-testng-2.4.2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-testng/2.4.2/surefire-testng-2.4.2.pom.json
index 63680a40f4b..37657779188 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-testng/2.4.2/surefire-testng-2.4.2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-testng/2.4.2/surefire-testng-2.4.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "surefire-testng", 
   "version": "2.4.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.surefire", 
     "artifact_id": "surefire-providers", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-testng/2.4.2/surefire-testng-2.4.2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-testng/2.4.2/surefire-testng-2.4.2.pom.package.json
index 9f655660f55..dc09cccb0a0 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-testng/2.4.2/surefire-testng-2.4.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire-testng/2.4.2/surefire-testng-2.4.2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.surefire:surefire-testng", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.surefire", 
+  "name": "surefire-testng", 
   "version": "2.4.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "SureFire TestNG Runner", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,27 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.testng:testng", 
-        "version": "5.7"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.testng/testng", 
+      "requirement": "5.7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire/2.4.2/surefire-2.4.2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire/2.4.2/surefire-2.4.2.pom.json
index e609dd074bc..4152d960ab6 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire/2.4.2/surefire-2.4.2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire/2.4.2/surefire-2.4.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "surefire", 
   "version": "2.4.2", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven-parent", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire/2.4.2/surefire-2.4.2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire/2.4.2/surefire-2.4.2.pom.package.json
index 86da001c76c..64f6ee40c1c 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire/2.4.2/surefire-2.4.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/surefire/surefire/2.4.2/surefire-2.4.2.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.surefire:surefire", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.surefire", 
+  "name": "surefire", 
   "version": "2.4.2", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Surefire is a test framework project.", 
+  "description": "SureFire\nSurefire is a test framework project.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -33,22 +38,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jmock:jmock", 
-        "version": "1.0.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jmock/jmock", 
+      "requirement": "1.0.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-file/1.0-alpha-5/wagon-file-1.0-alpha-5.pom.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-file/1.0-alpha-5/wagon-file-1.0-alpha-5.pom.json
index c9992be9294..5aea60dff93 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-file/1.0-alpha-5/wagon-file-1.0-alpha-5.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-file/1.0-alpha-5/wagon-file-1.0-alpha-5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "wagon-file", 
   "version": "1.0-alpha-5", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Maven Wagon File Provider", 
   "description": "Tools to manage artifacts and deployment", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-file/1.0-alpha-5/wagon-file-1.0-alpha-5.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-file/1.0-alpha-5/wagon-file-1.0-alpha-5.pom.package.json
index 34ca113255e..f6ab4c5f124 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-file/1.0-alpha-5/wagon-file-1.0-alpha-5.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-file/1.0-alpha-5/wagon-file-1.0-alpha-5.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.wagon:wagon-file", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.wagon", 
+  "name": "wagon-file", 
   "version": "1.0-alpha-5", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Tools to manage artifacts and deployment", 
+  "description": "Maven Wagon File Provider\nTools to manage artifacts and deployment", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -47,44 +50,58 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-provider-api", 
-        "version": "1.0-alpha-5"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "classworlds:classworlds", 
-        "version": "1.1-alpha-2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-provider-test", 
-        "version": "1.0-alpha-5"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-provider-api", 
+      "requirement": "1.0-alpha-5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-8", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:classworlds/classworlds", 
+      "requirement": "1.1-alpha-2", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-provider-test", 
+      "requirement": "1.0-alpha-5", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2.pom.json
index 31ec20fed1f..4db1e3dc327 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "wagon-file", 
   "version": "1.0-beta-2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.wagon", 
     "artifact_id": "wagon-providers", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2.pom.package.json
index 27db77150bd..548539111ba 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.wagon:wagon-file", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.wagon", 
+  "name": "wagon-file", 
   "version": "1.0-beta-2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Wagon that gets and puts artifacts using file system protocol", 
+  "description": "Maven Wagon File Provider\nWagon that gets and puts artifacts using file system protocol", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-http-lightweight/1.0-alpha-5/wagon-http-lightweight-1.0-alpha-5.pom.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-http-lightweight/1.0-alpha-5/wagon-http-lightweight-1.0-alpha-5.pom.json
index 912c79e0315..db1fc93f25a 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-http-lightweight/1.0-alpha-5/wagon-http-lightweight-1.0-alpha-5.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-http-lightweight/1.0-alpha-5/wagon-http-lightweight-1.0-alpha-5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "wagon-http-lightweight", 
   "version": "1.0-alpha-5", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Maven Wagon Lightweight HTTP Provider", 
   "description": "Tools to manage artifacts and deployment", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-http-lightweight/1.0-alpha-5/wagon-http-lightweight-1.0-alpha-5.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-http-lightweight/1.0-alpha-5/wagon-http-lightweight-1.0-alpha-5.pom.package.json
index acbbb0fed6b..22d52e0c792 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-http-lightweight/1.0-alpha-5/wagon-http-lightweight-1.0-alpha-5.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-http-lightweight/1.0-alpha-5/wagon-http-lightweight-1.0-alpha-5.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.wagon:wagon-http-lightweight", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.wagon", 
+  "name": "wagon-http-lightweight", 
   "version": "1.0-alpha-5", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Tools to manage artifacts and deployment", 
+  "description": "Maven Wagon Lightweight HTTP Provider\nTools to manage artifacts and deployment", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -47,59 +50,82 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-provider-api", 
-        "version": "1.0-alpha-5"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "servletapi:servletapi", 
-        "version": "2.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "classworlds:classworlds", 
-        "version": "1.1-alpha-2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jetty:jetty", 
-        "version": "4.2.10"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "plexus:plexus-jetty-httpd", 
-        "version": "1.0-beta-1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-provider-test", 
-        "version": "1.0-alpha-5"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-provider-api", 
+      "requirement": "1.0-alpha-5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-8", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:servletapi/servletapi", 
+      "requirement": "2.3", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:classworlds/classworlds", 
+      "requirement": "1.1-alpha-2", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jetty/jetty", 
+      "requirement": "4.2.10", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:plexus/plexus-jetty-httpd", 
+      "requirement": "1.0-beta-1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-provider-test", 
+      "requirement": "1.0-alpha-5", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2.pom.json
index 370a5f78552..80b50fea561 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "wagon-http-lightweight", 
   "version": "1.0-beta-2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.wagon", 
     "artifact_id": "wagon-providers", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2.pom.package.json
index c0c14b04260..7891258384b 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.wagon:wagon-http-lightweight", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.wagon", 
+  "name": "wagon-http-lightweight", 
   "version": "1.0-beta-2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Wagon that gets and puts artifacts through http using standard Java library", 
+  "description": "Maven Wagon Lightweight HTTP Provider\nWagon that gets and puts artifacts through http using standard Java library", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,29 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-http-shared", 
-        "version": "1.0-beta-2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "xml-apis:xml-apis", 
-        "version": "1.0.b2"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "plexus:plexus-jetty-httpd", 
-        "version": "1.0-beta-1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-http-shared", 
+      "requirement": "1.0-beta-2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:xml-apis/xml-apis", 
+      "requirement": "1.0.b2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:plexus/plexus-jetty-httpd", 
+      "requirement": "1.0-beta-1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.pom.json
index ddef14f6eaa..ea55996d70f 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "wagon-http-shared", 
   "version": "1.0-beta-2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.wagon", 
     "artifact_id": "wagon-providers", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.pom.package.json
index fded20b7f8a..92d471eb10a 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.wagon:wagon-http-shared", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.wagon", 
+  "name": "wagon-http-shared", 
   "version": "1.0-beta-2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Shared Library for the wagon-http, and wagon-http-lightweight wagon providers.", 
+  "description": "Maven Wagon HTTP Shared Library\nShared Library for the wagon-http, and wagon-http-lightweight wagon providers.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "jtidy:jtidy", 
-        "version": "4aug2000r7-dev"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:jtidy/jtidy", 
+      "requirement": "4aug2000r7-dev", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5.pom.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5.pom.json
index 0d66054666f..a47c3992a05 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "wagon-provider-api", 
   "version": "1.0-alpha-5", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Maven Wagon API", 
   "description": "Tools to manage artifacts and deployment", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5.pom.package.json
index c23156e2c87..a1deb791ddc 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.wagon:wagon-provider-api", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.wagon", 
+  "name": "wagon-provider-api", 
   "version": "1.0-alpha-5", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Tools to manage artifacts and deployment", 
+  "description": "Maven Wagon API\nTools to manage artifacts and deployment", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -47,24 +50,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.0.4"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom.json
index fdc7e8c3fda..feea5447ae7 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "wagon-provider-api", 
   "version": "1.0-alpha-6", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.wagon", 
     "artifact_id": "wagon", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom.package.json
index b23eeee228f..fe97959cf17 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-6/wagon-provider-api-1.0-alpha-6.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.wagon:wagon-provider-api", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.wagon", 
+  "name": "wagon-provider-api", 
   "version": "1.0-alpha-6", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Wagon API", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.json
index e1b0a0063ab..d362db0a91d 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "wagon-provider-api", 
   "version": "1.0-beta-2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.wagon", 
     "artifact_id": "wagon", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.package.json
index 5ef69b3a644..6c02a1f2f1f 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.wagon:wagon-provider-api", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.wagon", 
+  "name": "wagon-provider-api", 
   "version": "1.0-beta-2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Maven Wagon API that defines the contract between different Wagon implementations", 
+  "description": "Maven Wagon API\nMaven Wagon API that defines the contract between different Wagon implementations", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-providers/1.0-beta-2/wagon-providers-1.0-beta-2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-providers/1.0-beta-2/wagon-providers-1.0-beta-2.pom.json
index 70464c19b66..6533f12c7b2 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-providers/1.0-beta-2/wagon-providers-1.0-beta-2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-providers/1.0-beta-2/wagon-providers-1.0-beta-2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "wagon-providers", 
   "version": "1.0-beta-2", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven.wagon", 
     "artifact_id": "wagon", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-providers/1.0-beta-2/wagon-providers-1.0-beta-2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-providers/1.0-beta-2/wagon-providers-1.0-beta-2.pom.package.json
index f7bece4364d..6b0442da809 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-providers/1.0-beta-2/wagon-providers-1.0-beta-2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-providers/1.0-beta-2/wagon-providers-1.0-beta-2.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.wagon:wagon-providers", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.wagon", 
+  "name": "wagon-providers", 
   "version": "1.0-beta-2", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Wagon Providers Parent", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,24 +23,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-provider-test", 
-        "version": "latest.release"
-      }
-    ], 
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-provider-api", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-provider-test", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-provider-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.pom.json
index 994142614a2..4cfa1f5454e 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "wagon-ssh-common", 
   "version": "1.0-beta-2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.wagon", 
     "artifact_id": "wagon-providers", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.pom.package.json
index 0345c6a59f6..bbe70f78863 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.wagon:wagon-ssh-common", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.wagon", 
+  "name": "wagon-ssh-common", 
   "version": "1.0-beta-2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Wagon SSH Common Library", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,22 +21,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-interactivity-api", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-interactivity-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2.pom.json
index dc7a40c8406..68a1f316e44 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "wagon-ssh-external", 
   "version": "1.0-beta-2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.wagon", 
     "artifact_id": "wagon-providers", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2.pom.package.json
index 699f34c1ccc..21d7ba745e6 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.wagon:wagon-ssh-external", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.wagon", 
+  "name": "wagon-ssh-external", 
   "version": "1.0-beta-2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Wagon that gets and puts artifacts using SSH protocol with a preinstalled SSH client", 
+  "description": "Maven Wagon SSH External Provider\nWagon that gets and puts artifacts using SSH protocol with a preinstalled SSH client", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,29 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-ssh-common", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-ssh-common-test", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-ssh-common", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-ssh-common-test", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh/1.0-alpha-5/wagon-ssh-1.0-alpha-5.pom.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh/1.0-alpha-5/wagon-ssh-1.0-alpha-5.pom.json
index 8b55a42b145..232ec11d8c6 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh/1.0-alpha-5/wagon-ssh-1.0-alpha-5.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh/1.0-alpha-5/wagon-ssh-1.0-alpha-5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "wagon-ssh", 
   "version": "1.0-alpha-5", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Maven Wagon SSH Provider", 
   "description": "Tools to manage artifacts and deployment", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh/1.0-alpha-5/wagon-ssh-1.0-alpha-5.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh/1.0-alpha-5/wagon-ssh-1.0-alpha-5.pom.package.json
index c3a4053ee5d..df96e953e4d 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh/1.0-alpha-5/wagon-ssh-1.0-alpha-5.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh/1.0-alpha-5/wagon-ssh-1.0-alpha-5.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.wagon:wagon-ssh", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.wagon", 
+  "name": "wagon-ssh", 
   "version": "1.0-alpha-5", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Tools to manage artifacts and deployment", 
+  "description": "Maven Wagon SSH Provider\nTools to manage artifacts and deployment", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -47,59 +50,82 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.jcraft:jsch", 
-        "version": "0.1.23"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-provider-api", 
-        "version": "1.0-alpha-5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "classworlds:classworlds", 
-        "version": "1.1-alpha-2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "plexus:plexus-utils", 
-        "version": "1.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-interactivity-api", 
-        "version": "1.0-alpha-4"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-provider-test", 
-        "version": "1.0-alpha-5"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:com.jcraft/jsch", 
+      "requirement": "0.1.23", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-provider-api", 
+      "requirement": "1.0-alpha-5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:classworlds/classworlds", 
+      "requirement": "1.1-alpha-2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:plexus/plexus-utils", 
+      "requirement": "1.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-interactivity-api", 
+      "requirement": "1.0-alpha-4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-provider-test", 
+      "requirement": "1.0-alpha-5", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2.pom.json
index 03353c0edc3..b46c32864d4 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "wagon-ssh", 
   "version": "1.0-beta-2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.maven.wagon", 
     "artifact_id": "wagon-providers", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2.pom.package.json
index becc4a637cc..2dfac5a68a3 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.wagon:wagon-ssh", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.wagon", 
+  "name": "wagon-ssh", 
   "version": "1.0-beta-2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Wagon SSH Provider", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,39 +21,50 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.jcraft:jsch", 
-        "version": "0.1.27"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-interactivity-api", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-ssh-common", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.wagon:wagon-ssh-common-test", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:com.jcraft/jsch", 
+      "requirement": "0.1.27", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-interactivity-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-ssh-common", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.wagon/wagon-ssh-common-test", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom.json
index 8246efd6a22..052e6be94b4 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "wagon", 
   "version": "1.0-alpha-6", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Maven Wagon", 
   "description": "Tools to manage artifacts and deployment", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom.package.json
index 5e9a04782a8..9c3e8bdd933 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon/1.0-alpha-6/wagon-1.0-alpha-6.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.wagon:wagon", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.wagon", 
+  "name": "wagon", 
   "version": "1.0-alpha-6", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Tools to manage artifacts and deployment", 
+  "description": "Maven Wagon\nTools to manage artifacts and deployment", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -47,17 +52,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.json
index c40a0092fc6..e667294ffc9 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "wagon", 
   "version": "1.0-beta-2", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.maven", 
     "artifact_id": "maven-parent", 
diff --git a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.package.json b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.package.json
index 8b2e06ce9e6..55fc22fc235 100644
--- a/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.maven.wagon:wagon", 
+  "type": "maven", 
+  "namespace": "org.apache.maven.wagon", 
+  "name": "wagon", 
   "version": "1.0-beta-2", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Tools to manage artifacts and deployment", 
+  "description": "Maven Wagon\nTools to manage artifacts and deployment", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,17 +31,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/mina/build/1.1.1/build-1.1.1.pom.json b/tests/packagedcode/data/m2/org/apache/mina/build/1.1.1/build-1.1.1.pom.json
index 87e5c6c242d..164a1a5cb9f 100644
--- a/tests/packagedcode/data/m2/org/apache/mina/build/1.1.1/build-1.1.1.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/mina/build/1.1.1/build-1.1.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "build", 
   "version": "1.1.1", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache", 
     "artifact_id": "apache", 
diff --git a/tests/packagedcode/data/m2/org/apache/mina/build/1.1.1/build-1.1.1.pom.package.json b/tests/packagedcode/data/m2/org/apache/mina/build/1.1.1/build-1.1.1.pom.package.json
index c3f96ba020e..4f0063132ac 100644
--- a/tests/packagedcode/data/m2/org/apache/mina/build/1.1.1/build-1.1.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/mina/build/1.1.1/build-1.1.1.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.mina:build", 
+  "type": "maven", 
+  "namespace": "org.apache.mina", 
+  "name": "build", 
   "version": "1.1.1", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "MINA (Multipurpose Infrastructure for Network Applications) is a\n    network application framework which helps users develop high\n    performance and highly scalable network applications easily.", 
+  "description": "Apache MINA Root Build POM\nMINA (Multipurpose Infrastructure for Network Applications) is a\n    network application framework which helps users develop high\n    performance and highly scalable network applications easily.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,17 +31,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "Apache 2.0 License\nhttp://www.apache.org/licenses/LICENSE-2.0", 
   "license_expression": null, 
+  "asserted_license": "Apache 2.0 License\nhttp://www.apache.org/licenses/LICENSE-2.0", 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/mina/mina-core/1.1.1/mina-core-1.1.1.pom.json b/tests/packagedcode/data/m2/org/apache/mina/mina-core/1.1.1/mina-core-1.1.1.pom.json
index 36d2f8396a9..acb0ef98e96 100644
--- a/tests/packagedcode/data/m2/org/apache/mina/mina-core/1.1.1/mina-core-1.1.1.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/mina/mina-core/1.1.1/mina-core-1.1.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "mina-core", 
   "version": "1.1.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.mina", 
     "artifact_id": "build", 
diff --git a/tests/packagedcode/data/m2/org/apache/mina/mina-core/1.1.1/mina-core-1.1.1.pom.package.json b/tests/packagedcode/data/m2/org/apache/mina/mina-core/1.1.1/mina-core-1.1.1.pom.package.json
index 191677351c2..f1a1c3a2943 100644
--- a/tests/packagedcode/data/m2/org/apache/mina/mina-core/1.1.1/mina-core-1.1.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/mina/mina-core/1.1.1/mina-core-1.1.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.mina:mina-core", 
+  "type": "maven", 
+  "namespace": "org.apache.mina", 
+  "name": "mina-core", 
   "version": "1.1.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Apache MINA Core API", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,29 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.slf4j:slf4j-api", 
-        "version": "1.4.2"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.slf4j:slf4j-simple", 
-        "version": "1.4.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "easymock:easymock", 
-        "version": "1.2_Java1.3"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.slf4j/slf4j-api", 
+      "requirement": "1.4.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.slf4j/slf4j-simple", 
+      "requirement": "1.4.2", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:easymock/easymock", 
+      "requirement": "1.2_Java1.3", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/myfaces/core/myfaces-api/1.1.5/myfaces-api-1.1.5.pom.json b/tests/packagedcode/data/m2/org/apache/myfaces/core/myfaces-api/1.1.5/myfaces-api-1.1.5.pom.json
index 3503a7b7f25..1a3fb562b36 100644
--- a/tests/packagedcode/data/m2/org/apache/myfaces/core/myfaces-api/1.1.5/myfaces-api-1.1.5.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/myfaces/core/myfaces-api/1.1.5/myfaces-api-1.1.5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "myfaces-api", 
   "version": "1.1.5", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.myfaces.core", 
     "artifact_id": "myfaces-core-project", 
diff --git a/tests/packagedcode/data/m2/org/apache/myfaces/core/myfaces-api/1.1.5/myfaces-api-1.1.5.pom.package.json b/tests/packagedcode/data/m2/org/apache/myfaces/core/myfaces-api/1.1.5/myfaces-api-1.1.5.pom.package.json
index a9df52ae1ef..d95166c1708 100644
--- a/tests/packagedcode/data/m2/org/apache/myfaces/core/myfaces-api/1.1.5/myfaces-api-1.1.5.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/myfaces/core/myfaces-api/1.1.5/myfaces-api-1.1.5.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.myfaces.core:myfaces-api", 
+  "type": "maven", 
+  "namespace": "org.apache.myfaces.core", 
+  "name": "myfaces-api", 
   "version": "1.1.5", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "The MyFaces API Subproject provides a full set of the API interfaces and classes\n    defined in JSR-127 (see also http://www.jcp.org/en/jsr/detail?id=127).", 
+  "description": "API\nThe MyFaces API Subproject provides a full set of the API interfaces and classes\n    defined in JSR-127 (see also http://www.jcp.org/en/jsr/detail?id=127).", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,71 +21,98 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-lang:commons-lang", 
-        "version": "2.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-beanutils:commons-beanutils", 
-        "version": "1.7.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:jstl", 
-        "version": "1.1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-digester:commons-digester", 
-        "version": "1.6"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "easymock:easymockclassextension", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.struts.shale:shale-test", 
-        "version": "1.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "easymock:easymock", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "aspectj:aspectjrt", 
-        "version": "1.2.1"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:servlet-api", 
-        "version": "2.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:jsp-api", 
-        "version": "2.0"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:commons-lang/commons-lang", 
+      "requirement": "2.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-beanutils/commons-beanutils", 
+      "requirement": "1.7.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/jstl", 
+      "requirement": "1.1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-digester/commons-digester", 
+      "requirement": "1.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:easymock/easymockclassextension", 
+      "requirement": "1.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.struts.shale/shale-test", 
+      "requirement": "1.0.2", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:easymock/easymock", 
+      "requirement": "1.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:aspectj/aspectjrt", 
+      "requirement": "1.2.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/servlet-api", 
+      "requirement": "2.3", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/jsp-api", 
+      "requirement": "2.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/myfaces/core/myfaces-core-project/1.1.5/myfaces-core-project-1.1.5.pom.json b/tests/packagedcode/data/m2/org/apache/myfaces/core/myfaces-core-project/1.1.5/myfaces-core-project-1.1.5.pom.json
index 82d30acd8df..a15fb94b950 100644
--- a/tests/packagedcode/data/m2/org/apache/myfaces/core/myfaces-core-project/1.1.5/myfaces-core-project-1.1.5.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/myfaces/core/myfaces-core-project/1.1.5/myfaces-core-project-1.1.5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "myfaces-core-project", 
   "version": "1.1.5", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.myfaces.maven", 
     "artifact_id": "myfaces-master", 
diff --git a/tests/packagedcode/data/m2/org/apache/myfaces/core/myfaces-core-project/1.1.5/myfaces-core-project-1.1.5.pom.package.json b/tests/packagedcode/data/m2/org/apache/myfaces/core/myfaces-core-project/1.1.5/myfaces-core-project-1.1.5.pom.package.json
index 8735ed33fff..31195ce81ee 100644
--- a/tests/packagedcode/data/m2/org/apache/myfaces/core/myfaces-core-project/1.1.5/myfaces-core-project-1.1.5.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/myfaces/core/myfaces-core-project/1.1.5/myfaces-core-project-1.1.5.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.myfaces.core:myfaces-core-project", 
+  "type": "maven", 
+  "namespace": "org.apache.myfaces.core", 
+  "name": "myfaces-core-project", 
   "version": "1.1.5", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Core Project", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/myfaces/core/myfaces-impl/1.1.5/myfaces-impl-1.1.5.pom.json b/tests/packagedcode/data/m2/org/apache/myfaces/core/myfaces-impl/1.1.5/myfaces-impl-1.1.5.pom.json
index d82dac7b460..5a048253ddf 100644
--- a/tests/packagedcode/data/m2/org/apache/myfaces/core/myfaces-impl/1.1.5/myfaces-impl-1.1.5.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/myfaces/core/myfaces-impl/1.1.5/myfaces-impl-1.1.5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "myfaces-impl", 
   "version": "1.1.5", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.myfaces.core", 
     "artifact_id": "myfaces-core-project", 
diff --git a/tests/packagedcode/data/m2/org/apache/myfaces/core/myfaces-impl/1.1.5/myfaces-impl-1.1.5.pom.package.json b/tests/packagedcode/data/m2/org/apache/myfaces/core/myfaces-impl/1.1.5/myfaces-impl-1.1.5.pom.package.json
index a57c09dd6a7..d684ca08b8e 100644
--- a/tests/packagedcode/data/m2/org/apache/myfaces/core/myfaces-impl/1.1.5/myfaces-impl-1.1.5.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/myfaces/core/myfaces-impl/1.1.5/myfaces-impl-1.1.5.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.myfaces.core:myfaces-impl", 
+  "type": "maven", 
+  "namespace": "org.apache.myfaces.core", 
+  "name": "myfaces-impl", 
   "version": "1.1.5", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "This is the MyFaces Impl Subproject Description [INSERT MORE STUFF HERE]", 
+  "description": "Impl\nThis is the MyFaces Impl Subproject Description [INSERT MORE STUFF HERE]", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,71 +21,98 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-el:commons-el", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-collections:commons-collections", 
-        "version": "3.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-codec:commons-codec", 
-        "version": "1.3"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:servlet-api", 
-        "version": "2.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.myfaces.core:myfaces-api", 
-        "version": "1.1.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:jsp-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.myfaces.shared:myfaces-shared-impl", 
-        "version": "2.0.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "portlet-api:portlet-api", 
-        "version": "1.0"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.struts.shale:shale-test", 
-        "version": "1.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "cactus:cactus", 
-        "version": "13-1.7.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:javax.servlet/servlet-api", 
+      "requirement": "2.3", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.myfaces.core/myfaces-api", 
+      "requirement": "1.1.5", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/jsp-api", 
+      "requirement": "2.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.myfaces.shared/myfaces-shared-impl", 
+      "requirement": "2.0.5", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:portlet-api/portlet-api", 
+      "requirement": "1.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-el/commons-el", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-collections/commons-collections", 
+      "requirement": "3.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-codec/commons-codec", 
+      "requirement": "1.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.struts.shale/shale-test", 
+      "requirement": "1.0.2", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:cactus/cactus", 
+      "requirement": "13-1.7.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/myfaces/maven/myfaces-master/1.0.5/myfaces-master-1.0.5.pom.json b/tests/packagedcode/data/m2/org/apache/myfaces/maven/myfaces-master/1.0.5/myfaces-master-1.0.5.pom.json
index e8b6e8e7005..8af5d167151 100644
--- a/tests/packagedcode/data/m2/org/apache/myfaces/maven/myfaces-master/1.0.5/myfaces-master-1.0.5.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/myfaces/maven/myfaces-master/1.0.5/myfaces-master-1.0.5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "myfaces-master", 
   "version": "1.0.5", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Master POM", 
   "description": "This is a master POM that is meant to be used by the various MyFaces modules.  It contains information that is\n        common to all projects.", 
diff --git a/tests/packagedcode/data/m2/org/apache/myfaces/maven/myfaces-master/1.0.5/myfaces-master-1.0.5.pom.package.json b/tests/packagedcode/data/m2/org/apache/myfaces/maven/myfaces-master/1.0.5/myfaces-master-1.0.5.pom.package.json
index f09eec1a4df..04f3288e88f 100644
--- a/tests/packagedcode/data/m2/org/apache/myfaces/maven/myfaces-master/1.0.5/myfaces-master-1.0.5.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/myfaces/maven/myfaces-master/1.0.5/myfaces-master-1.0.5.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.myfaces.maven:myfaces-master", 
+  "type": "maven", 
+  "namespace": "org.apache.myfaces.maven", 
+  "name": "myfaces-master", 
   "version": "1.0.5", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "This is a master POM that is meant to be used by the various MyFaces modules.  It contains information that is\n        common to all projects.", 
+  "description": "Master POM\nThis is a master POM that is meant to be used by the various MyFaces modules.  It contains information that is\n        common to all projects.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -285,17 +290,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/myfaces/tomahawk/tomahawk-project/1.1.5/tomahawk-project-1.1.5.pom.json b/tests/packagedcode/data/m2/org/apache/myfaces/tomahawk/tomahawk-project/1.1.5/tomahawk-project-1.1.5.pom.json
index a290eb014a9..df3bf0c674f 100644
--- a/tests/packagedcode/data/m2/org/apache/myfaces/tomahawk/tomahawk-project/1.1.5/tomahawk-project-1.1.5.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/myfaces/tomahawk/tomahawk-project/1.1.5/tomahawk-project-1.1.5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "tomahawk-project", 
   "version": "1.1.5", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.myfaces.maven", 
     "artifact_id": "myfaces-master", 
diff --git a/tests/packagedcode/data/m2/org/apache/myfaces/tomahawk/tomahawk-project/1.1.5/tomahawk-project-1.1.5.pom.package.json b/tests/packagedcode/data/m2/org/apache/myfaces/tomahawk/tomahawk-project/1.1.5/tomahawk-project-1.1.5.pom.package.json
index ac7858034a9..f5db50b8eae 100644
--- a/tests/packagedcode/data/m2/org/apache/myfaces/tomahawk/tomahawk-project/1.1.5/tomahawk-project-1.1.5.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/myfaces/tomahawk/tomahawk-project/1.1.5/tomahawk-project-1.1.5.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.myfaces.tomahawk:tomahawk-project", 
+  "type": "maven", 
+  "namespace": "org.apache.myfaces.tomahawk", 
+  "name": "tomahawk-project", 
   "version": "1.1.5", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Apache MyFaces Tomahawk is a sub-project of Apache MyFaces which provides an extensive sets\n  of custom components for use in your JSF-projects. Additionally, Tomahawk includes many custom\n  features helping you to implement JSF-projects more easily.", 
+  "description": "Tomahawk Project\nApache MyFaces Tomahawk is a sub-project of Apache MyFaces which provides an extensive sets\n  of custom components for use in your JSF-projects. Additionally, Tomahawk includes many custom\n  features helping you to implement JSF-projects more easily.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/myfaces/tomahawk/tomahawk/1.1.5/tomahawk-1.1.5.pom.json b/tests/packagedcode/data/m2/org/apache/myfaces/tomahawk/tomahawk/1.1.5/tomahawk-1.1.5.pom.json
index ee8bef0c5f2..bb83f0a0f9c 100644
--- a/tests/packagedcode/data/m2/org/apache/myfaces/tomahawk/tomahawk/1.1.5/tomahawk-1.1.5.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/myfaces/tomahawk/tomahawk/1.1.5/tomahawk-1.1.5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "tomahawk", 
   "version": "1.1.5", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.myfaces.tomahawk", 
     "artifact_id": "tomahawk-project", 
diff --git a/tests/packagedcode/data/m2/org/apache/myfaces/tomahawk/tomahawk/1.1.5/tomahawk-1.1.5.pom.package.json b/tests/packagedcode/data/m2/org/apache/myfaces/tomahawk/tomahawk/1.1.5/tomahawk-1.1.5.pom.package.json
index a2ec8c44a3e..7caa85c5cf2 100644
--- a/tests/packagedcode/data/m2/org/apache/myfaces/tomahawk/tomahawk/1.1.5/tomahawk-1.1.5.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/myfaces/tomahawk/tomahawk/1.1.5/tomahawk-1.1.5.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.myfaces.tomahawk:tomahawk", 
+  "type": "maven", 
+  "namespace": "org.apache.myfaces.tomahawk", 
+  "name": "tomahawk", 
   "version": "1.1.5", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Tomahawk Core", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,136 +21,202 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-validator:commons-validator", 
-        "version": "1.3.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-fileupload:commons-fileupload", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-collections:commons-collections", 
-        "version": "3.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "struts:struts", 
-        "version": "1.2.9"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-el:commons-el", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-codec:commons-codec", 
-        "version": "1.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "oro:oro", 
-        "version": "2.0.8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-lang:commons-lang", 
-        "version": "2.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:jstl", 
-        "version": "1.1.0"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.myfaces.core:myfaces-api", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.myfaces.shared:myfaces-shared-tomahawk", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:jsp-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:servlet-api", 
-        "version": "2.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "portlet-api:portlet-api", 
-        "version": "1.0"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.myfaces.core:myfaces-impl", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "cactus:cactus", 
-        "version": "13-1.7.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "aspectj:aspectjrt", 
-        "version": "1.2.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "easymock:easymock", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "easymock:easymockclassextension", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.shale:shale-test", 
-        "version": "1.0.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jmock:jmock", 
-        "version": "1.0.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jmock:jmock-cglib", 
-        "version": "1.0.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "maven-taglib:maven-taglib-plugin", 
-        "version": "1.4.2"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-validator/commons-validator", 
+      "requirement": "1.3.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-fileupload/commons-fileupload", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-collections/commons-collections", 
+      "requirement": "3.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:struts/struts", 
+      "requirement": "1.2.9", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-el/commons-el", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-codec/commons-codec", 
+      "requirement": "1.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:oro/oro", 
+      "requirement": "2.0.8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-lang/commons-lang", 
+      "requirement": "2.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/jstl", 
+      "requirement": "1.1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.myfaces.core/myfaces-api", 
+      "requirement": null, 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.myfaces.shared/myfaces-shared-tomahawk", 
+      "requirement": null, 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/jsp-api", 
+      "requirement": "2.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/servlet-api", 
+      "requirement": "2.3", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:portlet-api/portlet-api", 
+      "requirement": "1.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.myfaces.core/myfaces-impl", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:cactus/cactus", 
+      "requirement": "13-1.7.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:aspectj/aspectjrt", 
+      "requirement": "1.2.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:easymock/easymock", 
+      "requirement": "1.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:easymock/easymockclassextension", 
+      "requirement": "1.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.shale/shale-test", 
+      "requirement": "1.0.3", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jmock/jmock", 
+      "requirement": "1.0.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jmock/jmock-cglib", 
+      "requirement": "1.0.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:maven-taglib/maven-taglib-plugin", 
+      "requirement": "1.4.2", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/shale/shale-master/2/shale-master-2.pom.json b/tests/packagedcode/data/m2/org/apache/shale/shale-master/2/shale-master-2.pom.json
index 910e579e82e..a9e7f682aae 100644
--- a/tests/packagedcode/data/m2/org/apache/shale/shale-master/2/shale-master-2.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/shale/shale-master/2/shale-master-2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "shale-master", 
   "version": "2", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache", 
     "artifact_id": "apache", 
diff --git a/tests/packagedcode/data/m2/org/apache/shale/shale-master/2/shale-master-2.pom.package.json b/tests/packagedcode/data/m2/org/apache/shale/shale-master/2/shale-master-2.pom.package.json
index a23b34fcb56..936c0e0ac59 100644
--- a/tests/packagedcode/data/m2/org/apache/shale/shale-master/2/shale-master-2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/shale/shale-master/2/shale-master-2.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.shale:shale-master", 
+  "type": "maven", 
+  "namespace": "org.apache.shale", 
+  "name": "shale-master", 
   "version": "2", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Apache Shale", 
+  "description": "Apache Shale Framework Master POM\nApache Shale", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -306,9 +311,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/shale/shale-parent/1.0.4/shale-parent-1.0.4.pom.json b/tests/packagedcode/data/m2/org/apache/shale/shale-parent/1.0.4/shale-parent-1.0.4.pom.json
index ea2b2c65e46..f10e4432fbc 100644
--- a/tests/packagedcode/data/m2/org/apache/shale/shale-parent/1.0.4/shale-parent-1.0.4.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/shale/shale-parent/1.0.4/shale-parent-1.0.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "shale-parent", 
   "version": "1.0.4", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.shale", 
     "artifact_id": "shale-master", 
diff --git a/tests/packagedcode/data/m2/org/apache/shale/shale-parent/1.0.4/shale-parent-1.0.4.pom.package.json b/tests/packagedcode/data/m2/org/apache/shale/shale-parent/1.0.4/shale-parent-1.0.4.pom.package.json
index 99838313daf..4da4ff7286e 100644
--- a/tests/packagedcode/data/m2/org/apache/shale/shale-parent/1.0.4/shale-parent-1.0.4.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/shale/shale-parent/1.0.4/shale-parent-1.0.4.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.shale:shale-parent", 
+  "type": "maven", 
+  "namespace": "org.apache.shale", 
+  "name": "shale-parent", 
   "version": "1.0.4", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "The Apache Shale Framework", 
+  "description": "Apache Shale Framework Parent POM\nThe Apache Shale Framework", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/shale/shale-test/1.0.4/shale-test-1.0.4.pom.json b/tests/packagedcode/data/m2/org/apache/shale/shale-test/1.0.4/shale-test-1.0.4.pom.json
index 747058a7ce1..115323495d4 100644
--- a/tests/packagedcode/data/m2/org/apache/shale/shale-test/1.0.4/shale-test-1.0.4.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/shale/shale-test/1.0.4/shale-test-1.0.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "shale-test", 
   "version": "1.0.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.shale", 
     "artifact_id": "shale-parent", 
diff --git a/tests/packagedcode/data/m2/org/apache/shale/shale-test/1.0.4/shale-test-1.0.4.pom.package.json b/tests/packagedcode/data/m2/org/apache/shale/shale-test/1.0.4/shale-test-1.0.4.pom.package.json
index 33ba00b6a62..bafdbe9456c 100644
--- a/tests/packagedcode/data/m2/org/apache/shale/shale-test/1.0.4/shale-test-1.0.4.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/shale/shale-test/1.0.4/shale-test-1.0.4.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.shale:shale-test", 
+  "type": "maven", 
+  "namespace": "org.apache.shale", 
+  "name": "shale-test", 
   "version": "1.0.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Shale Test Framework", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,42 +21,58 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "htmlunit:htmlunit", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jmock:jmock", 
-        "version": "1.0.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jmock:jmock-cglib", 
-        "version": "1.0.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.cargo:cargo-core-uberjar", 
-        "version": "0.8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.cargo:cargo-ant", 
-        "version": "0.8"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:htmlunit/htmlunit", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jmock/jmock", 
+      "requirement": "1.0.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jmock/jmock-cglib", 
+      "requirement": "1.0.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.cargo/cargo-core-uberjar", 
+      "requirement": "0.8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.cargo/cargo-ant", 
+      "requirement": "0.8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/apache/velocity/velocity/1.5/velocity-1.5.pom.json b/tests/packagedcode/data/m2/org/apache/velocity/velocity/1.5/velocity-1.5.pom.json
index acd37a259a9..bdbba80d8d8 100644
--- a/tests/packagedcode/data/m2/org/apache/velocity/velocity/1.5/velocity-1.5.pom.json
+++ b/tests/packagedcode/data/m2/org/apache/velocity/velocity/1.5/velocity-1.5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "velocity", 
   "version": "1.5", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Apache Velocity", 
   "description": "Apache Velocity is a general purpose template engine.", 
diff --git a/tests/packagedcode/data/m2/org/apache/velocity/velocity/1.5/velocity-1.5.pom.package.json b/tests/packagedcode/data/m2/org/apache/velocity/velocity/1.5/velocity-1.5.pom.package.json
index 683654fac34..1a839fa7090 100644
--- a/tests/packagedcode/data/m2/org/apache/velocity/velocity/1.5/velocity-1.5.pom.package.json
+++ b/tests/packagedcode/data/m2/org/apache/velocity/velocity/1.5/velocity-1.5.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.velocity:velocity", 
+  "type": "maven", 
+  "namespace": "org.apache.velocity", 
+  "name": "velocity", 
   "version": "1.5", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Apache Velocity is a general purpose template engine.", 
+  "description": "Apache Velocity\nApache Velocity is a general purpose template engine.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -61,59 +66,82 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-collections:commons-collections", 
-        "version": "3.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-lang:commons-lang", 
-        "version": "2.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "oro:oro", 
-        "version": "2.0.8"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "jdom:jdom", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "log4j:log4j", 
-        "version": "1.2.12"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:servlet-api", 
-        "version": "2.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "logkit:logkit", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "ant:ant", 
-        "version": "1.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "werken-xpath:werken-xpath", 
-        "version": "0.9.4"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:commons-collections/commons-collections", 
+      "requirement": "3.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-lang/commons-lang", 
+      "requirement": "2.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:oro/oro", 
+      "requirement": "2.0.8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jdom/jdom", 
+      "requirement": "1.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:log4j/log4j", 
+      "requirement": "1.2.12", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/servlet-api", 
+      "requirement": "2.3", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:logkit/logkit", 
+      "requirement": "2.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:ant/ant", 
+      "requirement": "1.6", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:werken-xpath/werken-xpath", 
+      "requirement": "0.9.4", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/aspectj/aspectjrt/1.5.4/aspectjrt-1.5.4.pom.json b/tests/packagedcode/data/m2/org/aspectj/aspectjrt/1.5.4/aspectjrt-1.5.4.pom.json
index aa9e9d0cc05..5eddef5fd5f 100644
--- a/tests/packagedcode/data/m2/org/aspectj/aspectjrt/1.5.4/aspectjrt-1.5.4.pom.json
+++ b/tests/packagedcode/data/m2/org/aspectj/aspectjrt/1.5.4/aspectjrt-1.5.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "aspectjrt", 
   "version": "1.5.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "AspectJ runtime", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/aspectj/aspectjrt/1.5.4/aspectjrt-1.5.4.pom.package.json b/tests/packagedcode/data/m2/org/aspectj/aspectjrt/1.5.4/aspectjrt-1.5.4.pom.package.json
index c40fb13a4b0..89a5cb9a707 100644
--- a/tests/packagedcode/data/m2/org/aspectj/aspectjrt/1.5.4/aspectjrt-1.5.4.pom.package.json
+++ b/tests/packagedcode/data/m2/org/aspectj/aspectjrt/1.5.4/aspectjrt-1.5.4.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.aspectj:aspectjrt", 
+  "type": "maven", 
+  "namespace": "org.aspectj", 
+  "name": "aspectjrt", 
   "version": "1.5.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "AspectJ runtime", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "Eclipse Public License - v 1.0\nhttp://www.eclipse.org/legal/epl-v10.html", 
   "license_expression": null, 
+  "asserted_license": "Eclipse Public License - v 1.0\nhttp://www.eclipse.org/legal/epl-v10.html", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/aspectj/aspectjrt/1.6.0/aspectjrt-1.6.0.pom.json b/tests/packagedcode/data/m2/org/aspectj/aspectjrt/1.6.0/aspectjrt-1.6.0.pom.json
index 448acce9073..8a841802a17 100644
--- a/tests/packagedcode/data/m2/org/aspectj/aspectjrt/1.6.0/aspectjrt-1.6.0.pom.json
+++ b/tests/packagedcode/data/m2/org/aspectj/aspectjrt/1.6.0/aspectjrt-1.6.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "aspectjrt", 
   "version": "1.6.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "AspectJ runtime", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/aspectj/aspectjrt/1.6.0/aspectjrt-1.6.0.pom.package.json b/tests/packagedcode/data/m2/org/aspectj/aspectjrt/1.6.0/aspectjrt-1.6.0.pom.package.json
index bb81434f0b0..a25b31c13dc 100644
--- a/tests/packagedcode/data/m2/org/aspectj/aspectjrt/1.6.0/aspectjrt-1.6.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/aspectj/aspectjrt/1.6.0/aspectjrt-1.6.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.aspectj:aspectjrt", 
+  "type": "maven", 
+  "namespace": "org.aspectj", 
+  "name": "aspectjrt", 
   "version": "1.6.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "AspectJ runtime", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "Eclipse Public License - v 1.0\nhttp://www.eclipse.org/legal/epl-v10.html", 
   "license_expression": null, 
+  "asserted_license": "Eclipse Public License - v 1.0\nhttp://www.eclipse.org/legal/epl-v10.html", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/aspectj/aspectjtools/1.5.4/aspectjtools-1.5.4.pom.json b/tests/packagedcode/data/m2/org/aspectj/aspectjtools/1.5.4/aspectjtools-1.5.4.pom.json
index bebdd1e6662..dd7897180ec 100644
--- a/tests/packagedcode/data/m2/org/aspectj/aspectjtools/1.5.4/aspectjtools-1.5.4.pom.json
+++ b/tests/packagedcode/data/m2/org/aspectj/aspectjtools/1.5.4/aspectjtools-1.5.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "aspectjtools", 
   "version": "1.5.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "AspectJ tools", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/aspectj/aspectjtools/1.5.4/aspectjtools-1.5.4.pom.package.json b/tests/packagedcode/data/m2/org/aspectj/aspectjtools/1.5.4/aspectjtools-1.5.4.pom.package.json
index 73b5708ae13..5edd743ab41 100644
--- a/tests/packagedcode/data/m2/org/aspectj/aspectjtools/1.5.4/aspectjtools-1.5.4.pom.package.json
+++ b/tests/packagedcode/data/m2/org/aspectj/aspectjtools/1.5.4/aspectjtools-1.5.4.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.aspectj:aspectjtools", 
+  "type": "maven", 
+  "namespace": "org.aspectj", 
+  "name": "aspectjtools", 
   "version": "1.5.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "AspectJ tools", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "Eclipse Public License - v 1.0\nhttp://www.eclipse.org/legal/epl-v10.html", 
   "license_expression": null, 
+  "asserted_license": "Eclipse Public License - v 1.0\nhttp://www.eclipse.org/legal/epl-v10.html", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/aspectj/aspectjtools/1.6.0/aspectjtools-1.6.0.pom.json b/tests/packagedcode/data/m2/org/aspectj/aspectjtools/1.6.0/aspectjtools-1.6.0.pom.json
index 23d8c2dec4c..3b636f0fc2a 100644
--- a/tests/packagedcode/data/m2/org/aspectj/aspectjtools/1.6.0/aspectjtools-1.6.0.pom.json
+++ b/tests/packagedcode/data/m2/org/aspectj/aspectjtools/1.6.0/aspectjtools-1.6.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "aspectjtools", 
   "version": "1.6.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "AspectJ tools", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/aspectj/aspectjtools/1.6.0/aspectjtools-1.6.0.pom.package.json b/tests/packagedcode/data/m2/org/aspectj/aspectjtools/1.6.0/aspectjtools-1.6.0.pom.package.json
index 51efb087177..1c2ea12428d 100644
--- a/tests/packagedcode/data/m2/org/aspectj/aspectjtools/1.6.0/aspectjtools-1.6.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/aspectj/aspectjtools/1.6.0/aspectjtools-1.6.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.aspectj:aspectjtools", 
+  "type": "maven", 
+  "namespace": "org.aspectj", 
+  "name": "aspectjtools", 
   "version": "1.6.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "AspectJ tools", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "Eclipse Public License - v 1.0\nhttp://www.eclipse.org/legal/epl-v10.html", 
   "license_expression": null, 
+  "asserted_license": "Eclipse Public License - v 1.0\nhttp://www.eclipse.org/legal/epl-v10.html", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/aspectj/aspectjweaver/1.5.4/aspectjweaver-1.5.4.pom.json b/tests/packagedcode/data/m2/org/aspectj/aspectjweaver/1.5.4/aspectjweaver-1.5.4.pom.json
index c7d6bc23a2f..d780402c21c 100644
--- a/tests/packagedcode/data/m2/org/aspectj/aspectjweaver/1.5.4/aspectjweaver-1.5.4.pom.json
+++ b/tests/packagedcode/data/m2/org/aspectj/aspectjweaver/1.5.4/aspectjweaver-1.5.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "aspectjweaver", 
   "version": "1.5.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "AspectJ weaver", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/aspectj/aspectjweaver/1.5.4/aspectjweaver-1.5.4.pom.package.json b/tests/packagedcode/data/m2/org/aspectj/aspectjweaver/1.5.4/aspectjweaver-1.5.4.pom.package.json
index e61640c1497..ee39fec9471 100644
--- a/tests/packagedcode/data/m2/org/aspectj/aspectjweaver/1.5.4/aspectjweaver-1.5.4.pom.package.json
+++ b/tests/packagedcode/data/m2/org/aspectj/aspectjweaver/1.5.4/aspectjweaver-1.5.4.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.aspectj:aspectjweaver", 
+  "type": "maven", 
+  "namespace": "org.aspectj", 
+  "name": "aspectjweaver", 
   "version": "1.5.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "AspectJ weaver", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "Eclipse Public License - v 1.0\nhttp://www.eclipse.org/legal/epl-v10.html", 
   "license_expression": null, 
+  "asserted_license": "Eclipse Public License - v 1.0\nhttp://www.eclipse.org/legal/epl-v10.html", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/aspectj/aspectjweaver/1.6.0/aspectjweaver-1.6.0.pom.json b/tests/packagedcode/data/m2/org/aspectj/aspectjweaver/1.6.0/aspectjweaver-1.6.0.pom.json
index ed0bac8eeca..a619a52c17f 100644
--- a/tests/packagedcode/data/m2/org/aspectj/aspectjweaver/1.6.0/aspectjweaver-1.6.0.pom.json
+++ b/tests/packagedcode/data/m2/org/aspectj/aspectjweaver/1.6.0/aspectjweaver-1.6.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "aspectjweaver", 
   "version": "1.6.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "AspectJ weaver", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/aspectj/aspectjweaver/1.6.0/aspectjweaver-1.6.0.pom.package.json b/tests/packagedcode/data/m2/org/aspectj/aspectjweaver/1.6.0/aspectjweaver-1.6.0.pom.package.json
index 4b9ed5671f4..e04aa6998d3 100644
--- a/tests/packagedcode/data/m2/org/aspectj/aspectjweaver/1.6.0/aspectjweaver-1.6.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/aspectj/aspectjweaver/1.6.0/aspectjweaver-1.6.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.aspectj:aspectjweaver", 
+  "type": "maven", 
+  "namespace": "org.aspectj", 
+  "name": "aspectjweaver", 
   "version": "1.6.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "AspectJ weaver", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "Eclipse Public License - v 1.0\nhttp://www.eclipse.org/legal/epl-v10.html", 
   "license_expression": null, 
+  "asserted_license": "Eclipse Public License - v 1.0\nhttp://www.eclipse.org/legal/epl-v10.html", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/bouncycastle/bcprov/1.37/bcprov-1.37.pom.json b/tests/packagedcode/data/m2/org/bouncycastle/bcprov/1.37/bcprov-1.37.pom.json
index c19224d4947..cfc0d0d13f2 100644
--- a/tests/packagedcode/data/m2/org/bouncycastle/bcprov/1.37/bcprov-1.37.pom.json
+++ b/tests/packagedcode/data/m2/org/bouncycastle/bcprov/1.37/bcprov-1.37.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "bcprov", 
   "version": "1.37", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/bouncycastle/bcprov/1.37/bcprov-1.37.pom.package.json b/tests/packagedcode/data/m2/org/bouncycastle/bcprov/1.37/bcprov-1.37.pom.package.json
index e8183f1ddd6..f5eabed96be 100644
--- a/tests/packagedcode/data/m2/org/bouncycastle/bcprov/1.37/bcprov-1.37.pom.package.json
+++ b/tests/packagedcode/data/m2/org/bouncycastle/bcprov/1.37/bcprov-1.37.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.bouncycastle:bcprov", 
+  "type": "maven", 
+  "namespace": "org.bouncycastle", 
+  "name": "bcprov", 
   "version": "1.37", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions-maven2/1.0-SNAPSHOT/cargo-extensions-maven2-1.0-20090219.165735-19.pom.json b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions-maven2/1.0-SNAPSHOT/cargo-extensions-maven2-1.0-20090219.165735-19.pom.json
index 1f1bf3684b1..025573cc7a0 100644
--- a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions-maven2/1.0-SNAPSHOT/cargo-extensions-maven2-1.0-20090219.165735-19.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions-maven2/1.0-SNAPSHOT/cargo-extensions-maven2-1.0-20090219.165735-19.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "cargo-extensions-maven2", 
   "version": "1.0-SNAPSHOT", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.codehaus.cargo", 
     "artifact_id": "cargo-extensions", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions-maven2/1.0-SNAPSHOT/cargo-extensions-maven2-1.0-20090219.165735-19.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions-maven2/1.0-SNAPSHOT/cargo-extensions-maven2-1.0-20090219.165735-19.pom.package.json
index 83a7dabaab0..3a325b446da 100644
--- a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions-maven2/1.0-SNAPSHOT/cargo-extensions-maven2-1.0-20090219.165735-19.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions-maven2/1.0-SNAPSHOT/cargo-extensions-maven2-1.0-20090219.165735-19.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.cargo:cargo-extensions-maven2", 
+  "type": "maven", 
+  "namespace": "org.codehaus.cargo", 
+  "name": "cargo-extensions-maven2", 
   "version": "1.0-SNAPSHOT", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Cargo Extensions for Maven 2", 
+  "description": "Cargo Extensions - Maven 2\nCargo Extensions for Maven 2", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions-maven2/1.0-SNAPSHOT/cargo-extensions-maven2-1.0-SNAPSHOT.pom.json b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions-maven2/1.0-SNAPSHOT/cargo-extensions-maven2-1.0-SNAPSHOT.pom.json
index 1f1bf3684b1..025573cc7a0 100644
--- a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions-maven2/1.0-SNAPSHOT/cargo-extensions-maven2-1.0-SNAPSHOT.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions-maven2/1.0-SNAPSHOT/cargo-extensions-maven2-1.0-SNAPSHOT.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "cargo-extensions-maven2", 
   "version": "1.0-SNAPSHOT", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.codehaus.cargo", 
     "artifact_id": "cargo-extensions", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions-maven2/1.0-SNAPSHOT/cargo-extensions-maven2-1.0-SNAPSHOT.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions-maven2/1.0-SNAPSHOT/cargo-extensions-maven2-1.0-SNAPSHOT.pom.package.json
index 83a7dabaab0..3a325b446da 100644
--- a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions-maven2/1.0-SNAPSHOT/cargo-extensions-maven2-1.0-SNAPSHOT.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions-maven2/1.0-SNAPSHOT/cargo-extensions-maven2-1.0-SNAPSHOT.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.cargo:cargo-extensions-maven2", 
+  "type": "maven", 
+  "namespace": "org.codehaus.cargo", 
+  "name": "cargo-extensions-maven2", 
   "version": "1.0-SNAPSHOT", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Cargo Extensions for Maven 2", 
+  "description": "Cargo Extensions - Maven 2\nCargo Extensions for Maven 2", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions/1.0-SNAPSHOT/cargo-extensions-1.0-20090219.165735-20.pom.json b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions/1.0-SNAPSHOT/cargo-extensions-1.0-20090219.165735-20.pom.json
index 65eb50c9b2c..75d014a8b16 100644
--- a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions/1.0-SNAPSHOT/cargo-extensions-1.0-20090219.165735-20.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions/1.0-SNAPSHOT/cargo-extensions-1.0-20090219.165735-20.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "cargo-extensions", 
   "version": "1.0-SNAPSHOT", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.codehaus.cargo", 
     "artifact_id": "cargo-parent", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions/1.0-SNAPSHOT/cargo-extensions-1.0-20090219.165735-20.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions/1.0-SNAPSHOT/cargo-extensions-1.0-20090219.165735-20.pom.package.json
index 7270cd1f371..3133df37ccf 100644
--- a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions/1.0-SNAPSHOT/cargo-extensions-1.0-20090219.165735-20.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions/1.0-SNAPSHOT/cargo-extensions-1.0-20090219.165735-20.pom.package.json
@@ -1,7 +1,12 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.cargo:cargo-extensions", 
+  "type": "maven", 
+  "namespace": "org.codehaus.cargo", 
+  "name": "cargo-extensions", 
   "version": "1.0-SNAPSHOT", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Cargo Extensions", 
@@ -18,69 +23,98 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.cargo:cargo-core-api-generic", 
-        "version": "1.0-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.cargo:cargo-core-container-geronimo", 
-        "version": "1.0-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.cargo:cargo-core-container-jboss", 
-        "version": "1.0-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.cargo:cargo-core-container-jetty", 
-        "version": "1.0-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.cargo:cargo-core-container-jo", 
-        "version": "1.0-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.cargo:cargo-core-container-jonas", 
-        "version": "1.0-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.cargo:cargo-core-container-orion", 
-        "version": "1.0-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.cargo:cargo-core-container-resin", 
-        "version": "1.0-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.cargo:cargo-core-container-tomcat", 
-        "version": "1.0-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.cargo:cargo-core-container-weblogic", 
-        "version": "1.0-SNAPSHOT"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.cargo/cargo-core-api-generic", 
+      "requirement": "1.0-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.cargo/cargo-core-container-geronimo", 
+      "requirement": "1.0-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.cargo/cargo-core-container-jboss", 
+      "requirement": "1.0-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.cargo/cargo-core-container-jetty", 
+      "requirement": "1.0-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.cargo/cargo-core-container-jo", 
+      "requirement": "1.0-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.cargo/cargo-core-container-jonas", 
+      "requirement": "1.0-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.cargo/cargo-core-container-orion", 
+      "requirement": "1.0-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.cargo/cargo-core-container-resin", 
+      "requirement": "1.0-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.cargo/cargo-core-container-tomcat", 
+      "requirement": "1.0-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.cargo/cargo-core-container-weblogic", 
+      "requirement": "1.0-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions/1.0-SNAPSHOT/cargo-extensions-1.0-SNAPSHOT.pom.json b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions/1.0-SNAPSHOT/cargo-extensions-1.0-SNAPSHOT.pom.json
index 65eb50c9b2c..75d014a8b16 100644
--- a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions/1.0-SNAPSHOT/cargo-extensions-1.0-SNAPSHOT.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions/1.0-SNAPSHOT/cargo-extensions-1.0-SNAPSHOT.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "cargo-extensions", 
   "version": "1.0-SNAPSHOT", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.codehaus.cargo", 
     "artifact_id": "cargo-parent", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions/1.0-SNAPSHOT/cargo-extensions-1.0-SNAPSHOT.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions/1.0-SNAPSHOT/cargo-extensions-1.0-SNAPSHOT.pom.package.json
index 7270cd1f371..3133df37ccf 100644
--- a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions/1.0-SNAPSHOT/cargo-extensions-1.0-SNAPSHOT.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-extensions/1.0-SNAPSHOT/cargo-extensions-1.0-SNAPSHOT.pom.package.json
@@ -1,7 +1,12 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.cargo:cargo-extensions", 
+  "type": "maven", 
+  "namespace": "org.codehaus.cargo", 
+  "name": "cargo-extensions", 
   "version": "1.0-SNAPSHOT", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Cargo Extensions", 
@@ -18,69 +23,98 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.cargo:cargo-core-api-generic", 
-        "version": "1.0-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.cargo:cargo-core-container-geronimo", 
-        "version": "1.0-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.cargo:cargo-core-container-jboss", 
-        "version": "1.0-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.cargo:cargo-core-container-jetty", 
-        "version": "1.0-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.cargo:cargo-core-container-jo", 
-        "version": "1.0-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.cargo:cargo-core-container-jonas", 
-        "version": "1.0-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.cargo:cargo-core-container-orion", 
-        "version": "1.0-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.cargo:cargo-core-container-resin", 
-        "version": "1.0-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.cargo:cargo-core-container-tomcat", 
-        "version": "1.0-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.cargo:cargo-core-container-weblogic", 
-        "version": "1.0-SNAPSHOT"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.cargo/cargo-core-api-generic", 
+      "requirement": "1.0-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.cargo/cargo-core-container-geronimo", 
+      "requirement": "1.0-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.cargo/cargo-core-container-jboss", 
+      "requirement": "1.0-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.cargo/cargo-core-container-jetty", 
+      "requirement": "1.0-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.cargo/cargo-core-container-jo", 
+      "requirement": "1.0-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.cargo/cargo-core-container-jonas", 
+      "requirement": "1.0-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.cargo/cargo-core-container-orion", 
+      "requirement": "1.0-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.cargo/cargo-core-container-resin", 
+      "requirement": "1.0-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.cargo/cargo-core-container-tomcat", 
+      "requirement": "1.0-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.cargo/cargo-core-container-weblogic", 
+      "requirement": "1.0-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-maven2-plugin/1.0-SNAPSHOT/cargo-maven2-plugin-1.0-20090219.165735-19.pom.json b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-maven2-plugin/1.0-SNAPSHOT/cargo-maven2-plugin-1.0-20090219.165735-19.pom.json
index e98c2e090c4..2379f3a8fa1 100644
--- a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-maven2-plugin/1.0-SNAPSHOT/cargo-maven2-plugin-1.0-20090219.165735-19.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-maven2-plugin/1.0-SNAPSHOT/cargo-maven2-plugin-1.0-20090219.165735-19.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "cargo-maven2-plugin", 
   "version": "1.0-SNAPSHOT", 
   "classifier": null, 
-  "packaging ": "maven-plugin", 
+  "packaging": "maven-plugin", 
   "parent": {
     "group_id": "org.codehaus.cargo", 
     "artifact_id": "cargo-extensions-maven2", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-maven2-plugin/1.0-SNAPSHOT/cargo-maven2-plugin-1.0-20090219.165735-19.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-maven2-plugin/1.0-SNAPSHOT/cargo-maven2-plugin-1.0-20090219.165735-19.pom.package.json
index 3523f0d6260..a9f59e17856 100644
--- a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-maven2-plugin/1.0-SNAPSHOT/cargo-maven2-plugin-1.0-20090219.165735-19.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-maven2-plugin/1.0-SNAPSHOT/cargo-maven2-plugin-1.0-20090219.165735-19.pom.package.json
@@ -1,7 +1,12 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.cargo:cargo-maven2-plugin", 
+  "type": "maven", 
+  "namespace": "org.codehaus.cargo", 
+  "name": "cargo-maven2-plugin", 
   "version": "1.0-SNAPSHOT", 
+  "qualifiers": {
+    "packaging": "maven-plugin"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Cargo Maven 2 Plugin", 
@@ -18,49 +23,66 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-settings", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.4.7"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.cargo:cargo-core-api-container", 
-        "version": "${cargo.core.version}"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jmock:jmock", 
-        "version": "1.0.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-vfs:commons-vfs", 
-        "version": "1.0"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-settings", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.4.7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.cargo/cargo-core-api-container", 
+      "requirement": "${cargo.core.version}", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jmock/jmock", 
+      "requirement": "1.0.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-vfs/commons-vfs", 
+      "requirement": "1.0", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-maven2-plugin/1.0-SNAPSHOT/cargo-maven2-plugin-1.0-SNAPSHOT.pom.json b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-maven2-plugin/1.0-SNAPSHOT/cargo-maven2-plugin-1.0-SNAPSHOT.pom.json
index e98c2e090c4..2379f3a8fa1 100644
--- a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-maven2-plugin/1.0-SNAPSHOT/cargo-maven2-plugin-1.0-SNAPSHOT.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-maven2-plugin/1.0-SNAPSHOT/cargo-maven2-plugin-1.0-SNAPSHOT.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "cargo-maven2-plugin", 
   "version": "1.0-SNAPSHOT", 
   "classifier": null, 
-  "packaging ": "maven-plugin", 
+  "packaging": "maven-plugin", 
   "parent": {
     "group_id": "org.codehaus.cargo", 
     "artifact_id": "cargo-extensions-maven2", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-maven2-plugin/1.0-SNAPSHOT/cargo-maven2-plugin-1.0-SNAPSHOT.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-maven2-plugin/1.0-SNAPSHOT/cargo-maven2-plugin-1.0-SNAPSHOT.pom.package.json
index 3523f0d6260..a9f59e17856 100644
--- a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-maven2-plugin/1.0-SNAPSHOT/cargo-maven2-plugin-1.0-SNAPSHOT.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-maven2-plugin/1.0-SNAPSHOT/cargo-maven2-plugin-1.0-SNAPSHOT.pom.package.json
@@ -1,7 +1,12 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.cargo:cargo-maven2-plugin", 
+  "type": "maven", 
+  "namespace": "org.codehaus.cargo", 
+  "name": "cargo-maven2-plugin", 
   "version": "1.0-SNAPSHOT", 
+  "qualifiers": {
+    "packaging": "maven-plugin"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Cargo Maven 2 Plugin", 
@@ -18,49 +23,66 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-settings", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.4.7"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.cargo:cargo-core-api-container", 
-        "version": "${cargo.core.version}"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jmock:jmock", 
-        "version": "1.0.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-vfs:commons-vfs", 
-        "version": "1.0"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-settings", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.4.7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.cargo/cargo-core-api-container", 
+      "requirement": "${cargo.core.version}", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jmock/jmock", 
+      "requirement": "1.0.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-vfs/commons-vfs", 
+      "requirement": "1.0", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-parent/4.2-SNAPSHOT/cargo-parent-4.2-20090219.165735-12.pom.json b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-parent/4.2-SNAPSHOT/cargo-parent-4.2-20090219.165735-12.pom.json
index 262784abd05..5664d94f989 100644
--- a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-parent/4.2-SNAPSHOT/cargo-parent-4.2-20090219.165735-12.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-parent/4.2-SNAPSHOT/cargo-parent-4.2-20090219.165735-12.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "cargo-parent", 
   "version": "4.2-SNAPSHOT", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Cargo", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-parent/4.2-SNAPSHOT/cargo-parent-4.2-20090219.165735-12.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-parent/4.2-SNAPSHOT/cargo-parent-4.2-20090219.165735-12.pom.package.json
index 938ea25cf2e..11f6158495c 100644
--- a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-parent/4.2-SNAPSHOT/cargo-parent-4.2-20090219.165735-12.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-parent/4.2-SNAPSHOT/cargo-parent-4.2-20090219.165735-12.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.cargo:cargo-parent", 
+  "type": "maven", 
+  "namespace": "org.codehaus.cargo", 
+  "name": "cargo-parent", 
   "version": "4.2-SNAPSHOT", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Cargo", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -243,9 +248,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-parent/4.2-SNAPSHOT/cargo-parent-4.2-SNAPSHOT.pom.json b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-parent/4.2-SNAPSHOT/cargo-parent-4.2-SNAPSHOT.pom.json
index 262784abd05..5664d94f989 100644
--- a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-parent/4.2-SNAPSHOT/cargo-parent-4.2-SNAPSHOT.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-parent/4.2-SNAPSHOT/cargo-parent-4.2-SNAPSHOT.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "cargo-parent", 
   "version": "4.2-SNAPSHOT", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Cargo", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-parent/4.2-SNAPSHOT/cargo-parent-4.2-SNAPSHOT.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-parent/4.2-SNAPSHOT/cargo-parent-4.2-SNAPSHOT.pom.package.json
index 938ea25cf2e..11f6158495c 100644
--- a/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-parent/4.2-SNAPSHOT/cargo-parent-4.2-SNAPSHOT.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/cargo/cargo-parent/4.2-SNAPSHOT/cargo-parent-4.2-SNAPSHOT.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.cargo:cargo-parent", 
+  "type": "maven", 
+  "namespace": "org.codehaus.cargo", 
+  "name": "cargo-parent", 
   "version": "4.2-SNAPSHOT", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Cargo", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -243,9 +248,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/aspectj-maven-plugin/1.0/aspectj-maven-plugin-1.0.pom.json b/tests/packagedcode/data/m2/org/codehaus/mojo/aspectj-maven-plugin/1.0/aspectj-maven-plugin-1.0.pom.json
index 624f1b99c3e..199f50ad5be 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/aspectj-maven-plugin/1.0/aspectj-maven-plugin-1.0.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/aspectj-maven-plugin/1.0/aspectj-maven-plugin-1.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "aspectj-maven-plugin", 
   "version": "1.0", 
   "classifier": null, 
-  "packaging ": "maven-plugin", 
+  "packaging": "maven-plugin", 
   "parent": {
     "group_id": "org.codehaus.mojo", 
     "artifact_id": "mojo", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/aspectj-maven-plugin/1.0/aspectj-maven-plugin-1.0.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/mojo/aspectj-maven-plugin/1.0/aspectj-maven-plugin-1.0.pom.package.json
index 4db34cf3aec..b539a338ae9 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/aspectj-maven-plugin/1.0/aspectj-maven-plugin-1.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/aspectj-maven-plugin/1.0/aspectj-maven-plugin-1.0.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.mojo:aspectj-maven-plugin", 
+  "type": "maven", 
+  "namespace": "org.codehaus.mojo", 
+  "name": "aspectj-maven-plugin", 
   "version": "1.0", 
+  "qualifiers": {
+    "packaging": "maven-plugin"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "AspectJ compiler Maven Plugin", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -33,59 +38,82 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The MIT License\nLICENSE.txt", 
   "license_expression": null, 
+  "asserted_license": "The MIT License\nLICENSE.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-embedder", 
-        "version": "2.0"
-      }
-    ], 
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.aspectj:aspectjrt", 
-        "version": "1.5.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.aspectj:aspectjtools", 
-        "version": "1.5.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.reporting:maven-reporting-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.reporting:maven-reporting-impl", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-embedder", 
+      "requirement": "2.0", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.aspectj/aspectjrt", 
+      "requirement": "1.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.aspectj/aspectjtools", 
+      "requirement": "1.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.reporting/maven-reporting-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.reporting/maven-reporting-impl", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/build-helper-maven-plugin/1.2-SNAPSHOT/build-helper-maven-plugin-1.2-20080813.143116-6.pom.json b/tests/packagedcode/data/m2/org/codehaus/mojo/build-helper-maven-plugin/1.2-SNAPSHOT/build-helper-maven-plugin-1.2-20080813.143116-6.pom.json
index 3956d416a50..bbfbc3fa15a 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/build-helper-maven-plugin/1.2-SNAPSHOT/build-helper-maven-plugin-1.2-20080813.143116-6.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/build-helper-maven-plugin/1.2-SNAPSHOT/build-helper-maven-plugin-1.2-20080813.143116-6.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "build-helper-maven-plugin", 
   "version": "1.2-SNAPSHOT", 
   "classifier": null, 
-  "packaging ": "maven-plugin", 
+  "packaging": "maven-plugin", 
   "parent": {
     "group_id": "org.codehaus.mojo", 
     "artifact_id": "mojo", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/build-helper-maven-plugin/1.2-SNAPSHOT/build-helper-maven-plugin-1.2-20080813.143116-6.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/mojo/build-helper-maven-plugin/1.2-SNAPSHOT/build-helper-maven-plugin-1.2-20080813.143116-6.pom.package.json
index f5c19b84805..5e066245a2e 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/build-helper-maven-plugin/1.2-SNAPSHOT/build-helper-maven-plugin-1.2-20080813.143116-6.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/build-helper-maven-plugin/1.2-SNAPSHOT/build-helper-maven-plugin-1.2-20080813.143116-6.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.mojo:build-helper-maven-plugin", 
+  "type": "maven", 
+  "namespace": "org.codehaus.mojo", 
+  "name": "build-helper-maven-plugin", 
   "version": "1.2-SNAPSHOT", 
+  "qualifiers": {
+    "packaging": "maven-plugin"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "This plugin contains various small independent goals to assist with Maven build lifecycle", 
+  "description": "Build Helper Maven Plugin\nThis plugin contains various small independent goals to assist with Maven build lifecycle", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,32 +31,42 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The MIT License\nhttp://www.opensource.org/licenses/mit-license.php", 
   "license_expression": null, 
+  "asserted_license": "The MIT License\nhttp://www.opensource.org/licenses/mit-license.php", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/build-helper-maven-plugin/1.2-SNAPSHOT/build-helper-maven-plugin-1.2-SNAPSHOT.pom.json b/tests/packagedcode/data/m2/org/codehaus/mojo/build-helper-maven-plugin/1.2-SNAPSHOT/build-helper-maven-plugin-1.2-SNAPSHOT.pom.json
index 3956d416a50..bbfbc3fa15a 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/build-helper-maven-plugin/1.2-SNAPSHOT/build-helper-maven-plugin-1.2-SNAPSHOT.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/build-helper-maven-plugin/1.2-SNAPSHOT/build-helper-maven-plugin-1.2-SNAPSHOT.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "build-helper-maven-plugin", 
   "version": "1.2-SNAPSHOT", 
   "classifier": null, 
-  "packaging ": "maven-plugin", 
+  "packaging": "maven-plugin", 
   "parent": {
     "group_id": "org.codehaus.mojo", 
     "artifact_id": "mojo", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/build-helper-maven-plugin/1.2-SNAPSHOT/build-helper-maven-plugin-1.2-SNAPSHOT.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/mojo/build-helper-maven-plugin/1.2-SNAPSHOT/build-helper-maven-plugin-1.2-SNAPSHOT.pom.package.json
index f5c19b84805..5e066245a2e 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/build-helper-maven-plugin/1.2-SNAPSHOT/build-helper-maven-plugin-1.2-SNAPSHOT.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/build-helper-maven-plugin/1.2-SNAPSHOT/build-helper-maven-plugin-1.2-SNAPSHOT.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.mojo:build-helper-maven-plugin", 
+  "type": "maven", 
+  "namespace": "org.codehaus.mojo", 
+  "name": "build-helper-maven-plugin", 
   "version": "1.2-SNAPSHOT", 
+  "qualifiers": {
+    "packaging": "maven-plugin"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "This plugin contains various small independent goals to assist with Maven build lifecycle", 
+  "description": "Build Helper Maven Plugin\nThis plugin contains various small independent goals to assist with Maven build lifecycle", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,32 +31,42 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The MIT License\nhttp://www.opensource.org/licenses/mit-license.php", 
   "license_expression": null, 
+  "asserted_license": "The MIT License\nhttp://www.opensource.org/licenses/mit-license.php", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/cobertura-maven-plugin/2.2/cobertura-maven-plugin-2.2.pom.json b/tests/packagedcode/data/m2/org/codehaus/mojo/cobertura-maven-plugin/2.2/cobertura-maven-plugin-2.2.pom.json
index 2019704a669..a8e6d81a612 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/cobertura-maven-plugin/2.2/cobertura-maven-plugin-2.2.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/cobertura-maven-plugin/2.2/cobertura-maven-plugin-2.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "cobertura-maven-plugin", 
   "version": "2.2", 
   "classifier": null, 
-  "packaging ": "maven-plugin", 
+  "packaging": "maven-plugin", 
   "parent": {
     "group_id": "org.codehaus.mojo", 
     "artifact_id": "mojo", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/cobertura-maven-plugin/2.2/cobertura-maven-plugin-2.2.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/mojo/cobertura-maven-plugin/2.2/cobertura-maven-plugin-2.2.pom.package.json
index 3ef0bd62be7..06b0e897f4d 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/cobertura-maven-plugin/2.2/cobertura-maven-plugin-2.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/cobertura-maven-plugin/2.2/cobertura-maven-plugin-2.2.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.mojo:cobertura-maven-plugin", 
+  "type": "maven", 
+  "namespace": "org.codehaus.mojo", 
+  "name": "cobertura-maven-plugin", 
   "version": "2.2", 
+  "qualifiers": {
+    "packaging": "maven-plugin"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Cobertura plugin for maven 2. Cobertura is a free Java tool that calculates the percentage of code accessed by\n    tests. It can be used to identify which parts of your Java program are lacking test coverage.", 
+  "description": "Cobertura Maven Plugin\nCobertura plugin for maven 2. Cobertura is a free Java tool that calculates the percentage of code accessed by\n    tests. It can be used to identify which parts of your Java program are lacking test coverage.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -40,79 +45,114 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "net.sourceforge.cobertura:cobertura", 
-        "version": "1.9"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "net.sourceforge.cobertura:cobertura-runtime", 
-        "version": "1.9"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "urbanophile:java-getopt", 
-        "version": "1.0.9"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.reporting:maven-reporting-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.reporting:maven-reporting-impl", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-9"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.1"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "httpunit:httpunit", 
-        "version": "1.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-plugin-testing-harness", 
-        "version": "1.0-beta-1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:net.sourceforge.cobertura/cobertura", 
+      "requirement": "1.9", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:net.sourceforge.cobertura/cobertura-runtime", 
+      "requirement": "1.9", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:urbanophile/java-getopt", 
+      "requirement": "1.0.9", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.reporting/maven-reporting-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.reporting/maven-reporting-impl", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-9", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:httpunit/httpunit", 
+      "requirement": "1.6", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-plugin-testing-harness", 
+      "requirement": "1.0-beta-1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/findbugs-maven-plugin/1.1.1/findbugs-maven-plugin-1.1.1.pom.json b/tests/packagedcode/data/m2/org/codehaus/mojo/findbugs-maven-plugin/1.1.1/findbugs-maven-plugin-1.1.1.pom.json
index 54488ab370b..8ebf8245a4f 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/findbugs-maven-plugin/1.1.1/findbugs-maven-plugin-1.1.1.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/findbugs-maven-plugin/1.1.1/findbugs-maven-plugin-1.1.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "findbugs-maven-plugin", 
   "version": "1.1.1", 
   "classifier": null, 
-  "packaging ": "maven-plugin", 
+  "packaging": "maven-plugin", 
   "parent": {
     "group_id": "org.codehaus.mojo", 
     "artifact_id": "mojo", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/findbugs-maven-plugin/1.1.1/findbugs-maven-plugin-1.1.1.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/mojo/findbugs-maven-plugin/1.1.1/findbugs-maven-plugin-1.1.1.pom.package.json
index 30389cbdc2a..599bf3a2f15 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/findbugs-maven-plugin/1.1.1/findbugs-maven-plugin-1.1.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/findbugs-maven-plugin/1.1.1/findbugs-maven-plugin-1.1.1.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.mojo:findbugs-maven-plugin", 
+  "type": "maven", 
+  "namespace": "org.codehaus.mojo", 
+  "name": "findbugs-maven-plugin", 
   "version": "1.1.1", 
+  "qualifiers": {
+    "packaging": "maven-plugin"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "This Plug-In generates reports based on the FindBugs Library", 
+  "description": "Maven FindBugs PlugIn\nThis Plug-In generates reports based on the FindBugs Library", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -47,37 +52,50 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "MIT\nLICENSE.txt", 
   "license_expression": null, 
+  "asserted_license": "MIT\nLICENSE.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.reporting:maven-reporting-impl", 
-        "version": "2.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.reporting:maven-reporting-api", 
-        "version": "2.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.doxia:doxia-core", 
-        "version": "1.0-alpha-8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "net.sourceforge.findbugs:findbugs", 
-        "version": "1.2.0"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.reporting/maven-reporting-impl", 
+      "requirement": "2.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.reporting/maven-reporting-api", 
+      "requirement": "2.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.doxia/doxia-core", 
+      "requirement": "1.0-alpha-8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:net.sourceforge.findbugs/findbugs", 
+      "requirement": "1.2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/maven-buildnumber-plugin/0.9.6/maven-buildnumber-plugin-0.9.6.pom.json b/tests/packagedcode/data/m2/org/codehaus/mojo/maven-buildnumber-plugin/0.9.6/maven-buildnumber-plugin-0.9.6.pom.json
index f8a4fb950e6..77601759db8 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/maven-buildnumber-plugin/0.9.6/maven-buildnumber-plugin-0.9.6.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/maven-buildnumber-plugin/0.9.6/maven-buildnumber-plugin-0.9.6.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-buildnumber-plugin", 
   "version": "0.9.6", 
   "classifier": null, 
-  "packaging ": "maven-plugin", 
+  "packaging": "maven-plugin", 
   "parent": {}, 
   "name": "Maven Build Number Plugin", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/maven-buildnumber-plugin/0.9.6/maven-buildnumber-plugin-0.9.6.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/mojo/maven-buildnumber-plugin/0.9.6/maven-buildnumber-plugin-0.9.6.pom.package.json
index fb4254283e0..f1104848c52 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/maven-buildnumber-plugin/0.9.6/maven-buildnumber-plugin-0.9.6.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/maven-buildnumber-plugin/0.9.6/maven-buildnumber-plugin-0.9.6.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.mojo:maven-buildnumber-plugin", 
+  "type": "maven", 
+  "namespace": "org.codehaus.mojo", 
+  "name": "maven-buildnumber-plugin", 
   "version": "0.9.6", 
+  "qualifiers": {
+    "packaging": "maven-plugin"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Build Number Plugin", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,62 +31,90 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The MIT License\nhttp://commons.ucalgary.ca/projects/licenses/mit-license.txt", 
   "license_expression": null, 
+  "asserted_license": "The MIT License\nhttp://commons.ucalgary.ca/projects/licenses/mit-license.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-settings", 
-        "version": "2.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.scm:maven-scm-api", 
-        "version": "1.0-beta-3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.scm:maven-scm-manager-plexus", 
-        "version": "1.0-beta-3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.scm:maven-scm-provider-svnexe", 
-        "version": "1.0-beta-3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.scm:maven-scm-provider-cvsexe", 
-        "version": "1.0-beta-3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.scm:maven-scm-provider-starteam", 
-        "version": "1.0-beta-3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.scm:maven-scm-provider-clearcase", 
-        "version": "1.0-beta-3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.scm:maven-scm-provider-perforce", 
-        "version": "1.0-beta-3"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-settings", 
+      "requirement": "2.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.scm/maven-scm-api", 
+      "requirement": "1.0-beta-3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.scm/maven-scm-manager-plexus", 
+      "requirement": "1.0-beta-3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.scm/maven-scm-provider-svnexe", 
+      "requirement": "1.0-beta-3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.scm/maven-scm-provider-cvsexe", 
+      "requirement": "1.0-beta-3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.scm/maven-scm-provider-starteam", 
+      "requirement": "1.0-beta-3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.scm/maven-scm-provider-clearcase", 
+      "requirement": "1.0-beta-3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.scm/maven-scm-provider-perforce", 
+      "requirement": "1.0-beta-3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/mojo-sandbox/2/mojo-sandbox-2.pom.json b/tests/packagedcode/data/m2/org/codehaus/mojo/mojo-sandbox/2/mojo-sandbox-2.pom.json
index 2f8d491931f..5d5900f8630 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/mojo-sandbox/2/mojo-sandbox-2.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/mojo-sandbox/2/mojo-sandbox-2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "mojo-sandbox", 
   "version": "2", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.codehaus.mojo", 
     "artifact_id": "mojo", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/mojo-sandbox/2/mojo-sandbox-2.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/mojo/mojo-sandbox/2/mojo-sandbox-2.pom.package.json
index 68af9ca7af6..4acbcf37334 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/mojo-sandbox/2/mojo-sandbox-2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/mojo-sandbox/2/mojo-sandbox-2.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.mojo:mojo-sandbox", 
+  "type": "maven", 
+  "namespace": "org.codehaus.mojo", 
+  "name": "mojo-sandbox", 
   "version": "2", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Codehaus Mojo Sandbox Parent", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/11/mojo-11.pom.json b/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/11/mojo-11.pom.json
index 8ce1ca8d518..d5816261098 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/11/mojo-11.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/11/mojo-11.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "mojo", 
   "version": "11", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Codehaus Mojo", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/11/mojo-11.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/11/mojo-11.pom.package.json
index 2c43cb25df9..bf8bf120228 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/11/mojo-11.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/11/mojo-11.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.mojo:mojo", 
+  "type": "maven", 
+  "namespace": "org.codehaus.mojo", 
+  "name": "mojo", 
   "version": "11", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Codehaus Mojo", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,24 +23,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/12/mojo-12.pom.json b/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/12/mojo-12.pom.json
index 714cc3dad55..7ffd17be70c 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/12/mojo-12.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/12/mojo-12.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "mojo", 
   "version": "12", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Codehaus Mojo", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/12/mojo-12.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/12/mojo-12.pom.package.json
index e6a73e00e50..32e24dfc320 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/12/mojo-12.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/12/mojo-12.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.mojo:mojo", 
+  "type": "maven", 
+  "namespace": "org.codehaus.mojo", 
+  "name": "mojo", 
   "version": "12", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Codehaus Mojo", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,24 +23,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/14/mojo-14.pom.json b/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/14/mojo-14.pom.json
index f4017717c5f..c9b51ad2f56 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/14/mojo-14.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/14/mojo-14.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "mojo", 
   "version": "14", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Codehaus Mojo", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/14/mojo-14.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/14/mojo-14.pom.package.json
index 7dd160b8edc..cd634b206b0 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/14/mojo-14.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/14/mojo-14.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.mojo:mojo", 
+  "type": "maven", 
+  "namespace": "org.codehaus.mojo", 
+  "name": "mojo", 
   "version": "14", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Codehaus Mojo", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,9 +31,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/16/mojo-16.pom.json b/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/16/mojo-16.pom.json
index 4cda0ee2951..b8b6e3a5f45 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/16/mojo-16.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/16/mojo-16.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "mojo", 
   "version": "16", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Codehaus Mojo", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/16/mojo-16.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/16/mojo-16.pom.package.json
index 5b6510a1f83..525b98e8318 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/16/mojo-16.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/16/mojo-16.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.mojo:mojo", 
+  "type": "maven", 
+  "namespace": "org.codehaus.mojo", 
+  "name": "mojo", 
   "version": "16", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Codehaus Mojo", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,9 +31,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/17/mojo-17.pom.json b/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/17/mojo-17.pom.json
index 82d6ac16bc4..b9355c89f29 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/17/mojo-17.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/17/mojo-17.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "mojo", 
   "version": "17", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Codehaus Mojo", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/17/mojo-17.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/17/mojo-17.pom.package.json
index d18b0f06282..fe9f9c7445a 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/17/mojo-17.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/mojo/17/mojo-17.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.mojo:mojo", 
+  "type": "maven", 
+  "namespace": "org.codehaus.mojo", 
+  "name": "mojo", 
   "version": "17", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Codehaus Mojo", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,9 +31,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/native-maven-plugin/1.0-alpha-2/native-maven-plugin-1.0-alpha-2.pom.json b/tests/packagedcode/data/m2/org/codehaus/mojo/native-maven-plugin/1.0-alpha-2/native-maven-plugin-1.0-alpha-2.pom.json
index dffcef71020..15c25321bc8 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/native-maven-plugin/1.0-alpha-2/native-maven-plugin-1.0-alpha-2.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/native-maven-plugin/1.0-alpha-2/native-maven-plugin-1.0-alpha-2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "native-maven-plugin", 
   "version": "1.0-alpha-2", 
   "classifier": null, 
-  "packaging ": "maven-plugin", 
+  "packaging": "maven-plugin", 
   "parent": {
     "group_id": "org.codehaus.mojo.natives", 
     "artifact_id": "maven-native", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/native-maven-plugin/1.0-alpha-2/native-maven-plugin-1.0-alpha-2.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/mojo/native-maven-plugin/1.0-alpha-2/native-maven-plugin-1.0-alpha-2.pom.package.json
index e18b0447805..f87c8bda9c6 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/native-maven-plugin/1.0-alpha-2/native-maven-plugin-1.0-alpha-2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/native-maven-plugin/1.0-alpha-2/native-maven-plugin-1.0-alpha-2.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.mojo:native-maven-plugin", 
+  "type": "maven", 
+  "namespace": "org.codehaus.mojo", 
+  "name": "native-maven-plugin", 
   "version": "1.0-alpha-2", 
+  "qualifiers": {
+    "packaging": "maven-plugin"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Native Plugin", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,59 +23,82 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.mojo.natives:maven-native-api", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.mojo.natives:maven-native-javah", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.mojo.natives:maven-native-generic-c", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.mojo.natives:maven-native-msvc", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.mojo.natives:maven-native-bcc", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.mojo.natives:maven-native-manager", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.shared:maven-plugin-testing-harness", 
-        "version": "1.0-beta-1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.mojo.natives/maven-native-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.mojo.natives/maven-native-javah", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.mojo.natives/maven-native-generic-c", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.mojo.natives/maven-native-msvc", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.mojo.natives/maven-native-bcc", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.mojo.natives/maven-native-manager", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.shared/maven-plugin-testing-harness", 
+      "requirement": "1.0-beta-1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-api/1.0-alpha-2/maven-native-api-1.0-alpha-2.pom.json b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-api/1.0-alpha-2/maven-native-api-1.0-alpha-2.pom.json
index be84188a686..52f41f83d6c 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-api/1.0-alpha-2/maven-native-api-1.0-alpha-2.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-api/1.0-alpha-2/maven-native-api-1.0-alpha-2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-native-api", 
   "version": "1.0-alpha-2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.mojo.natives", 
     "artifact_id": "maven-native", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-api/1.0-alpha-2/maven-native-api-1.0-alpha-2.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-api/1.0-alpha-2/maven-native-api-1.0-alpha-2.pom.package.json
index c35eba99a79..eea848a2c83 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-api/1.0-alpha-2/maven-native-api-1.0-alpha-2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-api/1.0-alpha-2/maven-native-api-1.0-alpha-2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.mojo.natives:maven-native-api", 
+  "type": "maven", 
+  "namespace": "org.codehaus.mojo.natives", 
+  "name": "maven-native-api", 
   "version": "1.0-alpha-2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Native API", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,27 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "bcel:bcel", 
-        "version": "5.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:bcel/bcel", 
+      "requirement": "5.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-bcc/1.0-alpha-2/maven-native-bcc-1.0-alpha-2.pom.json b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-bcc/1.0-alpha-2/maven-native-bcc-1.0-alpha-2.pom.json
index a76a70814c2..f8771d80790 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-bcc/1.0-alpha-2/maven-native-bcc-1.0-alpha-2.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-bcc/1.0-alpha-2/maven-native-bcc-1.0-alpha-2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-native-bcc", 
   "version": "1.0-alpha-2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.mojo.natives", 
     "artifact_id": "maven-native-components", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-bcc/1.0-alpha-2/maven-native-bcc-1.0-alpha-2.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-bcc/1.0-alpha-2/maven-native-bcc-1.0-alpha-2.pom.package.json
index a66aa33c2f5..2b76dee9d32 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-bcc/1.0-alpha-2/maven-native-bcc-1.0-alpha-2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-bcc/1.0-alpha-2/maven-native-bcc-1.0-alpha-2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.mojo.natives:maven-native-bcc", 
+  "type": "maven", 
+  "namespace": "org.codehaus.mojo.natives", 
+  "name": "maven-native-bcc", 
   "version": "1.0-alpha-2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Native BCC", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.mojo.natives:maven-native-generic-c", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.mojo.natives/maven-native-generic-c", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-components/1.0-alpha-2/maven-native-components-1.0-alpha-2.pom.json b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-components/1.0-alpha-2/maven-native-components-1.0-alpha-2.pom.json
index 0117973330e..77b15c212b1 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-components/1.0-alpha-2/maven-native-components-1.0-alpha-2.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-components/1.0-alpha-2/maven-native-components-1.0-alpha-2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-native-components", 
   "version": "1.0-alpha-2", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.codehaus.mojo.natives", 
     "artifact_id": "maven-native", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-components/1.0-alpha-2/maven-native-components-1.0-alpha-2.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-components/1.0-alpha-2/maven-native-components-1.0-alpha-2.pom.package.json
index 5f8b5d5629e..c5cea4d57e1 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-components/1.0-alpha-2/maven-native-components-1.0-alpha-2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-components/1.0-alpha-2/maven-native-components-1.0-alpha-2.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.mojo.natives:maven-native-components", 
+  "type": "maven", 
+  "namespace": "org.codehaus.mojo.natives", 
+  "name": "maven-native-components", 
   "version": "1.0-alpha-2", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Native Components", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,27 +23,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.mojo.natives:maven-native-api", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.mojo.natives/maven-native-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-generic-c/1.0-alpha-2/maven-native-generic-c-1.0-alpha-2.pom.json b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-generic-c/1.0-alpha-2/maven-native-generic-c-1.0-alpha-2.pom.json
index a3ef0519c88..3cd9adcaf2b 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-generic-c/1.0-alpha-2/maven-native-generic-c-1.0-alpha-2.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-generic-c/1.0-alpha-2/maven-native-generic-c-1.0-alpha-2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-native-generic-c", 
   "version": "1.0-alpha-2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.mojo.natives", 
     "artifact_id": "maven-native-components", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-generic-c/1.0-alpha-2/maven-native-generic-c-1.0-alpha-2.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-generic-c/1.0-alpha-2/maven-native-generic-c-1.0-alpha-2.pom.package.json
index 202eab30dbb..8aa53e19db1 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-generic-c/1.0-alpha-2/maven-native-generic-c-1.0-alpha-2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-generic-c/1.0-alpha-2/maven-native-generic-c-1.0-alpha-2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.mojo.natives:maven-native-generic-c", 
+  "type": "maven", 
+  "namespace": "org.codehaus.mojo.natives", 
+  "name": "maven-native-generic-c", 
   "version": "1.0-alpha-2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Native C/C++", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-javah/1.0-alpha-2/maven-native-javah-1.0-alpha-2.pom.json b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-javah/1.0-alpha-2/maven-native-javah-1.0-alpha-2.pom.json
index 384cfce7c79..01d19c95d39 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-javah/1.0-alpha-2/maven-native-javah-1.0-alpha-2.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-javah/1.0-alpha-2/maven-native-javah-1.0-alpha-2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-native-javah", 
   "version": "1.0-alpha-2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.mojo.natives", 
     "artifact_id": "maven-native-components", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-javah/1.0-alpha-2/maven-native-javah-1.0-alpha-2.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-javah/1.0-alpha-2/maven-native-javah-1.0-alpha-2.pom.package.json
index 476844109d0..db1cf71bee9 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-javah/1.0-alpha-2/maven-native-javah-1.0-alpha-2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-javah/1.0-alpha-2/maven-native-javah-1.0-alpha-2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.mojo.natives:maven-native-javah", 
+  "type": "maven", 
+  "namespace": "org.codehaus.mojo.natives", 
+  "name": "maven-native-javah", 
   "version": "1.0-alpha-2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Native Javah", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-manager/1.0-alpha-2/maven-native-manager-1.0-alpha-2.pom.json b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-manager/1.0-alpha-2/maven-native-manager-1.0-alpha-2.pom.json
index 6c0153a3eaa..8e625c13e0c 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-manager/1.0-alpha-2/maven-native-manager-1.0-alpha-2.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-manager/1.0-alpha-2/maven-native-manager-1.0-alpha-2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-native-manager", 
   "version": "1.0-alpha-2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.mojo.natives", 
     "artifact_id": "maven-native-components", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-manager/1.0-alpha-2/maven-native-manager-1.0-alpha-2.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-manager/1.0-alpha-2/maven-native-manager-1.0-alpha-2.pom.package.json
index d781d36c6d6..8adb93490cc 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-manager/1.0-alpha-2/maven-native-manager-1.0-alpha-2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-manager/1.0-alpha-2/maven-native-manager-1.0-alpha-2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.mojo.natives:maven-native-manager", 
+  "type": "maven", 
+  "namespace": "org.codehaus.mojo.natives", 
+  "name": "maven-native-manager", 
   "version": "1.0-alpha-2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Native Components Manager", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-msvc/1.0-alpha-2/maven-native-msvc-1.0-alpha-2.pom.json b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-msvc/1.0-alpha-2/maven-native-msvc-1.0-alpha-2.pom.json
index ab6baed98da..e0ce84518b7 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-msvc/1.0-alpha-2/maven-native-msvc-1.0-alpha-2.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-msvc/1.0-alpha-2/maven-native-msvc-1.0-alpha-2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-native-msvc", 
   "version": "1.0-alpha-2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.mojo.natives", 
     "artifact_id": "maven-native-components", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-msvc/1.0-alpha-2/maven-native-msvc-1.0-alpha-2.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-msvc/1.0-alpha-2/maven-native-msvc-1.0-alpha-2.pom.package.json
index 2437a57a991..225219393c0 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-msvc/1.0-alpha-2/maven-native-msvc-1.0-alpha-2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native-msvc/1.0-alpha-2/maven-native-msvc-1.0-alpha-2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.mojo.natives:maven-native-msvc", 
+  "type": "maven", 
+  "namespace": "org.codehaus.mojo.natives", 
+  "name": "maven-native-msvc", 
   "version": "1.0-alpha-2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Native MSVC", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.mojo.natives:maven-native-generic-c", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.mojo.natives/maven-native-generic-c", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native/1.0-alpha-2/maven-native-1.0-alpha-2.pom.json b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native/1.0-alpha-2/maven-native-1.0-alpha-2.pom.json
index 1ffbaf5556b..2a1b5fe4bec 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native/1.0-alpha-2/maven-native-1.0-alpha-2.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native/1.0-alpha-2/maven-native-1.0-alpha-2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-native", 
   "version": "1.0-alpha-2", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.codehaus.mojo", 
     "artifact_id": "mojo", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native/1.0-alpha-2/maven-native-1.0-alpha-2.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native/1.0-alpha-2/maven-native-1.0-alpha-2.pom.package.json
index ee446e9e93b..5bbe09a4196 100644
--- a/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native/1.0-alpha-2/maven-native-1.0-alpha-2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/mojo/natives/maven-native/1.0-alpha-2/maven-native-1.0-alpha-2.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.mojo.natives:maven-native", 
+  "type": "maven", 
+  "namespace": "org.codehaus.mojo.natives", 
+  "name": "maven-native", 
   "version": "1.0-alpha-2", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Native", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,9 +31,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-active-collections/1.0-beta-2/plexus-active-collections-1.0-beta-2.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-active-collections/1.0-beta-2/plexus-active-collections-1.0-beta-2.pom.json
index 1ad3fd9b3f7..1508708734d 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-active-collections/1.0-beta-2/plexus-active-collections-1.0-beta-2.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-active-collections/1.0-beta-2/plexus-active-collections-1.0-beta-2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-active-collections", 
   "version": "1.0-beta-2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus-components", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-active-collections/1.0-beta-2/plexus-active-collections-1.0-beta-2.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-active-collections/1.0-beta-2/plexus-active-collections-1.0-beta-2.pom.package.json
index c8430158db6..b5045b31062 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-active-collections/1.0-beta-2/plexus-active-collections-1.0-beta-2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-active-collections/1.0-beta-2/plexus-active-collections-1.0-beta-2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-active-collections", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-active-collections", 
   "version": "1.0-beta-2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Container-Backed Active Collections", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,31 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-22"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-component-api", 
-        "version": "1.0-alpha-22"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-component-api", 
+      "requirement": "1.0-alpha-22", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-22", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-10/plexus-archiver-1.0-alpha-10.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-10/plexus-archiver-1.0-alpha-10.pom.json
index d21688acd57..412090b6262 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-10/plexus-archiver-1.0-alpha-10.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-10/plexus-archiver-1.0-alpha-10.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-archiver", 
   "version": "1.0-alpha-10", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus-components", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-10/plexus-archiver-1.0-alpha-10.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-10/plexus-archiver-1.0-alpha-10.pom.package.json
index 1db16f3bb74..0a5f0e7f00a 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-10/plexus-archiver-1.0-alpha-10.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-10/plexus-archiver-1.0-alpha-10.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-archiver", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-archiver", 
   "version": "1.0-alpha-10", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Archiver Component", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -33,32 +36,42 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.5.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-15"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-component-api", 
-        "version": "1.0-alpha-15"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-io", 
-        "version": "1.0-alpha-2"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.5.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-15", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-component-api", 
+      "requirement": "1.0-alpha-15", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-io", 
+      "requirement": "1.0-alpha-2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-5/plexus-archiver-1.0-alpha-5.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-5/plexus-archiver-1.0-alpha-5.pom.json
index 7ff36ef8a65..69e6e1a4e0c 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-5/plexus-archiver-1.0-alpha-5.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-5/plexus-archiver-1.0-alpha-5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-archiver", 
   "version": "1.0-alpha-5", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus-components", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-5/plexus-archiver-1.0-alpha-5.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-5/plexus-archiver-1.0-alpha-5.pom.package.json
index a0e8fa77f1a..25fb617dfef 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-5/plexus-archiver-1.0-alpha-5.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-5/plexus-archiver-1.0-alpha-5.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-archiver", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-archiver", 
   "version": "1.0-alpha-5", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Archiver Component", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom.json
index 0e803018feb..f84b203f284 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-archiver", 
   "version": "1.0-alpha-7", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus-components", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom.package.json
index 77a9e10c8e3..f8008960f4f 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-7/plexus-archiver-1.0-alpha-7.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-archiver", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-archiver", 
   "version": "1.0-alpha-7", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Archiver Component", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -33,17 +36,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.2"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom.json
index 2411331b28d..cd915b5b807 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-archiver", 
   "version": "1.0-alpha-9", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus-components", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom.package.json
index 5f9ce3e6329..dffadf86a91 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-archiver", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-archiver", 
   "version": "1.0-alpha-9", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Archiver Component", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -33,32 +36,42 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.4.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-15"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-component-api", 
-        "version": "1.0-alpha-15"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-io", 
-        "version": "1.0-alpha-1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.4.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-15", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-component-api", 
+      "requirement": "1.0-alpha-15", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-io", 
+      "requirement": "1.0-alpha-1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom.json
index 487ea3adc50..c4d463c59de 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-classworlds", 
   "version": "1.2-alpha-6", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom.package.json
index 0b15b7b9ed7..2c6ae4929e2 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-classworlds/1.2-alpha-6/plexus-classworlds-1.2-alpha-6.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-classworlds", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-classworlds", 
   "version": "1.2-alpha-6", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Classworlds", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-api/1.5.1/plexus-compiler-api-1.5.1.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-api/1.5.1/plexus-compiler-api-1.5.1.pom.json
index 5347fe28857..0faff5ff1c2 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-api/1.5.1/plexus-compiler-api-1.5.1.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-api/1.5.1/plexus-compiler-api-1.5.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-compiler-api", 
   "version": "1.5.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Plexus Compiler Api", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-api/1.5.1/plexus-compiler-api-1.5.1.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-api/1.5.1/plexus-compiler-api-1.5.1.pom.package.json
index 52b49fad6e2..3205c1ab0c5 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-api/1.5.1/plexus-compiler-api-1.5.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-api/1.5.1/plexus-compiler-api-1.5.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-compiler-api", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-compiler-api", 
   "version": "1.5.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Compiler Api", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -103,34 +106,42 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "classworlds:classworlds", 
-        "version": "1.1-alpha-2"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:classworlds/classworlds", 
+      "requirement": "1.1-alpha-2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-api/1.5.3/plexus-compiler-api-1.5.3.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-api/1.5.3/plexus-compiler-api-1.5.3.pom.json
index 1176d208d57..46f89e54787 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-api/1.5.3/plexus-compiler-api-1.5.3.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-api/1.5.3/plexus-compiler-api-1.5.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-compiler-api", 
   "version": "1.5.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus-compiler", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-api/1.5.3/plexus-compiler-api-1.5.3.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-api/1.5.3/plexus-compiler-api-1.5.3.pom.package.json
index ebbc12be40c..5151e6fd8cd 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-api/1.5.3/plexus-compiler-api-1.5.3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-api/1.5.3/plexus-compiler-api-1.5.3.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-compiler-api", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-compiler-api", 
   "version": "1.5.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Compiler Api", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-javac/1.5.3/plexus-compiler-javac-1.5.3.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-javac/1.5.3/plexus-compiler-javac-1.5.3.pom.json
index bb76b91c110..3330f714fa0 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-javac/1.5.3/plexus-compiler-javac-1.5.3.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-javac/1.5.3/plexus-compiler-javac-1.5.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-compiler-javac", 
   "version": "1.5.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus-compilers", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-javac/1.5.3/plexus-compiler-javac-1.5.3.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-javac/1.5.3/plexus-compiler-javac-1.5.3.pom.package.json
index cecf5da8c62..69567b9c25a 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-javac/1.5.3/plexus-compiler-javac-1.5.3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-javac/1.5.3/plexus-compiler-javac-1.5.3.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-compiler-javac", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-compiler-javac", 
   "version": "1.5.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Javac Component", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,24 +21,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.0.5"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-lang:commons-lang", 
-        "version": "2.0"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.0.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-lang/commons-lang", 
+      "requirement": "2.0", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-manager/1.5.3/plexus-compiler-manager-1.5.3.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-manager/1.5.3/plexus-compiler-manager-1.5.3.pom.json
index 1ed02f4cf6f..53ab7fd9b4c 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-manager/1.5.3/plexus-compiler-manager-1.5.3.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-manager/1.5.3/plexus-compiler-manager-1.5.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-compiler-manager", 
   "version": "1.5.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus-compiler", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-manager/1.5.3/plexus-compiler-manager-1.5.3.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-manager/1.5.3/plexus-compiler-manager-1.5.3.pom.package.json
index 68741eac8c9..4547c221cae 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-manager/1.5.3/plexus-compiler-manager-1.5.3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler-manager/1.5.3/plexus-compiler-manager-1.5.3.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-compiler-manager", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-compiler-manager", 
   "version": "1.5.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Compiler Manager", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-compiler-api", 
-        "version": "1.5.3"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-compiler-api", 
+      "requirement": "1.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler/1.5.3/plexus-compiler-1.5.3.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler/1.5.3/plexus-compiler-1.5.3.pom.json
index 95537a963d1..0ed8d3e5b26 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler/1.5.3/plexus-compiler-1.5.3.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler/1.5.3/plexus-compiler-1.5.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-compiler", 
   "version": "1.5.3", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus-components", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler/1.5.3/plexus-compiler-1.5.3.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler/1.5.3/plexus-compiler-1.5.3.pom.package.json
index bf92c155dc2..bb0a8861ae4 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler/1.5.3/plexus-compiler-1.5.3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compiler/1.5.3/plexus-compiler-1.5.3.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-compiler", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-compiler", 
   "version": "1.5.3", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Compiler Parent", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compilers/1.5.3/plexus-compilers-1.5.3.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compilers/1.5.3/plexus-compilers-1.5.3.pom.json
index 52aa9ed87d5..00632e5224f 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compilers/1.5.3/plexus-compilers-1.5.3.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compilers/1.5.3/plexus-compilers-1.5.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-compilers", 
   "version": "1.5.3", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus-compiler", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compilers/1.5.3/plexus-compilers-1.5.3.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compilers/1.5.3/plexus-compilers-1.5.3.pom.package.json
index 76b697599dd..7f2a84e3034 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compilers/1.5.3/plexus-compilers-1.5.3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-compilers/1.5.3/plexus-compilers-1.5.3.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-compilers", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-compilers", 
   "version": "1.5.3", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Compilers Parent", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -103,34 +108,42 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-compiler-test", 
-        "version": "1.5.3"
-      }
-    ], 
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-compiler-api", 
-        "version": "1.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-8"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-compiler-test", 
+      "requirement": "1.5.3", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-compiler-api", 
+      "requirement": "1.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom.json
index 433228c687a..976e6de38fc 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-component-api", 
   "version": "1.0-alpha-15", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus-containers", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom.package.json
index e055522df2d..d1fb3dfb464 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-component-api/1.0-alpha-15/plexus-component-api-1.0-alpha-15.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-component-api", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-component-api", 
   "version": "1.0-alpha-15", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Component API", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-classworlds", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-classworlds", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.json
index cc8fcaff226..ce9262c0706 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-component-api", 
   "version": "1.0-alpha-16", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus-containers", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.package.json
index a91803bc9e0..fe61109d263 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-component-api/1.0-alpha-16/plexus-component-api-1.0-alpha-16.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-component-api", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-component-api", 
   "version": "1.0-alpha-16", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Component API", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-classworlds", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-classworlds", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom.json
index 68de2f64525..fd6d0cb2bad 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-components", 
   "version": "1.1.12", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom.package.json
index 0553161c28b..fc535cbfee6 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-components", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-components", 
   "version": "1.1.12", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Components Parent Project", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,24 +23,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-component-api", 
-        "version": "1.0-alpha-20"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-20"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-component-api", 
+      "requirement": "1.0-alpha-20", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-20", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.4/plexus-components-1.1.4.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.4/plexus-components-1.1.4.pom.json
index 9ae4f91d180..9e64264428a 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.4/plexus-components-1.1.4.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.4/plexus-components-1.1.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-components", 
   "version": "1.1.4", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.4/plexus-components-1.1.4.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.4/plexus-components-1.1.4.pom.package.json
index 990679a8906..d0b56c8a035 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.4/plexus-components-1.1.4.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.4/plexus-components-1.1.4.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-components", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-components", 
   "version": "1.1.4", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Components Parent Project", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +23,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-8"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.5/plexus-components-1.1.5.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.5/plexus-components-1.1.5.pom.json
index 3fb37bc6753..0f2c1c1e8c7 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.5/plexus-components-1.1.5.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.5/plexus-components-1.1.5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-components", 
   "version": "1.1.5", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.5/plexus-components-1.1.5.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.5/plexus-components-1.1.5.pom.package.json
index 2979937de9e..e6e03cd4eaa 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.5/plexus-components-1.1.5.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.5/plexus-components-1.1.5.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-components", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-components", 
   "version": "1.1.5", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Components Parent Project", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +23,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-8"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.json
index 8fec5d495c0..4b45186ce41 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-components", 
   "version": "1.1.6", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.package.json
index 5c62ee912e5..b69d7a43568 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-components", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-components", 
   "version": "1.1.6", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Components Parent Project", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +23,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-8"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.7/plexus-components-1.1.7.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.7/plexus-components-1.1.7.pom.json
index 6bdde135299..65da50592e5 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.7/plexus-components-1.1.7.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.7/plexus-components-1.1.7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-components", 
   "version": "1.1.7", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.7/plexus-components-1.1.7.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.7/plexus-components-1.1.7.pom.package.json
index 97e3b5c1e8f..b7eb0b9810e 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.7/plexus-components-1.1.7.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.7/plexus-components-1.1.7.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-components", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-components", 
   "version": "1.1.7", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Components Parent Project", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +23,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-8"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom.json
index bed3b7b0a1c..f3715edbbca 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-components", 
   "version": "1.1.9", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom.package.json
index 22eda538054..b6b3a64ef4b 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-components/1.1.9/plexus-components-1.1.9.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-components", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-components", 
   "version": "1.1.9", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Components Parent Project", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,24 +23,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-component-api", 
-        "version": "1.0-alpha-16"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-16"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-component-api", 
+      "requirement": "1.0-alpha-16", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-16", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom.json
index 3fda6cbde07..c586f8b48ad 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-container-default", 
   "version": "1.0-alpha-15", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus-containers", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom.package.json
index c2f0d4e2746..28ac1ca891c 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-15/plexus-container-default-1.0-alpha-15.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-container-default", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-container-default", 
   "version": "1.0-alpha-15", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Default Plexus Container", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,34 +21,42 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-component-api", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-classworlds", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "jmock:jmock", 
-        "version": "1.0.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-component-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-classworlds", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jmock/jmock", 
+      "requirement": "1.0.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-22/plexus-container-default-1.0-alpha-22.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-22/plexus-container-default-1.0-alpha-22.pom.json
index be865dd4f88..d5e5aae7951 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-22/plexus-container-default-1.0-alpha-22.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-22/plexus-container-default-1.0-alpha-22.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-container-default", 
   "version": "1.0-alpha-22", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus-containers", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-22/plexus-container-default-1.0-alpha-22.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-22/plexus-container-default-1.0-alpha-22.pom.package.json
index e5dec583a43..df7c8f687bf 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-22/plexus-container-default-1.0-alpha-22.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-22/plexus-container-default-1.0-alpha-22.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-container-default", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-container-default", 
   "version": "1.0-alpha-22", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Default Plexus Container", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,34 +21,42 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-component-api", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-classworlds", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "jmock:jmock", 
-        "version": "1.0.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-component-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-classworlds", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jmock/jmock", 
+      "requirement": "1.0.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom.json
index 6255aea75d4..cf71c6f3884 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-container-default", 
   "version": "1.0-alpha-30", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus-containers", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom.package.json
index 8d34ce56f2c..b0221c574c3 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-container-default", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-container-default", 
   "version": "1.0-alpha-30", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Default Plexus Container", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,29 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-classworlds", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "jmock:jmock", 
-        "version": "1.0.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-classworlds", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jmock/jmock", 
+      "requirement": "1.0.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-7/plexus-container-default-1.0-alpha-7.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-7/plexus-container-default-1.0-alpha-7.pom.json
index d40c24deea8..6994e4ac1c8 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-7/plexus-container-default-1.0-alpha-7.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-7/plexus-container-default-1.0-alpha-7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-container-default", 
   "version": "1.0-alpha-7", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "plexus", 
     "artifact_id": "plexus-containers", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-7/plexus-container-default-1.0-alpha-7.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-7/plexus-container-default-1.0-alpha-7.pom.package.json
index 380dca2180d..3cc89aeedc3 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-7/plexus-container-default-1.0-alpha-7.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-7/plexus-container-default-1.0-alpha-7.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-container-default", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-container-default", 
   "version": "1.0-alpha-7", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Default Plexus Container", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,27 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "plexus:plexus-utils", 
-        "version": "1.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "classworlds:classworlds", 
-        "version": "1.1-alpha-2"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:plexus/plexus-utils", 
+      "requirement": "1.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:classworlds/classworlds", 
+      "requirement": "1.1-alpha-2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom.json
index 67f43f11254..257bb6706e1 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-container-default", 
   "version": "1.0-alpha-8", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Default Plexus Container", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom.package.json
index c89e6c66218..80263d5b09b 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-container-default", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-container-default", 
   "version": "1.0-alpha-8", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Default Plexus Container", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -103,27 +106,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "classworlds:classworlds", 
-        "version": "1.1-alpha-2"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:classworlds/classworlds", 
+      "requirement": "1.1-alpha-2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom.json
index e238f6dc827..0d0307468ae 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-container-default", 
   "version": "1.0-alpha-9-stable-1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus-containers", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom.package.json
index 390138ec228..8fe23870e22 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-container-default", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-container-default", 
   "version": "1.0-alpha-9-stable-1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Default Plexus Container", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,27 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "classworlds:classworlds", 
-        "version": "1.1-alpha-2"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:classworlds/classworlds", 
+      "requirement": "1.1-alpha-2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom.json
index e6c280a14c5..a4a55634448 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-container-default", 
   "version": "1.0-alpha-9", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus-containers", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom.package.json
index 538e99d8824..294e9b61f11 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-container-default", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-container-default", 
   "version": "1.0-alpha-9", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Default Plexus Container", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,27 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "classworlds:classworlds", 
-        "version": "1.1-alpha-2"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:classworlds/classworlds", 
+      "requirement": "1.1-alpha-2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom.json
index cbab4c2b2be..88ef600486d 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-containers", 
   "version": "1.0-alpha-15", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom.package.json
index 342f5652f46..677e91541f1 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-15/plexus-containers-1.0-alpha-15.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-containers", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-containers", 
   "version": "1.0-alpha-15", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Parent Plexus Container POM", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +23,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.json
index 42c0169340e..008ed228033 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-containers", 
   "version": "1.0-alpha-16", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.package.json
index e1a8fb0ffbb..2b52a1b013d 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-16/plexus-containers-1.0-alpha-16.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-containers", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-containers", 
   "version": "1.0-alpha-16", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Parent Plexus Container POM", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +23,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-22/plexus-containers-1.0-alpha-22.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-22/plexus-containers-1.0-alpha-22.pom.json
index 6aad207ac6e..93852b7b6d1 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-22/plexus-containers-1.0-alpha-22.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-22/plexus-containers-1.0-alpha-22.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-containers", 
   "version": "1.0-alpha-22", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-22/plexus-containers-1.0-alpha-22.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-22/plexus-containers-1.0-alpha-22.pom.package.json
index fd0a757b376..097adb9061c 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-22/plexus-containers-1.0-alpha-22.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-22/plexus-containers-1.0-alpha-22.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-containers", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-containers", 
   "version": "1.0-alpha-22", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Parent Plexus Container POM", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +23,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom.json
index 536fa543cde..6949b9217e9 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-containers", 
   "version": "1.0-alpha-30", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom.package.json
index 85f7dceb701..d9f5cf25310 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-containers", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-containers", 
   "version": "1.0-alpha-30", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Parent Plexus Container POM", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +23,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom.json
index 7dbcd8bda77..bdf8f28639e 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-containers", 
   "version": "1.0.3", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom.package.json
index f4375571565..32afbee36d2 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-containers", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-containers", 
   "version": "1.0.3", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Parent Plexus Container POM", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-digest/1.0/plexus-digest-1.0.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-digest/1.0/plexus-digest-1.0.pom.json
index ff43c68bff2..bc73e340234 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-digest/1.0/plexus-digest-1.0.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-digest/1.0/plexus-digest-1.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-digest", 
   "version": "1.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus-components", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-digest/1.0/plexus-digest-1.0.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-digest/1.0/plexus-digest-1.0.pom.package.json
index b01aa439ac2..96a91c299a4 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-digest/1.0/plexus-digest-1.0.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-digest/1.0/plexus-digest-1.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-digest", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-digest", 
   "version": "1.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Digest / Hashcode Components", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-i18n/1.0-beta-6/plexus-i18n-1.0-beta-6.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-i18n/1.0-beta-6/plexus-i18n-1.0-beta-6.pom.json
index d17106451d0..df5367f4191 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-i18n/1.0-beta-6/plexus-i18n-1.0-beta-6.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-i18n/1.0-beta-6/plexus-i18n-1.0-beta-6.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-i18n", 
   "version": "1.0-beta-6", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus-components", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-i18n/1.0-beta-6/plexus-i18n-1.0-beta-6.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-i18n/1.0-beta-6/plexus-i18n-1.0-beta-6.pom.package.json
index fc62f92c3c3..0cf9975c3f3 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-i18n/1.0-beta-6/plexus-i18n-1.0-beta-6.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-i18n/1.0-beta-6/plexus-i18n-1.0-beta-6.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-i18n", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-i18n", 
   "version": "1.0-beta-6", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus I18N Component", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom.json
index e2486574b18..3ff6348334b 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-i18n", 
   "version": "1.0-beta-7", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus-components", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom.package.json
index aa5823998dd..216ca962d48 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-i18n", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-i18n", 
   "version": "1.0-beta-7", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus I18N Component", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.4.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.4.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom.json
index 972410fdd4c..4fdd661088b 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-interactivity-api", 
   "version": "1.0-alpha-4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Plexus Default Interactivity Handler", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom.package.json
index 64e9e3f1a0e..562bb0efae7 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-interactivity-api", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-interactivity-api", 
   "version": "1.0-alpha-4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Default Interactivity Handler", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -103,34 +106,42 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-7"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "classworlds:classworlds", 
-        "version": "1.1-alpha-2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "plexus:plexus-utils", 
-        "version": "1.0.2"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:classworlds/classworlds", 
+      "requirement": "1.1-alpha-2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:plexus/plexus-utils", 
+      "requirement": "1.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom.json
index 53a7375de5a..4652d174b20 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-io", 
   "version": "1.0-alpha-1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus-components", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom.package.json
index e18c0e8e644..397b36443f8 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-io/1.0-alpha-1/plexus-io-1.0-alpha-1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-io", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-io", 
   "version": "1.0-alpha-1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus IO Components", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-9"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-9", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-io/1.0-alpha-2/plexus-io-1.0-alpha-2.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-io/1.0-alpha-2/plexus-io-1.0-alpha-2.pom.json
index 461e7efb430..505b7cac332 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-io/1.0-alpha-2/plexus-io-1.0-alpha-2.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-io/1.0-alpha-2/plexus-io-1.0-alpha-2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-io", 
   "version": "1.0-alpha-2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus-components", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-io/1.0-alpha-2/plexus-io-1.0-alpha-2.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-io/1.0-alpha-2/plexus-io-1.0-alpha-2.pom.package.json
index 5c4c53b4ef9..932d72ae204 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-io/1.0-alpha-2/plexus-io-1.0-alpha-2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-io/1.0-alpha-2/plexus-io-1.0-alpha-2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-io", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-io", 
   "version": "1.0-alpha-2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus IO Components", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,29 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-utils", 
-        "version": "1.2"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-24"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-component-api", 
-        "version": "1.0-alpha-24"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-utils", 
+      "requirement": "1.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-24", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-component-api", 
+      "requirement": "1.0-alpha-24", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom.json
index b05d7a947df..5f181364ff8 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-utils", 
   "version": "1.0.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Plexus Common Utilities", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom.package.json
index 3d7afd7e250..11d5b1ec4c0 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-utils", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-utils", 
   "version": "1.0.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Common Utilities", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -103,17 +106,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.0.5/plexus-utils-1.0.5.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.0.5/plexus-utils-1.0.5.pom.json
index 87a875ae3e5..92c5cc6338f 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.0.5/plexus-utils-1.0.5.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.0.5/plexus-utils-1.0.5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-utils", 
   "version": "1.0.5", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.0.5/plexus-utils-1.0.5.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.0.5/plexus-utils-1.0.5.pom.package.json
index e04737dccad..0f1bfbad487 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.0.5/plexus-utils-1.0.5.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.0.5/plexus-utils-1.0.5.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-utils", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-utils", 
   "version": "1.0.5", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Common Utilities", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "classworlds:classworlds", 
-        "version": "1.1-alpha-2"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:classworlds/classworlds", 
+      "requirement": "1.1-alpha-2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.json
index 99d55da1996..36b02fca263 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-utils", 
   "version": "1.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.package.json
index df0ee151bf7..7dd294bd236 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.1/plexus-utils-1.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-utils", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-utils", 
   "version": "1.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Common Utilities", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom.json
index 2312d1a5006..facf1b253fa 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-utils", 
   "version": "1.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom.package.json
index c4b7fdff798..16af5109881 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.2/plexus-utils-1.2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-utils", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-utils", 
   "version": "1.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Common Utilities", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom.json
index 5970ad4f7b1..19b8e8d5eda 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-utils", 
   "version": "1.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom.package.json
index 6956f29182e..e9c531da79a 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-utils", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-utils", 
   "version": "1.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Common Utilities", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom.json
index 1b53abbef9f..40b0eac5cfb 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-utils", 
   "version": "1.4.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom.package.json
index 464e7451a66..3951dbf6f59 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-utils", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-utils", 
   "version": "1.4.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Common Utilities", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom.json
index 7337fb7d6f8..5f1bacd0320 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-utils", 
   "version": "1.4.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom.package.json
index b9d068ac918..2260cd111e7 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-utils", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-utils", 
   "version": "1.4.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Common Utilities", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.json
index bf0cd6a08cb..aef90808e76 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-utils", 
   "version": "1.4.5", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.package.json
index d74d41a0104..2a77e47c625 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-utils", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-utils", 
   "version": "1.4.5", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Common Utilities", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom.json
index 8911e64e1ac..4757d366002 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-utils", 
   "version": "1.4.6", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom.package.json
index 0262b3ca537..942314213a0 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-utils", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-utils", 
   "version": "1.4.6", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Common Utilities", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.7/plexus-utils-1.4.7.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.7/plexus-utils-1.4.7.pom.json
index f3825c0bcb7..d79ca5b586f 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.7/plexus-utils-1.4.7.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.7/plexus-utils-1.4.7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-utils", 
   "version": "1.4.7", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.7/plexus-utils-1.4.7.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.7/plexus-utils-1.4.7.pom.package.json
index acbceb08a46..8f05b0b2578 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.7/plexus-utils-1.4.7.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.7/plexus-utils-1.4.7.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-utils", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-utils", 
   "version": "1.4.7", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Common Utilities", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom.json
index ab2fc0e73fc..fb44cad2a7b 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-utils", 
   "version": "1.4.9", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom.package.json
index e1216f81c12..984041f461a 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-utils", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-utils", 
   "version": "1.4.9", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Common Utilities", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom.json
index c0fcb5839ae..8ca3c5d209a 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-utils", 
   "version": "1.5.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom.package.json
index 3c4955a785a..a463b2daa60 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-utils", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-utils", 
   "version": "1.5.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Common Utilities", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-velocity/1.1.2/plexus-velocity-1.1.2.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-velocity/1.1.2/plexus-velocity-1.1.2.pom.json
index 00a86a0b361..d76587df932 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-velocity/1.1.2/plexus-velocity-1.1.2.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-velocity/1.1.2/plexus-velocity-1.1.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-velocity", 
   "version": "1.1.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Plexus Velocity Component", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-velocity/1.1.2/plexus-velocity-1.1.2.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-velocity/1.1.2/plexus-velocity-1.1.2.pom.package.json
index 9766b5aa1bd..755e50d0c29 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-velocity/1.1.2/plexus-velocity-1.1.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-velocity/1.1.2/plexus-velocity-1.1.2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-velocity", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-velocity", 
   "version": "1.1.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Velocity Component", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -103,49 +106,66 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-7"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "classworlds:classworlds", 
-        "version": "1.1-alpha-2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "plexus:plexus-utils", 
-        "version": "1.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-collections:commons-collections", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging-api", 
-        "version": "1.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "velocity:velocity", 
-        "version": "1.4"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:classworlds/classworlds", 
+      "requirement": "1.1-alpha-2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:plexus/plexus-utils", 
+      "requirement": "1.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-collections/commons-collections", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging-api", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:velocity/velocity", 
+      "requirement": "1.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-velocity/1.1.3/plexus-velocity-1.1.3.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-velocity/1.1.3/plexus-velocity-1.1.3.pom.json
index e3f6168386d..52f6999a85f 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-velocity/1.1.3/plexus-velocity-1.1.3.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-velocity/1.1.3/plexus-velocity-1.1.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-velocity", 
   "version": "1.1.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus-components", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-velocity/1.1.3/plexus-velocity-1.1.3.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-velocity/1.1.3/plexus-velocity-1.1.3.pom.package.json
index 4e898919357..4ec1e6ec8ea 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-velocity/1.1.3/plexus-velocity-1.1.3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-velocity/1.1.3/plexus-velocity-1.1.3.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-velocity", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-velocity", 
   "version": "1.1.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Velocity Component", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,22 +21,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-collections:commons-collections", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "velocity:velocity", 
-        "version": "1.4"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:commons-collections/commons-collections", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:velocity/velocity", 
+      "requirement": "1.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom.json
index 24449c0dfc0..93df5ead23c 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-velocity", 
   "version": "1.1.7", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.codehaus.plexus", 
     "artifact_id": "plexus-components", 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom.package.json
index 26430c45aa0..a3099417cb6 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-velocity", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-velocity", 
   "version": "1.1.7", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Velocity Component", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,27 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-20"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-collections:commons-collections", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "velocity:velocity", 
-        "version": "1.4"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-20", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-collections/commons-collections", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:velocity/velocity", 
+      "requirement": "1.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.json
index 914274526f8..1b08de14556 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus", 
   "version": "1.0.10", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Plexus", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.package.json
index fcaf55c560e..363f48d5495 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus", 
   "version": "1.0.10", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -152,17 +157,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.json
index a222097b605..c53b4458473 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus", 
   "version": "1.0.11", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Plexus", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.package.json
index 3923a9dd794..35069b1a0d1 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus", 
   "version": "1.0.11", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -152,17 +157,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.json
index abcddfaaa08..a0c9075805a 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus", 
   "version": "1.0.4", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Plexus", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.package.json
index 45be1730a54..addbb18e505 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus", 
   "version": "1.0.4", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -103,17 +108,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom.json
index c3ea23edb06..f98ee99ee11 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus", 
   "version": "1.0.5", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Plexus", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom.package.json
index 007641aafd0..912a7cc7d88 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.5/plexus-1.0.5.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus", 
   "version": "1.0.5", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -103,17 +108,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.json
index e617159d0a0..1bb82c56951 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus", 
   "version": "1.0.8", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Plexus", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.package.json
index 033fd243c4c..da965e15595 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus", 
   "version": "1.0.8", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -124,17 +129,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.json
index b7c3b1aff7e..d9a89339162 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus", 
   "version": "1.0.9", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Plexus", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.package.json b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.package.json
index 9119707cd33..91cc89d8ca5 100644
--- a/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.package.json
+++ b/tests/packagedcode/data/m2/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus", 
   "version": "1.0.9", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -131,17 +136,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/easymock/easymock/2.3/easymock-2.3.pom.json b/tests/packagedcode/data/m2/org/easymock/easymock/2.3/easymock-2.3.pom.json
index 3180689d7b3..d7049f14352 100644
--- a/tests/packagedcode/data/m2/org/easymock/easymock/2.3/easymock-2.3.pom.json
+++ b/tests/packagedcode/data/m2/org/easymock/easymock/2.3/easymock-2.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "easymock", 
   "version": "2.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "EasyMock", 
   "description": "EasyMock provides Mock Objects for interfaces in JUnit tests by generating them on the fly using Java's proxy mechanism", 
diff --git a/tests/packagedcode/data/m2/org/easymock/easymock/2.3/easymock-2.3.pom.package.json b/tests/packagedcode/data/m2/org/easymock/easymock/2.3/easymock-2.3.pom.package.json
index b640978afa0..39c5f769464 100644
--- a/tests/packagedcode/data/m2/org/easymock/easymock/2.3/easymock-2.3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/easymock/easymock/2.3/easymock-2.3.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.easymock:easymock", 
+  "type": "maven", 
+  "namespace": "org.easymock", 
+  "name": "easymock", 
   "version": "2.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "EasyMock provides Mock Objects for interfaces in JUnit tests by generating them on the fly using Java's proxy mechanism", 
+  "description": "EasyMock\nEasyMock provides Mock Objects for interfaces in JUnit tests by generating them on the fly using Java's proxy mechanism", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "MIT License\nhttp://www.easymock.org/License.html", 
   "license_expression": null, 
+  "asserted_license": "MIT License\nhttp://www.easymock.org/License.html", 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "4.3.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "4.3.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/easymock/easymockclassextension/2.3/easymockclassextension-2.3.pom.json b/tests/packagedcode/data/m2/org/easymock/easymockclassextension/2.3/easymockclassextension-2.3.pom.json
index 4360a8734c6..3498188eeb0 100644
--- a/tests/packagedcode/data/m2/org/easymock/easymockclassextension/2.3/easymockclassextension-2.3.pom.json
+++ b/tests/packagedcode/data/m2/org/easymock/easymockclassextension/2.3/easymockclassextension-2.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "easymockclassextension", 
   "version": "2.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "EasyMock class extension", 
   "description": "The EasyMock Class Extension allows to generate Mock Objects for classes", 
diff --git a/tests/packagedcode/data/m2/org/easymock/easymockclassextension/2.3/easymockclassextension-2.3.pom.package.json b/tests/packagedcode/data/m2/org/easymock/easymockclassextension/2.3/easymockclassextension-2.3.pom.package.json
index 79ed43d12ad..bfb5e4827a6 100644
--- a/tests/packagedcode/data/m2/org/easymock/easymockclassextension/2.3/easymockclassextension-2.3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/easymock/easymockclassextension/2.3/easymockclassextension-2.3.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.easymock:easymockclassextension", 
+  "type": "maven", 
+  "namespace": "org.easymock", 
+  "name": "easymockclassextension", 
   "version": "2.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "The EasyMock Class Extension allows to generate Mock Objects for classes", 
+  "description": "EasyMock class extension\nThe EasyMock Class Extension allows to generate Mock Objects for classes", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,36 +21,42 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "MIT License\nhttp://www.easymock.org/License.html", 
   "license_expression": null, 
+  "asserted_license": "MIT License\nhttp://www.easymock.org/License.html", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.easymock:easymock", 
-        "version": "2.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "cglib:cglib-nodep", 
-        "version": "2.1_3"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.objenesis:objenesis", 
-        "version": "1.1"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "4.4"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.easymock/easymock", 
+      "requirement": "2.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:cglib/cglib-nodep", 
+      "requirement": "2.1_3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.objenesis/objenesis", 
+      "requirement": "1.1", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "4.4", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.pom.json b/tests/packagedcode/data/m2/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.pom.json
index 4775179a6da..8ab2b3d7d38 100644
--- a/tests/packagedcode/data/m2/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.pom.json
+++ b/tests/packagedcode/data/m2/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "ejb3-persistence", 
   "version": "1.0.1.GA", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Java Persistence API", 
   "description": "Java Persistence API", 
diff --git a/tests/packagedcode/data/m2/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.pom.package.json b/tests/packagedcode/data/m2/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.pom.package.json
index e157000bccf..23a0eb3b41b 100644
--- a/tests/packagedcode/data/m2/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.pom.package.json
+++ b/tests/packagedcode/data/m2/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.pom.package.json
@@ -1,7 +1,12 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.hibernate:ejb3-persistence", 
+  "type": "maven", 
+  "namespace": "org.hibernate", 
+  "name": "ejb3-persistence", 
   "version": "1.0.1.GA", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Java Persistence API", 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/hibernate/hibernate-annotations/3.2.1.ga/hibernate-annotations-3.2.1.ga.pom.json b/tests/packagedcode/data/m2/org/hibernate/hibernate-annotations/3.2.1.ga/hibernate-annotations-3.2.1.ga.pom.json
index 2e19dde4e3f..2033be4a113 100644
--- a/tests/packagedcode/data/m2/org/hibernate/hibernate-annotations/3.2.1.ga/hibernate-annotations-3.2.1.ga.pom.json
+++ b/tests/packagedcode/data/m2/org/hibernate/hibernate-annotations/3.2.1.ga/hibernate-annotations-3.2.1.ga.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "hibernate-annotations", 
   "version": "3.2.1.ga", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Hibernate Annotations", 
   "description": "EJB3-style annotations for Hibernate", 
diff --git a/tests/packagedcode/data/m2/org/hibernate/hibernate-annotations/3.2.1.ga/hibernate-annotations-3.2.1.ga.pom.package.json b/tests/packagedcode/data/m2/org/hibernate/hibernate-annotations/3.2.1.ga/hibernate-annotations-3.2.1.ga.pom.package.json
index 1c14a1075ba..0cc5cff0f14 100644
--- a/tests/packagedcode/data/m2/org/hibernate/hibernate-annotations/3.2.1.ga/hibernate-annotations-3.2.1.ga.pom.package.json
+++ b/tests/packagedcode/data/m2/org/hibernate/hibernate-annotations/3.2.1.ga/hibernate-annotations-3.2.1.ga.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.hibernate:hibernate-annotations", 
+  "type": "maven", 
+  "namespace": "org.hibernate", 
+  "name": "hibernate-annotations", 
   "version": "3.2.1.ga", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "EJB3-style annotations for Hibernate", 
+  "description": "Hibernate Annotations\nEJB3-style annotations for Hibernate", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,27 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "GNU LESSER GENERAL PUBLIC LICENSE\nhttp://www.gnu.org/licenses/lgpl.txt", 
   "license_expression": null, 
+  "asserted_license": "GNU LESSER GENERAL PUBLIC LICENSE\nhttp://www.gnu.org/licenses/lgpl.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.hibernate:hibernate", 
-        "version": "3.2.1.ga"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.persistence:persistence-api", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.lucene:lucene-core", 
-        "version": "2.0.0"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.hibernate/hibernate", 
+      "requirement": "3.2.1.ga", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.persistence/persistence-api", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.lucene/lucene-core", 
+      "requirement": "2.0.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.pom.json b/tests/packagedcode/data/m2/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.pom.json
index 2ad7fc3dd4f..965d82d7f2c 100644
--- a/tests/packagedcode/data/m2/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.pom.json
+++ b/tests/packagedcode/data/m2/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "hibernate-annotations", 
   "version": "3.3.1.GA", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Hibernate Annotations", 
   "description": "Annotations metadata for Hibernate", 
diff --git a/tests/packagedcode/data/m2/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.pom.package.json b/tests/packagedcode/data/m2/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.pom.package.json
index 989c5df1cb3..fa09ea059ce 100644
--- a/tests/packagedcode/data/m2/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.pom.package.json
+++ b/tests/packagedcode/data/m2/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.hibernate:hibernate-annotations", 
+  "type": "maven", 
+  "namespace": "org.hibernate", 
+  "name": "hibernate-annotations", 
   "version": "3.3.1.GA", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Annotations metadata for Hibernate", 
+  "description": "Hibernate Annotations\nAnnotations metadata for Hibernate", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,32 +21,42 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "GNU LESSER GENERAL PUBLIC LICENSE\nhttp://www.gnu.org/licenses/lgpl.txt", 
   "license_expression": null, 
+  "asserted_license": "GNU LESSER GENERAL PUBLIC LICENSE\nhttp://www.gnu.org/licenses/lgpl.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.hibernate:hibernate", 
-        "version": "3.2.6.ga"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.hibernate:hibernate-commons-annotations", 
-        "version": "3.0.0.ga"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.hibernate:ejb3-persistence", 
-        "version": "1.0.1.GA"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.0.4"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.hibernate/hibernate", 
+      "requirement": "3.2.6.ga", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.hibernate/hibernate-commons-annotations", 
+      "requirement": "3.0.0.ga", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.hibernate/ejb3-persistence", 
+      "requirement": "1.0.1.GA", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.pom.json b/tests/packagedcode/data/m2/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.pom.json
index 8c1fd06ed70..1c9369b9eae 100644
--- a/tests/packagedcode/data/m2/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.pom.json
+++ b/tests/packagedcode/data/m2/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "hibernate-commons-annotations", 
   "version": "3.0.0.ga", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Hibernate Commons Annotations", 
   "description": "Hibernate Commons Annotations is a utility project used by annotations based Hibernate sub-projects.", 
diff --git a/tests/packagedcode/data/m2/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.pom.package.json b/tests/packagedcode/data/m2/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.pom.package.json
index b840bcbdb31..774a80ceb7e 100644
--- a/tests/packagedcode/data/m2/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.pom.package.json
+++ b/tests/packagedcode/data/m2/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.hibernate:hibernate-commons-annotations", 
+  "type": "maven", 
+  "namespace": "org.hibernate", 
+  "name": "hibernate-commons-annotations", 
   "version": "3.0.0.ga", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Hibernate Commons Annotations is a utility project used by annotations based Hibernate sub-projects.", 
+  "description": "Hibernate Commons Annotations\nHibernate Commons Annotations is a utility project used by annotations based Hibernate sub-projects.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,22 +21,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "GNU LESSER GENERAL PUBLIC LICENSE\nhttp://www.gnu.org/licenses/lgpl.txt", 
   "license_expression": null, 
+  "asserted_license": "GNU LESSER GENERAL PUBLIC LICENSE\nhttp://www.gnu.org/licenses/lgpl.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "log4j:log4j", 
-        "version": "1.2.15"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:log4j/log4j", 
+      "requirement": "1.2.15", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/hibernate/hibernate-entitymanager/3.2.1.ga/hibernate-entitymanager-3.2.1.ga.pom.json b/tests/packagedcode/data/m2/org/hibernate/hibernate-entitymanager/3.2.1.ga/hibernate-entitymanager-3.2.1.ga.pom.json
index c5e6eb5755d..01b240b0e98 100644
--- a/tests/packagedcode/data/m2/org/hibernate/hibernate-entitymanager/3.2.1.ga/hibernate-entitymanager-3.2.1.ga.pom.json
+++ b/tests/packagedcode/data/m2/org/hibernate/hibernate-entitymanager/3.2.1.ga/hibernate-entitymanager-3.2.1.ga.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "hibernate-entitymanager", 
   "version": "3.2.1.ga", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Hibernate EntityManager", 
   "description": "Hibernate EntityManager implements the programming interfaces and lifecycle rules as defined by the EJB3 persistence specification.", 
diff --git a/tests/packagedcode/data/m2/org/hibernate/hibernate-entitymanager/3.2.1.ga/hibernate-entitymanager-3.2.1.ga.pom.package.json b/tests/packagedcode/data/m2/org/hibernate/hibernate-entitymanager/3.2.1.ga/hibernate-entitymanager-3.2.1.ga.pom.package.json
index f8b66e264c2..0e9ebb1e6b1 100644
--- a/tests/packagedcode/data/m2/org/hibernate/hibernate-entitymanager/3.2.1.ga/hibernate-entitymanager-3.2.1.ga.pom.package.json
+++ b/tests/packagedcode/data/m2/org/hibernate/hibernate-entitymanager/3.2.1.ga/hibernate-entitymanager-3.2.1.ga.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.hibernate:hibernate-entitymanager", 
+  "type": "maven", 
+  "namespace": "org.hibernate", 
+  "name": "hibernate-entitymanager", 
   "version": "3.2.1.ga", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Hibernate EntityManager implements the programming interfaces and lifecycle rules as defined by the EJB3 persistence specification.", 
+  "description": "Hibernate EntityManager\nHibernate EntityManager implements the programming interfaces and lifecycle rules as defined by the EJB3 persistence specification.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,27 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "GNU LESSER GENERAL PUBLIC LICENSE\nhttp://www.gnu.org/licenses/lgpl.txt", 
   "license_expression": null, 
+  "asserted_license": "GNU LESSER GENERAL PUBLIC LICENSE\nhttp://www.gnu.org/licenses/lgpl.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.hibernate:hibernate-annotations", 
-        "version": "3.2.1.ga"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jboss:javassist", 
-        "version": "3.3.ga"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jboss:jboss-archive-browsing", 
-        "version": "5.0.0alpha-200607201-119"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.hibernate/hibernate-annotations", 
+      "requirement": "3.2.1.ga", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jboss/javassist", 
+      "requirement": "3.3.ga", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jboss/jboss-archive-browsing", 
+      "requirement": "5.0.0alpha-200607201-119", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.pom.json b/tests/packagedcode/data/m2/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.pom.json
index f00b29c521b..a50b17d8f72 100644
--- a/tests/packagedcode/data/m2/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.pom.json
+++ b/tests/packagedcode/data/m2/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "hibernate-entitymanager", 
   "version": "3.3.2.GA", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Hibernate Entitity Manager", 
   "description": "Hibernate Entitity Manager", 
diff --git a/tests/packagedcode/data/m2/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.pom.package.json b/tests/packagedcode/data/m2/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.pom.package.json
index d7095203d47..52848293511 100644
--- a/tests/packagedcode/data/m2/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.pom.package.json
+++ b/tests/packagedcode/data/m2/org/hibernate/hibernate-entitymanager/3.3.2.GA/hibernate-entitymanager-3.3.2.GA.pom.package.json
@@ -1,7 +1,12 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.hibernate:hibernate-entitymanager", 
+  "type": "maven", 
+  "namespace": "org.hibernate", 
+  "name": "hibernate-entitymanager", 
   "version": "3.3.2.GA", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Hibernate Entitity Manager", 
@@ -18,42 +23,58 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "GNU LESSER GENERAL PUBLIC LICENSE\nhttp://www.gnu.org/licenses/lgpl.txt", 
   "license_expression": null, 
+  "asserted_license": "GNU LESSER GENERAL PUBLIC LICENSE\nhttp://www.gnu.org/licenses/lgpl.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.hibernate:hibernate", 
-        "version": "3.2.6.ga"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.hibernate:hibernate-annotations", 
-        "version": "3.3.1.GA"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.hibernate:hibernate-commons-annotations", 
-        "version": "3.0.0.ga"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.hibernate:ejb3-persistence", 
-        "version": "1.0.1.GA"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javassist:javassist", 
-        "version": "3.4.GA"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.hibernate/hibernate", 
+      "requirement": "3.2.6.ga", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.hibernate/hibernate-annotations", 
+      "requirement": "3.3.1.GA", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.hibernate/hibernate-commons-annotations", 
+      "requirement": "3.0.0.ga", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.hibernate/ejb3-persistence", 
+      "requirement": "1.0.1.GA", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javassist/javassist", 
+      "requirement": "3.4.GA", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/hibernate/hibernate/3.2.1.ga/hibernate-3.2.1.ga.pom.json b/tests/packagedcode/data/m2/org/hibernate/hibernate/3.2.1.ga/hibernate-3.2.1.ga.pom.json
index 480d6897cfa..3b152e0de93 100644
--- a/tests/packagedcode/data/m2/org/hibernate/hibernate/3.2.1.ga/hibernate-3.2.1.ga.pom.json
+++ b/tests/packagedcode/data/m2/org/hibernate/hibernate/3.2.1.ga/hibernate-3.2.1.ga.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "hibernate", 
   "version": "3.2.1.ga", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Hibernate", 
   "description": "Relational Persistence for Java", 
diff --git a/tests/packagedcode/data/m2/org/hibernate/hibernate/3.2.1.ga/hibernate-3.2.1.ga.pom.package.json b/tests/packagedcode/data/m2/org/hibernate/hibernate/3.2.1.ga/hibernate-3.2.1.ga.pom.package.json
index 2537613f054..757693abc64 100644
--- a/tests/packagedcode/data/m2/org/hibernate/hibernate/3.2.1.ga/hibernate-3.2.1.ga.pom.package.json
+++ b/tests/packagedcode/data/m2/org/hibernate/hibernate/3.2.1.ga/hibernate-3.2.1.ga.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.hibernate:hibernate", 
+  "type": "maven", 
+  "namespace": "org.hibernate", 
+  "name": "hibernate", 
   "version": "3.2.1.ga", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Relational Persistence for Java", 
+  "description": "Hibernate\nRelational Persistence for Java", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,99 +29,146 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "GNU LESSER GENERAL PUBLIC LICENSE\nhttp://www.gnu.org/licenses/lgpl.txt", 
   "license_expression": null, 
+  "asserted_license": "GNU LESSER GENERAL PUBLIC LICENSE\nhttp://www.gnu.org/licenses/lgpl.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "net.sf.ehcache:ehcache", 
-        "version": "1.2.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "swarmcache:swarmcache", 
-        "version": "1.0RC2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jboss:jboss-cache", 
-        "version": "1.2.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jgroups:jgroups-all", 
-        "version": "2.2.8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.transaction:jta", 
-        "version": "1.0.1B"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "c3p0:c3p0", 
-        "version": "0.9.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "asm:asm-attrs", 
-        "version": "1.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.security:jacc", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "dom4j:dom4j", 
-        "version": "1.6.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "antlr:antlr", 
-        "version": "2.7.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "cglib:cglib", 
-        "version": "2.1_3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "opensymphony:oscache", 
-        "version": "2.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "asm:asm", 
-        "version": "1.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-collections:commons-collections", 
-        "version": "2.1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "proxool:proxool", 
-        "version": "0.8.3"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "ant:ant", 
-        "version": "1.6.5"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:net.sf.ehcache/ehcache", 
+      "requirement": "1.2.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:swarmcache/swarmcache", 
+      "requirement": "1.0RC2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jboss/jboss-cache", 
+      "requirement": "1.2.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jgroups/jgroups-all", 
+      "requirement": "2.2.8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.transaction/jta", 
+      "requirement": "1.0.1B", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:c3p0/c3p0", 
+      "requirement": "0.9.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:asm/asm-attrs", 
+      "requirement": "1.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.security/jacc", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:dom4j/dom4j", 
+      "requirement": "1.6.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:antlr/antlr", 
+      "requirement": "2.7.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:cglib/cglib", 
+      "requirement": "2.1_3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:opensymphony/oscache", 
+      "requirement": "2.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:asm/asm", 
+      "requirement": "1.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-collections/commons-collections", 
+      "requirement": "2.1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:proxool/proxool", 
+      "requirement": "0.8.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:ant/ant", 
+      "requirement": "1.6.5", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.pom.json b/tests/packagedcode/data/m2/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.pom.json
index 6adcea2bf8b..ba0d7e8ad28 100644
--- a/tests/packagedcode/data/m2/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.pom.json
+++ b/tests/packagedcode/data/m2/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "hibernate", 
   "version": "3.2.6.ga", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Hibernate", 
   "description": "Relational Persistence for Java", 
diff --git a/tests/packagedcode/data/m2/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.pom.package.json b/tests/packagedcode/data/m2/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.pom.package.json
index 90d6c41ca75..faf7a4a7d46 100644
--- a/tests/packagedcode/data/m2/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.pom.package.json
+++ b/tests/packagedcode/data/m2/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.hibernate:hibernate", 
+  "type": "maven", 
+  "namespace": "org.hibernate", 
+  "name": "hibernate", 
   "version": "3.2.6.ga", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Relational Persistence for Java", 
+  "description": "Hibernate\nRelational Persistence for Java", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,99 +29,146 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "GNU LESSER GENERAL PUBLIC LICENSE\nhttp://www.gnu.org/licenses/lgpl.txt", 
   "license_expression": null, 
+  "asserted_license": "GNU LESSER GENERAL PUBLIC LICENSE\nhttp://www.gnu.org/licenses/lgpl.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "net.sf.ehcache:ehcache", 
-        "version": "1.2.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "swarmcache:swarmcache", 
-        "version": "1.0RC2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jboss:jboss-cache", 
-        "version": "1.2.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jgroups:jgroups-all", 
-        "version": "2.2.8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.transaction:jta", 
-        "version": "1.0.1B"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "c3p0:c3p0", 
-        "version": "0.9.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "asm:asm-attrs", 
-        "version": "1.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.security:jacc", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "dom4j:dom4j", 
-        "version": "1.6.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "antlr:antlr", 
-        "version": "2.7.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "cglib:cglib", 
-        "version": "2.1_3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "opensymphony:oscache", 
-        "version": "2.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "asm:asm", 
-        "version": "1.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-collections:commons-collections", 
-        "version": "2.1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "proxool:proxool", 
-        "version": "0.8.3"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "ant:ant", 
-        "version": "1.6.5"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:net.sf.ehcache/ehcache", 
+      "requirement": "1.2.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:swarmcache/swarmcache", 
+      "requirement": "1.0RC2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jboss/jboss-cache", 
+      "requirement": "1.2.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jgroups/jgroups-all", 
+      "requirement": "2.2.8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.transaction/jta", 
+      "requirement": "1.0.1B", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:c3p0/c3p0", 
+      "requirement": "0.9.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:asm/asm-attrs", 
+      "requirement": "1.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.security/jacc", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:dom4j/dom4j", 
+      "requirement": "1.6.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:antlr/antlr", 
+      "requirement": "2.7.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:cglib/cglib", 
+      "requirement": "2.1_3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:opensymphony/oscache", 
+      "requirement": "2.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:asm/asm", 
+      "requirement": "1.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-collections/commons-collections", 
+      "requirement": "2.1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:proxool/proxool", 
+      "requirement": "0.8.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:ant/ant", 
+      "requirement": "1.6.5", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom.json b/tests/packagedcode/data/m2/org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom.json
index 7047572dc15..c52fbc2c3b4 100644
--- a/tests/packagedcode/data/m2/org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom.json
+++ b/tests/packagedcode/data/m2/org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "jetty-parent", 
   "version": "7", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Jetty :: Administrative Parent", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom.package.json b/tests/packagedcode/data/m2/org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom.package.json
index 984c7d0b346..e68209c8eff 100644
--- a/tests/packagedcode/data/m2/org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom.package.json
+++ b/tests/packagedcode/data/m2/org/mortbay/jetty/jetty-parent/7/jetty-parent-7.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.mortbay.jetty:jetty-parent", 
+  "type": "maven", 
+  "namespace": "org.mortbay.jetty", 
+  "name": "jetty-parent", 
   "version": "7", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Jetty :: Administrative Parent", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -103,9 +108,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "Apache License Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0", 
   "license_expression": null, 
+  "asserted_license": "Apache License Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/mortbay/jetty/jetty-util/6.1.5/jetty-util-6.1.5.pom.json b/tests/packagedcode/data/m2/org/mortbay/jetty/jetty-util/6.1.5/jetty-util-6.1.5.pom.json
index 221abd2f275..0b251c5bf1e 100644
--- a/tests/packagedcode/data/m2/org/mortbay/jetty/jetty-util/6.1.5/jetty-util-6.1.5.pom.json
+++ b/tests/packagedcode/data/m2/org/mortbay/jetty/jetty-util/6.1.5/jetty-util-6.1.5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "jetty-util", 
   "version": "6.1.5", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.mortbay.jetty", 
     "artifact_id": "project", 
diff --git a/tests/packagedcode/data/m2/org/mortbay/jetty/jetty-util/6.1.5/jetty-util-6.1.5.pom.package.json b/tests/packagedcode/data/m2/org/mortbay/jetty/jetty-util/6.1.5/jetty-util-6.1.5.pom.package.json
index 02ed06e0318..fe40c9ad25f 100644
--- a/tests/packagedcode/data/m2/org/mortbay/jetty/jetty-util/6.1.5/jetty-util-6.1.5.pom.package.json
+++ b/tests/packagedcode/data/m2/org/mortbay/jetty/jetty-util/6.1.5/jetty-util-6.1.5.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.mortbay.jetty:jetty-util", 
+  "type": "maven", 
+  "namespace": "org.mortbay.jetty", 
+  "name": "jetty-util", 
   "version": "6.1.5", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Utility classes for Jetty", 
+  "description": "Jetty Utilities\nUtility classes for Jetty", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,24 +21,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "latest.release"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.mortbay.jetty:servlet-api-2.5", 
-        "version": "6.1.5"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.mortbay.jetty/servlet-api-2.5", 
+      "requirement": "6.1.5", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/mortbay/jetty/jetty/6.1.5/jetty-6.1.5.pom.json b/tests/packagedcode/data/m2/org/mortbay/jetty/jetty/6.1.5/jetty-6.1.5.pom.json
index 0b64de5261f..c0cf55ad7c3 100644
--- a/tests/packagedcode/data/m2/org/mortbay/jetty/jetty/6.1.5/jetty-6.1.5.pom.json
+++ b/tests/packagedcode/data/m2/org/mortbay/jetty/jetty/6.1.5/jetty-6.1.5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "jetty", 
   "version": "6.1.5", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.mortbay.jetty", 
     "artifact_id": "project", 
diff --git a/tests/packagedcode/data/m2/org/mortbay/jetty/jetty/6.1.5/jetty-6.1.5.pom.package.json b/tests/packagedcode/data/m2/org/mortbay/jetty/jetty/6.1.5/jetty-6.1.5.pom.package.json
index 08799d87b51..db7e57e3044 100644
--- a/tests/packagedcode/data/m2/org/mortbay/jetty/jetty/6.1.5/jetty-6.1.5.pom.package.json
+++ b/tests/packagedcode/data/m2/org/mortbay/jetty/jetty/6.1.5/jetty-6.1.5.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.mortbay.jetty:jetty", 
+  "type": "maven", 
+  "namespace": "org.mortbay.jetty", 
+  "name": "jetty", 
   "version": "6.1.5", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Jetty server core", 
+  "description": "Jetty Server\nJetty server core", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,29 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "latest.release"
-      }
-    ], 
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.mortbay.jetty:jetty-util", 
-        "version": "6.1.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.mortbay.jetty:servlet-api-2.5", 
-        "version": "6.1.5"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.mortbay.jetty/jetty-util", 
+      "requirement": "6.1.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.mortbay.jetty/servlet-api-2.5", 
+      "requirement": "6.1.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/mortbay/jetty/maven-jetty-plugin/6.1-SNAPSHOT/maven-jetty-plugin-6.1-20090123.170629-84.pom.json b/tests/packagedcode/data/m2/org/mortbay/jetty/maven-jetty-plugin/6.1-SNAPSHOT/maven-jetty-plugin-6.1-20090123.170629-84.pom.json
index a5b956efd90..5b48f64e5f9 100644
--- a/tests/packagedcode/data/m2/org/mortbay/jetty/maven-jetty-plugin/6.1-SNAPSHOT/maven-jetty-plugin-6.1-20090123.170629-84.pom.json
+++ b/tests/packagedcode/data/m2/org/mortbay/jetty/maven-jetty-plugin/6.1-SNAPSHOT/maven-jetty-plugin-6.1-20090123.170629-84.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-jetty-plugin", 
   "version": "6.1-SNAPSHOT", 
   "classifier": null, 
-  "packaging ": "maven-plugin", 
+  "packaging": "maven-plugin", 
   "parent": {
     "group_id": "org.mortbay.jetty", 
     "artifact_id": "project", 
diff --git a/tests/packagedcode/data/m2/org/mortbay/jetty/maven-jetty-plugin/6.1-SNAPSHOT/maven-jetty-plugin-6.1-20090123.170629-84.pom.package.json b/tests/packagedcode/data/m2/org/mortbay/jetty/maven-jetty-plugin/6.1-SNAPSHOT/maven-jetty-plugin-6.1-20090123.170629-84.pom.package.json
index 0e26fc4a36c..bc1fb0a240f 100644
--- a/tests/packagedcode/data/m2/org/mortbay/jetty/maven-jetty-plugin/6.1-SNAPSHOT/maven-jetty-plugin-6.1-20090123.170629-84.pom.package.json
+++ b/tests/packagedcode/data/m2/org/mortbay/jetty/maven-jetty-plugin/6.1-SNAPSHOT/maven-jetty-plugin-6.1-20090123.170629-84.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.mortbay.jetty:maven-jetty-plugin", 
+  "type": "maven", 
+  "namespace": "org.mortbay.jetty", 
+  "name": "maven-jetty-plugin", 
   "version": "6.1-SNAPSHOT", 
+  "qualifiers": {
+    "packaging": "maven-plugin"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Jetty Plugin", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,67 +31,98 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.mortbay.jetty:jetty", 
-        "version": "6.1-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-tools-api", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.mortbay.jetty:jetty-plus", 
-        "version": "6.1-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.mortbay.jetty:jetty-naming", 
-        "version": "6.1-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.mortbay.jetty:jetty-management", 
-        "version": "6.1-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.mortbay.jetty:jsp-2.1-jetty", 
-        "version": "6.1-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.mortbay.jetty:jetty-annotations", 
-        "version": "6.1-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.mortbay.jetty:start", 
-        "version": "6.1-SNAPSHOT"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.mortbay.jetty/jetty", 
+      "requirement": "6.1-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-tools-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.mortbay.jetty/jetty-plus", 
+      "requirement": "6.1-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.mortbay.jetty/jetty-naming", 
+      "requirement": "6.1-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.mortbay.jetty/jetty-management", 
+      "requirement": "6.1-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.mortbay.jetty/jsp-2.1-jetty", 
+      "requirement": "6.1-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.mortbay.jetty/jetty-annotations", 
+      "requirement": "6.1-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.mortbay.jetty/start", 
+      "requirement": "6.1-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/mortbay/jetty/maven-jetty-plugin/6.1-SNAPSHOT/maven-jetty-plugin-6.1-SNAPSHOT.pom.json b/tests/packagedcode/data/m2/org/mortbay/jetty/maven-jetty-plugin/6.1-SNAPSHOT/maven-jetty-plugin-6.1-SNAPSHOT.pom.json
index a5b956efd90..5b48f64e5f9 100644
--- a/tests/packagedcode/data/m2/org/mortbay/jetty/maven-jetty-plugin/6.1-SNAPSHOT/maven-jetty-plugin-6.1-SNAPSHOT.pom.json
+++ b/tests/packagedcode/data/m2/org/mortbay/jetty/maven-jetty-plugin/6.1-SNAPSHOT/maven-jetty-plugin-6.1-SNAPSHOT.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-jetty-plugin", 
   "version": "6.1-SNAPSHOT", 
   "classifier": null, 
-  "packaging ": "maven-plugin", 
+  "packaging": "maven-plugin", 
   "parent": {
     "group_id": "org.mortbay.jetty", 
     "artifact_id": "project", 
diff --git a/tests/packagedcode/data/m2/org/mortbay/jetty/maven-jetty-plugin/6.1-SNAPSHOT/maven-jetty-plugin-6.1-SNAPSHOT.pom.package.json b/tests/packagedcode/data/m2/org/mortbay/jetty/maven-jetty-plugin/6.1-SNAPSHOT/maven-jetty-plugin-6.1-SNAPSHOT.pom.package.json
index 0e26fc4a36c..bc1fb0a240f 100644
--- a/tests/packagedcode/data/m2/org/mortbay/jetty/maven-jetty-plugin/6.1-SNAPSHOT/maven-jetty-plugin-6.1-SNAPSHOT.pom.package.json
+++ b/tests/packagedcode/data/m2/org/mortbay/jetty/maven-jetty-plugin/6.1-SNAPSHOT/maven-jetty-plugin-6.1-SNAPSHOT.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.mortbay.jetty:maven-jetty-plugin", 
+  "type": "maven", 
+  "namespace": "org.mortbay.jetty", 
+  "name": "maven-jetty-plugin", 
   "version": "6.1-SNAPSHOT", 
+  "qualifiers": {
+    "packaging": "maven-plugin"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven Jetty Plugin", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,67 +31,98 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.mortbay.jetty:jetty", 
-        "version": "6.1-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-project", 
-        "version": "2.0.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "2.0.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-tools-api", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.mortbay.jetty:jetty-plus", 
-        "version": "6.1-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.mortbay.jetty:jetty-naming", 
-        "version": "6.1-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.mortbay.jetty:jetty-management", 
-        "version": "6.1-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.mortbay.jetty:jsp-2.1-jetty", 
-        "version": "6.1-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.mortbay.jetty:jetty-annotations", 
-        "version": "6.1-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.mortbay.jetty:start", 
-        "version": "6.1-SNAPSHOT"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.mortbay.jetty/jetty", 
+      "requirement": "6.1-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-project", 
+      "requirement": "2.0.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "2.0.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-tools-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.mortbay.jetty/jetty-plus", 
+      "requirement": "6.1-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.mortbay.jetty/jetty-naming", 
+      "requirement": "6.1-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.mortbay.jetty/jetty-management", 
+      "requirement": "6.1-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.mortbay.jetty/jsp-2.1-jetty", 
+      "requirement": "6.1-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.mortbay.jetty/jetty-annotations", 
+      "requirement": "6.1-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.mortbay.jetty/start", 
+      "requirement": "6.1-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/mortbay/jetty/project/6.1-SNAPSHOT/project-6.1-20090123.170629-92.pom.json b/tests/packagedcode/data/m2/org/mortbay/jetty/project/6.1-SNAPSHOT/project-6.1-20090123.170629-92.pom.json
index bc6b24013b4..b4bb07628a6 100644
--- a/tests/packagedcode/data/m2/org/mortbay/jetty/project/6.1-SNAPSHOT/project-6.1-20090123.170629-92.pom.json
+++ b/tests/packagedcode/data/m2/org/mortbay/jetty/project/6.1-SNAPSHOT/project-6.1-20090123.170629-92.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "project", 
   "version": "6.1-SNAPSHOT", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.mortbay.jetty", 
     "artifact_id": "jetty-parent", 
diff --git a/tests/packagedcode/data/m2/org/mortbay/jetty/project/6.1-SNAPSHOT/project-6.1-20090123.170629-92.pom.package.json b/tests/packagedcode/data/m2/org/mortbay/jetty/project/6.1-SNAPSHOT/project-6.1-20090123.170629-92.pom.package.json
index 995916aa9d8..819d80bdb4a 100644
--- a/tests/packagedcode/data/m2/org/mortbay/jetty/project/6.1-SNAPSHOT/project-6.1-20090123.170629-92.pom.package.json
+++ b/tests/packagedcode/data/m2/org/mortbay/jetty/project/6.1-SNAPSHOT/project-6.1-20090123.170629-92.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.mortbay.jetty:project", 
+  "type": "maven", 
+  "namespace": "org.mortbay.jetty", 
+  "name": "project", 
   "version": "6.1-SNAPSHOT", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Jetty Server Project", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/mortbay/jetty/project/6.1-SNAPSHOT/project-6.1-SNAPSHOT.pom.json b/tests/packagedcode/data/m2/org/mortbay/jetty/project/6.1-SNAPSHOT/project-6.1-SNAPSHOT.pom.json
index bc6b24013b4..b4bb07628a6 100644
--- a/tests/packagedcode/data/m2/org/mortbay/jetty/project/6.1-SNAPSHOT/project-6.1-SNAPSHOT.pom.json
+++ b/tests/packagedcode/data/m2/org/mortbay/jetty/project/6.1-SNAPSHOT/project-6.1-SNAPSHOT.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "project", 
   "version": "6.1-SNAPSHOT", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.mortbay.jetty", 
     "artifact_id": "jetty-parent", 
diff --git a/tests/packagedcode/data/m2/org/mortbay/jetty/project/6.1-SNAPSHOT/project-6.1-SNAPSHOT.pom.package.json b/tests/packagedcode/data/m2/org/mortbay/jetty/project/6.1-SNAPSHOT/project-6.1-SNAPSHOT.pom.package.json
index 995916aa9d8..819d80bdb4a 100644
--- a/tests/packagedcode/data/m2/org/mortbay/jetty/project/6.1-SNAPSHOT/project-6.1-SNAPSHOT.pom.package.json
+++ b/tests/packagedcode/data/m2/org/mortbay/jetty/project/6.1-SNAPSHOT/project-6.1-SNAPSHOT.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.mortbay.jetty:project", 
+  "type": "maven", 
+  "namespace": "org.mortbay.jetty", 
+  "name": "project", 
   "version": "6.1-SNAPSHOT", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Jetty Server Project", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/mortbay/jetty/project/6.1.5/project-6.1.5.pom.json b/tests/packagedcode/data/m2/org/mortbay/jetty/project/6.1.5/project-6.1.5.pom.json
index 0d6d32eac53..0eb86eccc10 100644
--- a/tests/packagedcode/data/m2/org/mortbay/jetty/project/6.1.5/project-6.1.5.pom.json
+++ b/tests/packagedcode/data/m2/org/mortbay/jetty/project/6.1.5/project-6.1.5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "project", 
   "version": "6.1.5", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Jetty Server Project", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/mortbay/jetty/project/6.1.5/project-6.1.5.pom.package.json b/tests/packagedcode/data/m2/org/mortbay/jetty/project/6.1.5/project-6.1.5.pom.package.json
index 883a745c714..d3334d2bd8b 100644
--- a/tests/packagedcode/data/m2/org/mortbay/jetty/project/6.1.5/project-6.1.5.pom.package.json
+++ b/tests/packagedcode/data/m2/org/mortbay/jetty/project/6.1.5/project-6.1.5.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.mortbay.jetty:project", 
+  "type": "maven", 
+  "namespace": "org.mortbay.jetty", 
+  "name": "project", 
   "version": "6.1.5", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Jetty Server Project", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -82,9 +87,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "Apache License Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0", 
   "license_expression": null, 
+  "asserted_license": "Apache License Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/mortbay/jetty/servlet-api-2.5/6.1.5/servlet-api-2.5-6.1.5.pom.json b/tests/packagedcode/data/m2/org/mortbay/jetty/servlet-api-2.5/6.1.5/servlet-api-2.5-6.1.5.pom.json
index 1c681b4cde4..00da7fdf237 100644
--- a/tests/packagedcode/data/m2/org/mortbay/jetty/servlet-api-2.5/6.1.5/servlet-api-2.5-6.1.5.pom.json
+++ b/tests/packagedcode/data/m2/org/mortbay/jetty/servlet-api-2.5/6.1.5/servlet-api-2.5-6.1.5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "servlet-api-2.5", 
   "version": "6.1.5", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.mortbay.jetty", 
     "artifact_id": "project", 
diff --git a/tests/packagedcode/data/m2/org/mortbay/jetty/servlet-api-2.5/6.1.5/servlet-api-2.5-6.1.5.pom.package.json b/tests/packagedcode/data/m2/org/mortbay/jetty/servlet-api-2.5/6.1.5/servlet-api-2.5-6.1.5.pom.package.json
index ae7c9719003..3aa7a65d9bc 100644
--- a/tests/packagedcode/data/m2/org/mortbay/jetty/servlet-api-2.5/6.1.5/servlet-api-2.5-6.1.5.pom.package.json
+++ b/tests/packagedcode/data/m2/org/mortbay/jetty/servlet-api-2.5/6.1.5/servlet-api-2.5-6.1.5.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.mortbay.jetty:servlet-api-2.5", 
+  "type": "maven", 
+  "namespace": "org.mortbay.jetty", 
+  "name": "servlet-api-2.5", 
   "version": "6.1.5", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Servlet Specification 2.5 API", 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "CDDL 1.0\nhttps://glassfish.dev.java.net/public/CDDLv1.0.html", 
   "license_expression": null, 
+  "asserted_license": "CDDL 1.0\nhttps://glassfish.dev.java.net/public/CDDLv1.0.html", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/openqa/selenium/client-drivers/selenium-client-drivers/0.9.2/selenium-client-drivers-0.9.2.pom.json b/tests/packagedcode/data/m2/org/openqa/selenium/client-drivers/selenium-client-drivers/0.9.2/selenium-client-drivers-0.9.2.pom.json
index 26ef23ce7fe..d2855844b30 100644
--- a/tests/packagedcode/data/m2/org/openqa/selenium/client-drivers/selenium-client-drivers/0.9.2/selenium-client-drivers-0.9.2.pom.json
+++ b/tests/packagedcode/data/m2/org/openqa/selenium/client-drivers/selenium-client-drivers/0.9.2/selenium-client-drivers-0.9.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "selenium-client-drivers", 
   "version": "0.9.2", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.openqa.selenium", 
     "artifact_id": "selenium-rc", 
diff --git a/tests/packagedcode/data/m2/org/openqa/selenium/client-drivers/selenium-client-drivers/0.9.2/selenium-client-drivers-0.9.2.pom.package.json b/tests/packagedcode/data/m2/org/openqa/selenium/client-drivers/selenium-client-drivers/0.9.2/selenium-client-drivers-0.9.2.pom.package.json
index 7d78129a6bb..a55576dd4dc 100644
--- a/tests/packagedcode/data/m2/org/openqa/selenium/client-drivers/selenium-client-drivers/0.9.2/selenium-client-drivers-0.9.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/openqa/selenium/client-drivers/selenium-client-drivers/0.9.2/selenium-client-drivers-0.9.2.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.openqa.selenium.client-drivers:selenium-client-drivers", 
+  "type": "maven", 
+  "namespace": "org.openqa.selenium.client-drivers", 
+  "name": "selenium-client-drivers", 
   "version": "0.9.2", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Selenium RC Client Drivers", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,22 +23,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.openqa.selenium.core:selenium-core", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.openqa.selenium.server:selenium-server", 
-        "version": "0.9.2"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.openqa.selenium.core/selenium-core", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.openqa.selenium.server/selenium-server", 
+      "requirement": "0.9.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/openqa/selenium/client-drivers/selenium-java-client-driver/0.9.2/selenium-java-client-driver-0.9.2.pom.json b/tests/packagedcode/data/m2/org/openqa/selenium/client-drivers/selenium-java-client-driver/0.9.2/selenium-java-client-driver-0.9.2.pom.json
index 9a8b0db7417..7a36cca688f 100644
--- a/tests/packagedcode/data/m2/org/openqa/selenium/client-drivers/selenium-java-client-driver/0.9.2/selenium-java-client-driver-0.9.2.pom.json
+++ b/tests/packagedcode/data/m2/org/openqa/selenium/client-drivers/selenium-java-client-driver/0.9.2/selenium-java-client-driver-0.9.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "selenium-java-client-driver", 
   "version": "0.9.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.openqa.selenium.client-drivers", 
     "artifact_id": "selenium-client-drivers", 
diff --git a/tests/packagedcode/data/m2/org/openqa/selenium/client-drivers/selenium-java-client-driver/0.9.2/selenium-java-client-driver-0.9.2.pom.package.json b/tests/packagedcode/data/m2/org/openqa/selenium/client-drivers/selenium-java-client-driver/0.9.2/selenium-java-client-driver-0.9.2.pom.package.json
index bc065645271..8f5d4601b71 100644
--- a/tests/packagedcode/data/m2/org/openqa/selenium/client-drivers/selenium-java-client-driver/0.9.2/selenium-java-client-driver-0.9.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/openqa/selenium/client-drivers/selenium-java-client-driver/0.9.2/selenium-java-client-driver-0.9.2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.openqa.selenium.client-drivers:selenium-java-client-driver", 
+  "type": "maven", 
+  "namespace": "org.openqa.selenium.client-drivers", 
+  "name": "selenium-java-client-driver", 
   "version": "0.9.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Selenium RC Java Client Driver", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,24 +21,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.openqa.selenium.server:selenium-server", 
-        "version": "latest.release"
-      }
-    ], 
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.openqa.selenium.server/selenium-server", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/openqa/selenium/core/selenium-core/0.8.3/selenium-core-0.8.3.pom.json b/tests/packagedcode/data/m2/org/openqa/selenium/core/selenium-core/0.8.3/selenium-core-0.8.3.pom.json
index 20423aa530f..10217d49ddf 100644
--- a/tests/packagedcode/data/m2/org/openqa/selenium/core/selenium-core/0.8.3/selenium-core-0.8.3.pom.json
+++ b/tests/packagedcode/data/m2/org/openqa/selenium/core/selenium-core/0.8.3/selenium-core-0.8.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "selenium-core", 
   "version": "0.8.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Selenium Core", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/openqa/selenium/core/selenium-core/0.8.3/selenium-core-0.8.3.pom.package.json b/tests/packagedcode/data/m2/org/openqa/selenium/core/selenium-core/0.8.3/selenium-core-0.8.3.pom.package.json
index 9038b7ef968..e184f6ef89c 100644
--- a/tests/packagedcode/data/m2/org/openqa/selenium/core/selenium-core/0.8.3/selenium-core-0.8.3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/openqa/selenium/core/selenium-core/0.8.3/selenium-core-0.8.3.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.openqa.selenium.core:selenium-core", 
+  "type": "maven", 
+  "namespace": "org.openqa.selenium.core", 
+  "name": "selenium-core", 
   "version": "0.8.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Selenium Core", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,29 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.openqa.selenium.server:selenium-server-coreless", 
-        "version": "0.9.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "rhino:js", 
-        "version": "1.6R5"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.openqa.selenium.server/selenium-server-coreless", 
+      "requirement": "0.9.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:rhino/js", 
+      "requirement": "1.6R5", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/openqa/selenium/selenium-rc/0.9.1/selenium-rc-0.9.1.pom.json b/tests/packagedcode/data/m2/org/openqa/selenium/selenium-rc/0.9.1/selenium-rc-0.9.1.pom.json
index 5eb38ce1624..2ecc7e3fce8 100644
--- a/tests/packagedcode/data/m2/org/openqa/selenium/selenium-rc/0.9.1/selenium-rc-0.9.1.pom.json
+++ b/tests/packagedcode/data/m2/org/openqa/selenium/selenium-rc/0.9.1/selenium-rc-0.9.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "selenium-rc", 
   "version": "0.9.1", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Selenium RC", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/openqa/selenium/selenium-rc/0.9.1/selenium-rc-0.9.1.pom.package.json b/tests/packagedcode/data/m2/org/openqa/selenium/selenium-rc/0.9.1/selenium-rc-0.9.1.pom.package.json
index 888ecd7b83a..79b615d8856 100644
--- a/tests/packagedcode/data/m2/org/openqa/selenium/selenium-rc/0.9.1/selenium-rc-0.9.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/openqa/selenium/selenium-rc/0.9.1/selenium-rc-0.9.1.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.openqa.selenium:selenium-rc", 
+  "type": "maven", 
+  "namespace": "org.openqa.selenium", 
+  "name": "selenium-rc", 
   "version": "0.9.1", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Selenium RC", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/openqa/selenium/selenium-rc/0.9.2/selenium-rc-0.9.2.pom.json b/tests/packagedcode/data/m2/org/openqa/selenium/selenium-rc/0.9.2/selenium-rc-0.9.2.pom.json
index d50ec2d9e9d..63370ce5600 100644
--- a/tests/packagedcode/data/m2/org/openqa/selenium/selenium-rc/0.9.2/selenium-rc-0.9.2.pom.json
+++ b/tests/packagedcode/data/m2/org/openqa/selenium/selenium-rc/0.9.2/selenium-rc-0.9.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "selenium-rc", 
   "version": "0.9.2", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Selenium RC", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/openqa/selenium/selenium-rc/0.9.2/selenium-rc-0.9.2.pom.package.json b/tests/packagedcode/data/m2/org/openqa/selenium/selenium-rc/0.9.2/selenium-rc-0.9.2.pom.package.json
index 56115bc3214..9d5c08e2249 100644
--- a/tests/packagedcode/data/m2/org/openqa/selenium/selenium-rc/0.9.2/selenium-rc-0.9.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/openqa/selenium/selenium-rc/0.9.2/selenium-rc-0.9.2.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.openqa.selenium:selenium-rc", 
+  "type": "maven", 
+  "namespace": "org.openqa.selenium", 
+  "name": "selenium-rc", 
   "version": "0.9.2", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Selenium RC", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/openqa/selenium/server/selenium-server-coreless/0.9.1/selenium-server-coreless-0.9.1.pom.json b/tests/packagedcode/data/m2/org/openqa/selenium/server/selenium-server-coreless/0.9.1/selenium-server-coreless-0.9.1.pom.json
index 9d170fbc250..ece4989fe4e 100644
--- a/tests/packagedcode/data/m2/org/openqa/selenium/server/selenium-server-coreless/0.9.1/selenium-server-coreless-0.9.1.pom.json
+++ b/tests/packagedcode/data/m2/org/openqa/selenium/server/selenium-server-coreless/0.9.1/selenium-server-coreless-0.9.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "selenium-server-coreless", 
   "version": "0.9.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.openqa.selenium", 
     "artifact_id": "selenium-rc", 
diff --git a/tests/packagedcode/data/m2/org/openqa/selenium/server/selenium-server-coreless/0.9.1/selenium-server-coreless-0.9.1.pom.package.json b/tests/packagedcode/data/m2/org/openqa/selenium/server/selenium-server-coreless/0.9.1/selenium-server-coreless-0.9.1.pom.package.json
index cd8a4bc5a15..01c0871bcf8 100644
--- a/tests/packagedcode/data/m2/org/openqa/selenium/server/selenium-server-coreless/0.9.1/selenium-server-coreless-0.9.1.pom.package.json
+++ b/tests/packagedcode/data/m2/org/openqa/selenium/server/selenium-server-coreless/0.9.1/selenium-server-coreless-0.9.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.openqa.selenium.server:selenium-server-coreless", 
+  "type": "maven", 
+  "namespace": "org.openqa.selenium.server", 
+  "name": "selenium-server-coreless", 
   "version": "0.9.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Selenium RC Server (Coreless)", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,39 +21,50 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "ant:ant", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jetty:org.mortbay.jetty", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:servlet-api", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:ant/ant", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jetty/org.mortbay.jetty", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/servlet-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/openqa/selenium/server/selenium-server-coreless/0.9.2/selenium-server-coreless-0.9.2.pom.json b/tests/packagedcode/data/m2/org/openqa/selenium/server/selenium-server-coreless/0.9.2/selenium-server-coreless-0.9.2.pom.json
index 193913216f9..54472258b68 100644
--- a/tests/packagedcode/data/m2/org/openqa/selenium/server/selenium-server-coreless/0.9.2/selenium-server-coreless-0.9.2.pom.json
+++ b/tests/packagedcode/data/m2/org/openqa/selenium/server/selenium-server-coreless/0.9.2/selenium-server-coreless-0.9.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "selenium-server-coreless", 
   "version": "0.9.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.openqa.selenium", 
     "artifact_id": "selenium-rc", 
diff --git a/tests/packagedcode/data/m2/org/openqa/selenium/server/selenium-server-coreless/0.9.2/selenium-server-coreless-0.9.2.pom.package.json b/tests/packagedcode/data/m2/org/openqa/selenium/server/selenium-server-coreless/0.9.2/selenium-server-coreless-0.9.2.pom.package.json
index f2f0bad0118..8f8be196d7b 100644
--- a/tests/packagedcode/data/m2/org/openqa/selenium/server/selenium-server-coreless/0.9.2/selenium-server-coreless-0.9.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/openqa/selenium/server/selenium-server-coreless/0.9.2/selenium-server-coreless-0.9.2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.openqa.selenium.server:selenium-server-coreless", 
+  "type": "maven", 
+  "namespace": "org.openqa.selenium.server", 
+  "name": "selenium-server-coreless", 
   "version": "0.9.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Selenium RC Server (Coreless)", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,44 +21,58 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "ant:ant", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jetty:org.mortbay.jetty", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:servlet-api", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "bouncycastle:bcprov-jdk15", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:ant/ant", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jetty/org.mortbay.jetty", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/servlet-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:bouncycastle/bcprov-jdk15", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/openqa/selenium/server/selenium-server/0.9.2/selenium-server-0.9.2.pom.json b/tests/packagedcode/data/m2/org/openqa/selenium/server/selenium-server/0.9.2/selenium-server-0.9.2.pom.json
index dec949d9925..15deb513be1 100644
--- a/tests/packagedcode/data/m2/org/openqa/selenium/server/selenium-server/0.9.2/selenium-server-0.9.2.pom.json
+++ b/tests/packagedcode/data/m2/org/openqa/selenium/server/selenium-server/0.9.2/selenium-server-0.9.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "selenium-server", 
   "version": "0.9.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.openqa.selenium", 
     "artifact_id": "selenium-rc", 
diff --git a/tests/packagedcode/data/m2/org/openqa/selenium/server/selenium-server/0.9.2/selenium-server-0.9.2.pom.package.json b/tests/packagedcode/data/m2/org/openqa/selenium/server/selenium-server/0.9.2/selenium-server-0.9.2.pom.package.json
index c772ffc9d5e..0a1b5322173 100644
--- a/tests/packagedcode/data/m2/org/openqa/selenium/server/selenium-server/0.9.2/selenium-server-0.9.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/openqa/selenium/server/selenium-server/0.9.2/selenium-server-0.9.2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.openqa.selenium.server:selenium-server", 
+  "type": "maven", 
+  "namespace": "org.openqa.selenium.server", 
+  "name": "selenium-server", 
   "version": "0.9.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Selenium RC Server", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,22 +21,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.openqa.selenium.server:selenium-server-coreless", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.openqa.selenium.core:selenium-core", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.openqa.selenium.server/selenium-server-coreless", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.openqa.selenium.core/selenium-core", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/slf4j/slf4j-api/1.4.2/slf4j-api-1.4.2.pom.json b/tests/packagedcode/data/m2/org/slf4j/slf4j-api/1.4.2/slf4j-api-1.4.2.pom.json
index f7dc8c8fe3f..30f02d2df10 100644
--- a/tests/packagedcode/data/m2/org/slf4j/slf4j-api/1.4.2/slf4j-api-1.4.2.pom.json
+++ b/tests/packagedcode/data/m2/org/slf4j/slf4j-api/1.4.2/slf4j-api-1.4.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "slf4j-api", 
   "version": "1.4.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.slf4j", 
     "artifact_id": "slf4j-parent", 
diff --git a/tests/packagedcode/data/m2/org/slf4j/slf4j-api/1.4.2/slf4j-api-1.4.2.pom.package.json b/tests/packagedcode/data/m2/org/slf4j/slf4j-api/1.4.2/slf4j-api-1.4.2.pom.package.json
index 858caea0594..e4eca75f311 100644
--- a/tests/packagedcode/data/m2/org/slf4j/slf4j-api/1.4.2/slf4j-api-1.4.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/slf4j/slf4j-api/1.4.2/slf4j-api-1.4.2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.slf4j:slf4j-api", 
+  "type": "maven", 
+  "namespace": "org.slf4j", 
+  "name": "slf4j-api", 
   "version": "1.4.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "The slf4j API", 
+  "description": "SLF4J API Module\nThe slf4j API", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/slf4j/slf4j-log4j12/1.4.2/slf4j-log4j12-1.4.2.pom.json b/tests/packagedcode/data/m2/org/slf4j/slf4j-log4j12/1.4.2/slf4j-log4j12-1.4.2.pom.json
index 6a01d150f71..a0240e5fb3f 100644
--- a/tests/packagedcode/data/m2/org/slf4j/slf4j-log4j12/1.4.2/slf4j-log4j12-1.4.2.pom.json
+++ b/tests/packagedcode/data/m2/org/slf4j/slf4j-log4j12/1.4.2/slf4j-log4j12-1.4.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "slf4j-log4j12", 
   "version": "1.4.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.slf4j", 
     "artifact_id": "slf4j-parent", 
diff --git a/tests/packagedcode/data/m2/org/slf4j/slf4j-log4j12/1.4.2/slf4j-log4j12-1.4.2.pom.package.json b/tests/packagedcode/data/m2/org/slf4j/slf4j-log4j12/1.4.2/slf4j-log4j12-1.4.2.pom.package.json
index 25337378b10..b1b2626f5bf 100644
--- a/tests/packagedcode/data/m2/org/slf4j/slf4j-log4j12/1.4.2/slf4j-log4j12-1.4.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/slf4j/slf4j-log4j12/1.4.2/slf4j-log4j12-1.4.2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.slf4j:slf4j-log4j12", 
+  "type": "maven", 
+  "namespace": "org.slf4j", 
+  "name": "slf4j-log4j12", 
   "version": "1.4.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "The slf4j log4j-12 binding", 
+  "description": "SLF4J LOG4J-12 Binding\nThe slf4j log4j-12 binding", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,22 +21,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.slf4j:slf4j-api", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "log4j:log4j", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.slf4j/slf4j-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:log4j/log4j", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/slf4j/slf4j-parent/1.4.2/slf4j-parent-1.4.2.pom.json b/tests/packagedcode/data/m2/org/slf4j/slf4j-parent/1.4.2/slf4j-parent-1.4.2.pom.json
index 2b46fbcfe73..aebba032640 100644
--- a/tests/packagedcode/data/m2/org/slf4j/slf4j-parent/1.4.2/slf4j-parent-1.4.2.pom.json
+++ b/tests/packagedcode/data/m2/org/slf4j/slf4j-parent/1.4.2/slf4j-parent-1.4.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "slf4j-parent", 
   "version": "1.4.2", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "SLF4J", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/slf4j/slf4j-parent/1.4.2/slf4j-parent-1.4.2.pom.package.json b/tests/packagedcode/data/m2/org/slf4j/slf4j-parent/1.4.2/slf4j-parent-1.4.2.pom.package.json
index c8a84d5163b..7a920eb475c 100644
--- a/tests/packagedcode/data/m2/org/slf4j/slf4j-parent/1.4.2/slf4j-parent-1.4.2.pom.package.json
+++ b/tests/packagedcode/data/m2/org/slf4j/slf4j-parent/1.4.2/slf4j-parent-1.4.2.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.slf4j:slf4j-parent", 
+  "type": "maven", 
+  "namespace": "org.slf4j", 
+  "name": "slf4j-parent", 
   "version": "1.4.2", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "SLF4J", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,17 +31,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/springframework/spring-aop/2.5.3/spring-aop-2.5.3.pom.json b/tests/packagedcode/data/m2/org/springframework/spring-aop/2.5.3/spring-aop-2.5.3.pom.json
index 9dd647279c2..9ec2415596a 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring-aop/2.5.3/spring-aop-2.5.3.pom.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring-aop/2.5.3/spring-aop-2.5.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "spring-aop", 
   "version": "2.5.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Spring Framework: AOP", 
   "description": "Spring Framework: AOP", 
diff --git a/tests/packagedcode/data/m2/org/springframework/spring-aop/2.5.3/spring-aop-2.5.3.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring-aop/2.5.3/spring-aop-2.5.3.pom.package.json
index 02413aa6fe7..6541632e1ab 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring-aop/2.5.3/spring-aop-2.5.3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring-aop/2.5.3/spring-aop-2.5.3.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.springframework:spring-aop", 
+  "type": "maven", 
+  "namespace": "org.springframework", 
+  "name": "spring-aop", 
   "version": "2.5.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Spring Framework: AOP", 
@@ -26,72 +29,106 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "aopalliance:aopalliance", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "aspectj:aspectjrt", 
-        "version": "1.5.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "aspectj:aspectjweaver", 
-        "version": "1.5.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "cglib:cglib-nodep", 
-        "version": "2.1_3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-attributes:commons-attributes-api", 
-        "version": "2.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-attributes:commons-attributes-compiler", 
-        "version": "2.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-pool:commons-pool", 
-        "version": "1.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.jamonapi:jamon", 
-        "version": "2.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "oro:oro", 
-        "version": "2.0.8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-beans", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-core", 
-        "version": "2.5.3"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:aopalliance/aopalliance", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:aspectj/aspectjrt", 
+      "requirement": "1.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:aspectj/aspectjweaver", 
+      "requirement": "1.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:cglib/cglib-nodep", 
+      "requirement": "2.1_3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-attributes/commons-attributes-api", 
+      "requirement": "2.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-attributes/commons-attributes-compiler", 
+      "requirement": "2.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-pool/commons-pool", 
+      "requirement": "1.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.jamonapi/jamon", 
+      "requirement": "2.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:oro/oro", 
+      "requirement": "2.0.8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-beans", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-core", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/springframework/spring-aspects/2.5.3/spring-aspects-2.5.3.pom.json b/tests/packagedcode/data/m2/org/springframework/spring-aspects/2.5.3/spring-aspects-2.5.3.pom.json
index deed515ff65..8c8bca377a4 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring-aspects/2.5.3/spring-aspects-2.5.3.pom.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring-aspects/2.5.3/spring-aspects-2.5.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "spring-aspects", 
   "version": "2.5.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Spring Framework: Aspects", 
   "description": "Spring Framework: Aspects", 
diff --git a/tests/packagedcode/data/m2/org/springframework/spring-aspects/2.5.3/spring-aspects-2.5.3.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring-aspects/2.5.3/spring-aspects-2.5.3.pom.package.json
index c90e9b61e21..0c0bd10a96d 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring-aspects/2.5.3/spring-aspects-2.5.3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring-aspects/2.5.3/spring-aspects-2.5.3.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.springframework:spring-aspects", 
+  "type": "maven", 
+  "namespace": "org.springframework", 
+  "name": "spring-aspects", 
   "version": "2.5.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Spring Framework: Aspects", 
@@ -26,37 +29,50 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "aspectj:aspectjrt", 
-        "version": "1.5.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "aspectj:aspectjweaver", 
-        "version": "1.5.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-beans", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-tx", 
-        "version": "2.5.3"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:aspectj/aspectjrt", 
+      "requirement": "1.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:aspectj/aspectjweaver", 
+      "requirement": "1.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-beans", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-tx", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/springframework/spring-aspects/2.5.4/spring-aspects-2.5.4.pom.json b/tests/packagedcode/data/m2/org/springframework/spring-aspects/2.5.4/spring-aspects-2.5.4.pom.json
index 276c9f52a18..3801c149e96 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring-aspects/2.5.4/spring-aspects-2.5.4.pom.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring-aspects/2.5.4/spring-aspects-2.5.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "spring-aspects", 
   "version": "2.5.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Spring Framework: Aspects", 
   "description": "Spring Framework: Aspects", 
diff --git a/tests/packagedcode/data/m2/org/springframework/spring-aspects/2.5.4/spring-aspects-2.5.4.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring-aspects/2.5.4/spring-aspects-2.5.4.pom.package.json
index e7111b93c6c..74aa055ccd0 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring-aspects/2.5.4/spring-aspects-2.5.4.pom.package.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring-aspects/2.5.4/spring-aspects-2.5.4.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.springframework:spring-aspects", 
+  "type": "maven", 
+  "namespace": "org.springframework", 
+  "name": "spring-aspects", 
   "version": "2.5.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Spring Framework: Aspects", 
@@ -26,37 +29,50 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "aspectj:aspectjrt", 
-        "version": "1.5.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "aspectj:aspectjweaver", 
-        "version": "1.5.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-beans", 
-        "version": "2.5.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-tx", 
-        "version": "2.5.4"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:aspectj/aspectjrt", 
+      "requirement": "1.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:aspectj/aspectjweaver", 
+      "requirement": "1.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-beans", 
+      "requirement": "2.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-tx", 
+      "requirement": "2.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/springframework/spring-beans/2.5.3/spring-beans-2.5.3.pom.json b/tests/packagedcode/data/m2/org/springframework/spring-beans/2.5.3/spring-beans-2.5.3.pom.json
index fd841f5c80a..dfcb30e3846 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring-beans/2.5.3/spring-beans-2.5.3.pom.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring-beans/2.5.3/spring-beans-2.5.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "spring-beans", 
   "version": "2.5.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Spring Framework: Beans", 
   "description": "Spring Framework: Beans", 
diff --git a/tests/packagedcode/data/m2/org/springframework/spring-beans/2.5.3/spring-beans-2.5.3.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring-beans/2.5.3/spring-beans-2.5.3.pom.package.json
index 9b0ab6adb9d..521c5a0b034 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring-beans/2.5.3/spring-beans-2.5.3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring-beans/2.5.3/spring-beans-2.5.3.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.springframework:spring-beans", 
+  "type": "maven", 
+  "namespace": "org.springframework", 
+  "name": "spring-beans", 
   "version": "2.5.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Spring Framework: Beans", 
@@ -26,27 +29,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "cglib:cglib-nodep", 
-        "version": "2.1_3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-core", 
-        "version": "2.5.3"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:cglib/cglib-nodep", 
+      "requirement": "2.1_3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-core", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/springframework/spring-context-support/2.5.3/spring-context-support-2.5.3.pom.json b/tests/packagedcode/data/m2/org/springframework/spring-context-support/2.5.3/spring-context-support-2.5.3.pom.json
index e505d9ff88c..3797f430bd7 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring-context-support/2.5.3/spring-context-support-2.5.3.pom.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring-context-support/2.5.3/spring-context-support-2.5.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "spring-context-support", 
   "version": "2.5.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Spring Framework: Context Support", 
   "description": "Spring Framework: Context Support", 
diff --git a/tests/packagedcode/data/m2/org/springframework/spring-context-support/2.5.3/spring-context-support-2.5.3.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring-context-support/2.5.3/spring-context-support-2.5.3.pom.package.json
index ad90aa9ad43..2233e33a859 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring-context-support/2.5.3/spring-context-support-2.5.3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring-context-support/2.5.3/spring-context-support-2.5.3.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.springframework:spring-context-support", 
+  "type": "maven", 
+  "namespace": "org.springframework", 
+  "name": "spring-context-support", 
   "version": "2.5.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Spring Framework: Context Support", 
@@ -26,134 +29,202 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "aopalliance:aopalliance", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "cglib:cglib-nodep", 
-        "version": "2.1_3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-collections:commons-collections", 
-        "version": "3.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.bea.wlplatform:commonj-twm", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "freemarker:freemarker", 
-        "version": "2.3.12"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "groovy:groovy", 
-        "version": "1.5.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jasperreports:jasperreports", 
-        "version": "2.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jruby:jruby-bin", 
-        "version": "1.0.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "net.sf.ehcache:ehcache", 
-        "version": "1.3.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.oracle:oc4j", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.beanshell:bsh", 
-        "version": "2.0b4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "opensymphony:quartz-all", 
-        "version": "1.6.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "velocity:velocity", 
-        "version": "1.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "velocity-tools:velocity-tools-generic", 
-        "version": "1.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "velocity-tools:velocity-tools-view", 
-        "version": "1.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-aop", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-beans", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-context", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-core", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-jdbc", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-tx", 
-        "version": "2.5.3"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.activation:activation", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.mail:mail", 
-        "version": "1.4"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:aopalliance/aopalliance", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:cglib/cglib-nodep", 
+      "requirement": "2.1_3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-collections/commons-collections", 
+      "requirement": "3.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.bea.wlplatform/commonj-twm", 
+      "requirement": "1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:freemarker/freemarker", 
+      "requirement": "2.3.12", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:groovy/groovy", 
+      "requirement": "1.5.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jasperreports/jasperreports", 
+      "requirement": "2.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jruby/jruby-bin", 
+      "requirement": "1.0.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:net.sf.ehcache/ehcache", 
+      "requirement": "1.3.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.oracle/oc4j", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.beanshell/bsh", 
+      "requirement": "2.0b4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:opensymphony/quartz-all", 
+      "requirement": "1.6.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:velocity/velocity", 
+      "requirement": "1.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:velocity-tools/velocity-tools-generic", 
+      "requirement": "1.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:velocity-tools/velocity-tools-view", 
+      "requirement": "1.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-aop", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-beans", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-context", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-core", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-jdbc", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-tx", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.activation/activation", 
+      "requirement": "1.1", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.mail/mail", 
+      "requirement": "1.4", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/springframework/spring-context/2.5.3/spring-context-2.5.3.pom.json b/tests/packagedcode/data/m2/org/springframework/spring-context/2.5.3/spring-context-2.5.3.pom.json
index 850047f67e5..86c972231db 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring-context/2.5.3/spring-context-2.5.3.pom.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring-context/2.5.3/spring-context-2.5.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "spring-context", 
   "version": "2.5.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Spring Framework: Context", 
   "description": "Spring Framework: Context", 
diff --git a/tests/packagedcode/data/m2/org/springframework/spring-context/2.5.3/spring-context-2.5.3.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring-context/2.5.3/spring-context-2.5.3.pom.package.json
index af7cf2998a0..3bdbe1a54de 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring-context/2.5.3/spring-context-2.5.3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring-context/2.5.3/spring-context-2.5.3.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.springframework:spring-context", 
+  "type": "maven", 
+  "namespace": "org.springframework", 
+  "name": "spring-context", 
   "version": "2.5.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Spring Framework: Context", 
@@ -26,69 +29,98 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "aopalliance:aopalliance", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "backport-util-concurrent:backport-util-concurrent", 
-        "version": "3.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.bea.wlplatform:commonj-twm", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-agent", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-aop", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-beans", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-core", 
-        "version": "2.5.3"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.ejb:ejb", 
-        "version": "3.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.jms:jms", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.xml:jaxrpc-api", 
-        "version": "1.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:aopalliance/aopalliance", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:backport-util-concurrent/backport-util-concurrent", 
+      "requirement": "3.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.bea.wlplatform/commonj-twm", 
+      "requirement": "1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-agent", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-aop", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-beans", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-core", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.ejb/ejb", 
+      "requirement": "3.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.jms/jms", 
+      "requirement": "1.1", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.xml/jaxrpc-api", 
+      "requirement": "1.1", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/springframework/spring-core/2.5.3/spring-core-2.5.3.pom.json b/tests/packagedcode/data/m2/org/springframework/spring-core/2.5.3/spring-core-2.5.3.pom.json
index 6fd045ae8a9..dc4b2418dd7 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring-core/2.5.3/spring-core-2.5.3.pom.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring-core/2.5.3/spring-core-2.5.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "spring-core", 
   "version": "2.5.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Spring Framework: Core", 
   "description": "Spring Framework: Core", 
diff --git a/tests/packagedcode/data/m2/org/springframework/spring-core/2.5.3/spring-core-2.5.3.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring-core/2.5.3/spring-core-2.5.3.pom.package.json
index edcd2a17c2d..45795a54b1f 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring-core/2.5.3/spring-core-2.5.3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring-core/2.5.3/spring-core-2.5.3.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.springframework:spring-core", 
+  "type": "maven", 
+  "namespace": "org.springframework", 
+  "name": "spring-core", 
   "version": "2.5.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Spring Framework: Core", 
@@ -26,47 +29,66 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "asm:asm", 
-        "version": "2.2.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "asm:asm-commons", 
-        "version": "2.2.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "asm:asm-util", 
-        "version": "2.2.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "backport-util-concurrent:backport-util-concurrent", 
-        "version": "3.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-collections:commons-collections", 
-        "version": "3.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "log4j:log4j", 
-        "version": "1.2.13"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:asm/asm", 
+      "requirement": "2.2.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:asm/asm-commons", 
+      "requirement": "2.2.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:asm/asm-util", 
+      "requirement": "2.2.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:backport-util-concurrent/backport-util-concurrent", 
+      "requirement": "3.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-collections/commons-collections", 
+      "requirement": "3.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:log4j/log4j", 
+      "requirement": "1.2.13", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/springframework/spring-jdbc/2.5.3/spring-jdbc-2.5.3.pom.json b/tests/packagedcode/data/m2/org/springframework/spring-jdbc/2.5.3/spring-jdbc-2.5.3.pom.json
index 3d0db5fa38e..ada097e64af 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring-jdbc/2.5.3/spring-jdbc-2.5.3.pom.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring-jdbc/2.5.3/spring-jdbc-2.5.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "spring-jdbc", 
   "version": "2.5.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Spring Framework: JDBC", 
   "description": "Spring Framework: JDBC", 
diff --git a/tests/packagedcode/data/m2/org/springframework/spring-jdbc/2.5.3/spring-jdbc-2.5.3.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring-jdbc/2.5.3/spring-jdbc-2.5.3.pom.package.json
index 2269cebbfce..fb8a18e887e 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring-jdbc/2.5.3/spring-jdbc-2.5.3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring-jdbc/2.5.3/spring-jdbc-2.5.3.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.springframework:spring-jdbc", 
+  "type": "maven", 
+  "namespace": "org.springframework", 
+  "name": "spring-jdbc", 
   "version": "2.5.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Spring Framework: JDBC", 
@@ -26,52 +29,74 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "c3p0:c3p0", 
-        "version": "0.9.1.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-dbcp:commons-dbcp", 
-        "version": "1.2.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jotm:jotm", 
-        "version": "2.0.10"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-beans", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-context", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-core", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-tx", 
-        "version": "2.5.3"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:c3p0/c3p0", 
+      "requirement": "0.9.1.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-dbcp/commons-dbcp", 
+      "requirement": "1.2.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jotm/jotm", 
+      "requirement": "2.0.10", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-beans", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-context", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-core", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-tx", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/springframework/spring-orm/2.5.3/spring-orm-2.5.3.pom.json b/tests/packagedcode/data/m2/org/springframework/spring-orm/2.5.3/spring-orm-2.5.3.pom.json
index 1aa563c1c59..7ed4bda074f 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring-orm/2.5.3/spring-orm-2.5.3.pom.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring-orm/2.5.3/spring-orm-2.5.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "spring-orm", 
   "version": "2.5.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Spring Framework: ORM", 
   "description": "Spring Framework: ORM", 
diff --git a/tests/packagedcode/data/m2/org/springframework/spring-orm/2.5.3/spring-orm-2.5.3.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring-orm/2.5.3/spring-orm-2.5.3.pom.package.json
index 20fed2f093e..435e65fdef6 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring-orm/2.5.3/spring-orm-2.5.3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring-orm/2.5.3/spring-orm-2.5.3.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.springframework:spring-orm", 
+  "type": "maven", 
+  "namespace": "org.springframework", 
+  "name": "spring-orm", 
   "version": "2.5.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Spring Framework: ORM", 
@@ -26,94 +29,138 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "aopalliance:aopalliance", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.oracle:toplink-essentials", 
-        "version": "2.41"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.oracle.toplink:toplink", 
-        "version": "10.1.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.ibatis:ibatis-sqlmap", 
-        "version": "2.3.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.hibernate:hibernate", 
-        "version": "3.2.6.ga"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.hibernate:hibernate-entitymanager", 
-        "version": "3.3.1.ga"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-aop", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-beans", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-context", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-core", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-jdbc", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-tx", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-web", 
-        "version": "2.5.3"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.jdo:jdo2-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.persistence:persistence-api", 
-        "version": "1.0"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:aopalliance/aopalliance", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.oracle/toplink-essentials", 
+      "requirement": "2.41", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.oracle.toplink/toplink", 
+      "requirement": "10.1.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.ibatis/ibatis-sqlmap", 
+      "requirement": "2.3.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.hibernate/hibernate", 
+      "requirement": "3.2.6.ga", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.hibernate/hibernate-entitymanager", 
+      "requirement": "3.3.1.ga", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-aop", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-beans", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-context", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-core", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-jdbc", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-tx", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-web", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.jdo/jdo2-api", 
+      "requirement": "2.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.persistence/persistence-api", 
+      "requirement": "1.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/springframework/spring-test/2.5.3/spring-test-2.5.3.pom.json b/tests/packagedcode/data/m2/org/springframework/spring-test/2.5.3/spring-test-2.5.3.pom.json
index fd501c9c3c7..bde67c41178 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring-test/2.5.3/spring-test-2.5.3.pom.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring-test/2.5.3/spring-test-2.5.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "spring-test", 
   "version": "2.5.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Spring Framework: Test", 
   "description": "Spring Framework: Test", 
diff --git a/tests/packagedcode/data/m2/org/springframework/spring-test/2.5.3/spring-test-2.5.3.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring-test/2.5.3/spring-test-2.5.3.pom.package.json
index 4e7880a0f6d..a076c88e8c1 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring-test/2.5.3/spring-test-2.5.3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring-test/2.5.3/spring-test-2.5.3.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.springframework:spring-test", 
+  "type": "maven", 
+  "namespace": "org.springframework", 
+  "name": "spring-test", 
   "version": "2.5.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Spring Framework: Test", 
@@ -26,94 +29,138 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "aspectj:aspectjrt", 
-        "version": "1.5.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "aspectj:aspectjweaver", 
-        "version": "1.5.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "taglibs:standard", 
-        "version": "1.1.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-beans", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-context", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-core", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-jdbc", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-orm", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-tx", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-webmvc", 
-        "version": "2.5.3"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.persistence:persistence-api", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.portlet:portlet-api", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:jsp-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:servlet-api", 
-        "version": "2.4"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:aspectj/aspectjrt", 
+      "requirement": "1.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:aspectj/aspectjweaver", 
+      "requirement": "1.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:taglibs/standard", 
+      "requirement": "1.1.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-beans", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-context", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-core", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-jdbc", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-orm", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-tx", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-webmvc", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.persistence/persistence-api", 
+      "requirement": "1.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.portlet/portlet-api", 
+      "requirement": "1.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/jsp-api", 
+      "requirement": "2.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/servlet-api", 
+      "requirement": "2.4", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/springframework/spring-test/2.5.4/spring-test-2.5.4.pom.json b/tests/packagedcode/data/m2/org/springframework/spring-test/2.5.4/spring-test-2.5.4.pom.json
index 62ad8793492..b5a21035b3e 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring-test/2.5.4/spring-test-2.5.4.pom.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring-test/2.5.4/spring-test-2.5.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "spring-test", 
   "version": "2.5.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Spring Framework: Test", 
   "description": "Spring Framework: Test", 
diff --git a/tests/packagedcode/data/m2/org/springframework/spring-test/2.5.4/spring-test-2.5.4.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring-test/2.5.4/spring-test-2.5.4.pom.package.json
index 202a4864c07..d6ad068b0d3 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring-test/2.5.4/spring-test-2.5.4.pom.package.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring-test/2.5.4/spring-test-2.5.4.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.springframework:spring-test", 
+  "type": "maven", 
+  "namespace": "org.springframework", 
+  "name": "spring-test", 
   "version": "2.5.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Spring Framework: Test", 
@@ -26,94 +29,138 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "aspectj:aspectjrt", 
-        "version": "1.5.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "aspectj:aspectjweaver", 
-        "version": "1.5.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "taglibs:standard", 
-        "version": "1.1.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-beans", 
-        "version": "2.5.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-context", 
-        "version": "2.5.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-core", 
-        "version": "2.5.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-jdbc", 
-        "version": "2.5.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-orm", 
-        "version": "2.5.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-tx", 
-        "version": "2.5.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-webmvc", 
-        "version": "2.5.4"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.persistence:persistence-api", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.portlet:portlet-api", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:jsp-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:servlet-api", 
-        "version": "2.4"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:aspectj/aspectjrt", 
+      "requirement": "1.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:aspectj/aspectjweaver", 
+      "requirement": "1.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:taglibs/standard", 
+      "requirement": "1.1.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-beans", 
+      "requirement": "2.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-context", 
+      "requirement": "2.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-core", 
+      "requirement": "2.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-jdbc", 
+      "requirement": "2.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-orm", 
+      "requirement": "2.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-tx", 
+      "requirement": "2.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-webmvc", 
+      "requirement": "2.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.persistence/persistence-api", 
+      "requirement": "1.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.portlet/portlet-api", 
+      "requirement": "1.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/jsp-api", 
+      "requirement": "2.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/servlet-api", 
+      "requirement": "2.4", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/springframework/spring-tx/2.5.3/spring-tx-2.5.3.pom.json b/tests/packagedcode/data/m2/org/springframework/spring-tx/2.5.3/spring-tx-2.5.3.pom.json
index ac072be3356..89aca02bd72 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring-tx/2.5.3/spring-tx-2.5.3.pom.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring-tx/2.5.3/spring-tx-2.5.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "spring-tx", 
   "version": "2.5.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Spring Framework: Transaction", 
   "description": "Spring Framework: Transaction", 
diff --git a/tests/packagedcode/data/m2/org/springframework/spring-tx/2.5.3/spring-tx-2.5.3.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring-tx/2.5.3/spring-tx-2.5.3.pom.package.json
index b092ace5650..94f316fc6d9 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring-tx/2.5.3/spring-tx-2.5.3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring-tx/2.5.3/spring-tx-2.5.3.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.springframework:spring-tx", 
+  "type": "maven", 
+  "namespace": "org.springframework", 
+  "name": "spring-tx", 
   "version": "2.5.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Spring Framework: Transaction", 
@@ -26,64 +29,90 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "aopalliance:aopalliance", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.experlog:xapool", 
-        "version": "1.5.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jotm:jotm", 
-        "version": "2.0.10"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-aop", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-beans", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-context", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-core", 
-        "version": "2.5.3"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.resource:connector-api", 
-        "version": "1.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.transaction:jta", 
-        "version": "1.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:aopalliance/aopalliance", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.experlog/xapool", 
+      "requirement": "1.5.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jotm/jotm", 
+      "requirement": "2.0.10", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-aop", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-beans", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-context", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-core", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.resource/connector-api", 
+      "requirement": "1.5", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.transaction/jta", 
+      "requirement": "1.1", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/springframework/spring-web/2.5.3/spring-web-2.5.3.pom.json b/tests/packagedcode/data/m2/org/springframework/spring-web/2.5.3/spring-web-2.5.3.pom.json
index a791d95177f..cccb683deb2 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring-web/2.5.3/spring-web-2.5.3.pom.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring-web/2.5.3/spring-web-2.5.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "spring-web", 
   "version": "2.5.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Spring Framework: Web", 
   "description": "Spring Framework: Web", 
diff --git a/tests/packagedcode/data/m2/org/springframework/spring-web/2.5.3/spring-web-2.5.3.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring-web/2.5.3/spring-web-2.5.3.pom.package.json
index c099a58fa3c..f07a5174e2b 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring-web/2.5.3/spring-web-2.5.3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring-web/2.5.3/spring-web-2.5.3.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.springframework:spring-web", 
+  "type": "maven", 
+  "namespace": "org.springframework", 
+  "name": "spring-web", 
   "version": "2.5.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Spring Framework: Web", 
@@ -26,89 +29,130 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-beanutils:commons-beanutils", 
-        "version": "1.7.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-fileupload:commons-fileupload", 
-        "version": "1.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-httpclient:commons-httpclient", 
-        "version": "3.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "hessian:hessian", 
-        "version": "3.1.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "log4j:log4j", 
-        "version": "1.2.13"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.axis:axis", 
-        "version": "1.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "struts:struts", 
-        "version": "1.2.9"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "taglibs:standard", 
-        "version": "1.1.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-beans", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-context", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-core", 
-        "version": "2.5.3"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.faces:jsf-api", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:jsp-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:servlet-api", 
-        "version": "2.4"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:commons-beanutils/commons-beanutils", 
+      "requirement": "1.7.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-fileupload/commons-fileupload", 
+      "requirement": "1.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-httpclient/commons-httpclient", 
+      "requirement": "3.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:hessian/hessian", 
+      "requirement": "3.1.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:log4j/log4j", 
+      "requirement": "1.2.13", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.axis/axis", 
+      "requirement": "1.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:struts/struts", 
+      "requirement": "1.2.9", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:taglibs/standard", 
+      "requirement": "1.1.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-beans", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-context", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-core", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.faces/jsf-api", 
+      "requirement": "1.1", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/jsp-api", 
+      "requirement": "2.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/servlet-api", 
+      "requirement": "2.4", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/springframework/spring-webmvc/2.5.3/spring-webmvc-2.5.3.pom.json b/tests/packagedcode/data/m2/org/springframework/spring-webmvc/2.5.3/spring-webmvc-2.5.3.pom.json
index ceba9c0c891..d55592dfd1a 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring-webmvc/2.5.3/spring-webmvc-2.5.3.pom.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring-webmvc/2.5.3/spring-webmvc-2.5.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "spring-webmvc", 
   "version": "2.5.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Spring Framework: Web MVC", 
   "description": "Spring Framework: Web MVC", 
diff --git a/tests/packagedcode/data/m2/org/springframework/spring-webmvc/2.5.3/spring-webmvc-2.5.3.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring-webmvc/2.5.3/spring-webmvc-2.5.3.pom.package.json
index 02208e9a70d..858f61a6c97 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring-webmvc/2.5.3/spring-webmvc-2.5.3.pom.package.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring-webmvc/2.5.3/spring-webmvc-2.5.3.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.springframework:spring-webmvc", 
+  "type": "maven", 
+  "namespace": "org.springframework", 
+  "name": "spring-webmvc", 
   "version": "2.5.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Spring Framework: Web MVC", 
@@ -26,124 +29,186 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-attributes:commons-attributes-api", 
-        "version": "2.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-attributes:commons-attributes-compiler", 
-        "version": "2.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.lowagie:itext", 
-        "version": "2.0.7"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "freemarker:freemarker", 
-        "version": "2.3.12"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jasperreports:jasperreports", 
-        "version": "2.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jexcelapi:jxl", 
-        "version": "2.6.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.tiles:tiles-api", 
-        "version": "2.0.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.tiles:tiles-core", 
-        "version": "2.0.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.tiles:tiles-jsp", 
-        "version": "2.0.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "poi:poi", 
-        "version": "3.0.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "velocity:velocity", 
-        "version": "1.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "velocity-tools:velocity-tools-generic", 
-        "version": "1.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "velocity-tools:velocity-tools-view", 
-        "version": "1.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-beans", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-context", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-context-support", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-core", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-web", 
-        "version": "2.5.3"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:jsp-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:jstl", 
-        "version": "1.1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:servlet-api", 
-        "version": "2.4"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:commons-attributes/commons-attributes-api", 
+      "requirement": "2.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-attributes/commons-attributes-compiler", 
+      "requirement": "2.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.lowagie/itext", 
+      "requirement": "2.0.7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:freemarker/freemarker", 
+      "requirement": "2.3.12", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jasperreports/jasperreports", 
+      "requirement": "2.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jexcelapi/jxl", 
+      "requirement": "2.6.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.tiles/tiles-api", 
+      "requirement": "2.0.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.tiles/tiles-core", 
+      "requirement": "2.0.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.tiles/tiles-jsp", 
+      "requirement": "2.0.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:poi/poi", 
+      "requirement": "3.0.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:velocity/velocity", 
+      "requirement": "1.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:velocity-tools/velocity-tools-generic", 
+      "requirement": "1.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:velocity-tools/velocity-tools-view", 
+      "requirement": "1.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-beans", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-context", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-context-support", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-core", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-web", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/jsp-api", 
+      "requirement": "2.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/jstl", 
+      "requirement": "1.1.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/servlet-api", 
+      "requirement": "2.4", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/springframework/spring-webmvc/2.5.4/spring-webmvc-2.5.4.pom.json b/tests/packagedcode/data/m2/org/springframework/spring-webmvc/2.5.4/spring-webmvc-2.5.4.pom.json
index 2880b378dac..7ce2f9fdd36 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring-webmvc/2.5.4/spring-webmvc-2.5.4.pom.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring-webmvc/2.5.4/spring-webmvc-2.5.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "spring-webmvc", 
   "version": "2.5.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Spring Framework: Web MVC", 
   "description": "Spring Framework: Web MVC", 
diff --git a/tests/packagedcode/data/m2/org/springframework/spring-webmvc/2.5.4/spring-webmvc-2.5.4.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring-webmvc/2.5.4/spring-webmvc-2.5.4.pom.package.json
index 60a1ca702ed..d9ee1152907 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring-webmvc/2.5.4/spring-webmvc-2.5.4.pom.package.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring-webmvc/2.5.4/spring-webmvc-2.5.4.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.springframework:spring-webmvc", 
+  "type": "maven", 
+  "namespace": "org.springframework", 
+  "name": "spring-webmvc", 
   "version": "2.5.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Spring Framework: Web MVC", 
@@ -26,124 +29,186 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-attributes:commons-attributes-api", 
-        "version": "2.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-attributes:commons-attributes-compiler", 
-        "version": "2.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.lowagie:itext", 
-        "version": "2.0.7"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "freemarker:freemarker", 
-        "version": "2.3.12"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jasperreports:jasperreports", 
-        "version": "2.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jexcelapi:jxl", 
-        "version": "2.6.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.tiles:tiles-api", 
-        "version": "2.0.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.tiles:tiles-core", 
-        "version": "2.0.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.tiles:tiles-jsp", 
-        "version": "2.0.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "poi:poi", 
-        "version": "3.0.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "velocity:velocity", 
-        "version": "1.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "velocity-tools:velocity-tools-generic", 
-        "version": "1.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "velocity-tools:velocity-tools-view", 
-        "version": "1.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-beans", 
-        "version": "2.5.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-context", 
-        "version": "2.5.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-context-support", 
-        "version": "2.5.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-core", 
-        "version": "2.5.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-web", 
-        "version": "2.5.4"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:jsp-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:jstl", 
-        "version": "1.1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:servlet-api", 
-        "version": "2.4"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:commons-attributes/commons-attributes-api", 
+      "requirement": "2.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-attributes/commons-attributes-compiler", 
+      "requirement": "2.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.lowagie/itext", 
+      "requirement": "2.0.7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:freemarker/freemarker", 
+      "requirement": "2.3.12", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jasperreports/jasperreports", 
+      "requirement": "2.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jexcelapi/jxl", 
+      "requirement": "2.6.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.tiles/tiles-api", 
+      "requirement": "2.0.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.tiles/tiles-core", 
+      "requirement": "2.0.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.tiles/tiles-jsp", 
+      "requirement": "2.0.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:poi/poi", 
+      "requirement": "3.0.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:velocity/velocity", 
+      "requirement": "1.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:velocity-tools/velocity-tools-generic", 
+      "requirement": "1.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:velocity-tools/velocity-tools-view", 
+      "requirement": "1.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-beans", 
+      "requirement": "2.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-context", 
+      "requirement": "2.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-context-support", 
+      "requirement": "2.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-core", 
+      "requirement": "2.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-web", 
+      "requirement": "2.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/jsp-api", 
+      "requirement": "2.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/jstl", 
+      "requirement": "1.1.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/servlet-api", 
+      "requirement": "2.4", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/springframework/spring/2.5.4/spring-2.5.4.pom.json b/tests/packagedcode/data/m2/org/springframework/spring/2.5.4/spring-2.5.4.pom.json
index f75fc83171a..804c8aadc07 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring/2.5.4/spring-2.5.4.pom.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring/2.5.4/spring-2.5.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "spring", 
   "version": "2.5.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Spring Framework", 
   "description": "Spring Framework", 
diff --git a/tests/packagedcode/data/m2/org/springframework/spring/2.5.4/spring-2.5.4.pom.package.json b/tests/packagedcode/data/m2/org/springframework/spring/2.5.4/spring-2.5.4.pom.package.json
index 4c97b710c8e..e453c47c846 100644
--- a/tests/packagedcode/data/m2/org/springframework/spring/2.5.4/spring-2.5.4.pom.package.json
+++ b/tests/packagedcode/data/m2/org/springframework/spring/2.5.4/spring-2.5.4.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.springframework:spring", 
+  "type": "maven", 
+  "namespace": "org.springframework", 
+  "name": "spring", 
   "version": "2.5.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Spring Framework", 
@@ -26,339 +29,530 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "aopalliance:aopalliance", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "asm:asm", 
-        "version": "2.2.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "asm:asm-commons", 
-        "version": "2.2.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "asm:asm-util", 
-        "version": "2.2.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "aspectj:aspectjrt", 
-        "version": "1.5.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "aspectj:aspectjweaver", 
-        "version": "1.5.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "backport-util-concurrent:backport-util-concurrent", 
-        "version": "3.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "c3p0:c3p0", 
-        "version": "0.9.1.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "cglib:cglib-nodep", 
-        "version": "2.1_3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-attributes:commons-attributes-api", 
-        "version": "2.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-attributes:commons-attributes-compiler", 
-        "version": "2.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-beanutils:commons-beanutils", 
-        "version": "1.7.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-collections:commons-collections", 
-        "version": "3.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-dbcp:commons-dbcp", 
-        "version": "1.2.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-fileupload:commons-fileupload", 
-        "version": "1.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-httpclient:commons-httpclient", 
-        "version": "3.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-pool:commons-pool", 
-        "version": "1.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.bea.wlplatform:commonj-twm", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.experlog:xapool", 
-        "version": "1.5.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.ibatis:ibatis-sqlmap", 
-        "version": "2.3.0.677"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.jamonapi:jamon", 
-        "version": "2.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.lowagie:itext", 
-        "version": "2.0.7"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.oracle.toplink:toplink", 
-        "version": "10.1.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.oracle:toplink-essentials", 
-        "version": "2.41"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.oracle:oc4j", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "freemarker:freemarker", 
-        "version": "2.3.12"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "groovy:groovy", 
-        "version": "1.5.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "hessian:hessian", 
-        "version": "3.1.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jasperreports:jasperreports", 
-        "version": "2.0.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jexcelapi:jxl", 
-        "version": "2.6.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jotm:jotm", 
-        "version": "2.0.10"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jruby:jruby-bin", 
-        "version": "1.0.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "log4j:log4j", 
-        "version": "1.2.15"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "net.sf.ehcache:ehcache", 
-        "version": "1.4.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.axis:axis", 
-        "version": "1.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.tiles:tiles-api", 
-        "version": "2.0.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.tiles:tiles-core", 
-        "version": "2.0.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.tiles:tiles-jsp", 
-        "version": "2.0.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.beanshell:bsh", 
-        "version": "2.0b4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.hibernate:hibernate", 
-        "version": "3.2.6.ga"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.hibernate:hibernate-entitymanager", 
-        "version": "3.3.2.ga"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "poi:poi", 
-        "version": "3.0.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "opensymphony:quartz-all", 
-        "version": "1.6.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "struts:struts", 
-        "version": "1.2.9"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "taglibs:standard", 
-        "version": "1.1.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "tomcat:catalina", 
-        "version": "5.5.23"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "velocity:velocity", 
-        "version": "1.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "velocity-tools:velocity-tools-generic", 
-        "version": "1.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "velocity-tools:velocity-tools-view", 
-        "version": "1.4"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.activation:activation", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.ejb:ejb", 
-        "version": "3.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.faces:jsf-api", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.jdo:jdo2-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.jms:jms", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.mail:mail", 
-        "version": "1.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.persistence:persistence-api", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.portlet:portlet-api", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.resource:connector-api", 
-        "version": "1.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:jsp-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:jstl", 
-        "version": "1.1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:servlet-api", 
-        "version": "2.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.transaction:jta", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.xml:jaxrpc-api", 
-        "version": "1.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:aopalliance/aopalliance", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:asm/asm", 
+      "requirement": "2.2.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:asm/asm-commons", 
+      "requirement": "2.2.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:asm/asm-util", 
+      "requirement": "2.2.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:aspectj/aspectjrt", 
+      "requirement": "1.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:aspectj/aspectjweaver", 
+      "requirement": "1.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:backport-util-concurrent/backport-util-concurrent", 
+      "requirement": "3.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:c3p0/c3p0", 
+      "requirement": "0.9.1.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:cglib/cglib-nodep", 
+      "requirement": "2.1_3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-attributes/commons-attributes-api", 
+      "requirement": "2.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-attributes/commons-attributes-compiler", 
+      "requirement": "2.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-beanutils/commons-beanutils", 
+      "requirement": "1.7.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-collections/commons-collections", 
+      "requirement": "3.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-dbcp/commons-dbcp", 
+      "requirement": "1.2.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-fileupload/commons-fileupload", 
+      "requirement": "1.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-httpclient/commons-httpclient", 
+      "requirement": "3.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-pool/commons-pool", 
+      "requirement": "1.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.bea.wlplatform/commonj-twm", 
+      "requirement": "1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.experlog/xapool", 
+      "requirement": "1.5.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.ibatis/ibatis-sqlmap", 
+      "requirement": "2.3.0.677", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.jamonapi/jamon", 
+      "requirement": "2.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.lowagie/itext", 
+      "requirement": "2.0.7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.oracle.toplink/toplink", 
+      "requirement": "10.1.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.oracle/toplink-essentials", 
+      "requirement": "2.41", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.oracle/oc4j", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:freemarker/freemarker", 
+      "requirement": "2.3.12", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:groovy/groovy", 
+      "requirement": "1.5.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:hessian/hessian", 
+      "requirement": "3.1.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jasperreports/jasperreports", 
+      "requirement": "2.0.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jexcelapi/jxl", 
+      "requirement": "2.6.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jotm/jotm", 
+      "requirement": "2.0.10", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jruby/jruby-bin", 
+      "requirement": "1.0.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:log4j/log4j", 
+      "requirement": "1.2.15", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:net.sf.ehcache/ehcache", 
+      "requirement": "1.4.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.axis/axis", 
+      "requirement": "1.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.tiles/tiles-api", 
+      "requirement": "2.0.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.tiles/tiles-core", 
+      "requirement": "2.0.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.tiles/tiles-jsp", 
+      "requirement": "2.0.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.beanshell/bsh", 
+      "requirement": "2.0b4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.hibernate/hibernate", 
+      "requirement": "3.2.6.ga", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.hibernate/hibernate-entitymanager", 
+      "requirement": "3.3.2.ga", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:poi/poi", 
+      "requirement": "3.0.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:opensymphony/quartz-all", 
+      "requirement": "1.6.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:struts/struts", 
+      "requirement": "1.2.9", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:taglibs/standard", 
+      "requirement": "1.1.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:tomcat/catalina", 
+      "requirement": "5.5.23", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:velocity/velocity", 
+      "requirement": "1.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:velocity-tools/velocity-tools-generic", 
+      "requirement": "1.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:velocity-tools/velocity-tools-view", 
+      "requirement": "1.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.activation/activation", 
+      "requirement": "1.1", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.ejb/ejb", 
+      "requirement": "3.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.faces/jsf-api", 
+      "requirement": "1.1", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.jdo/jdo2-api", 
+      "requirement": "2.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.jms/jms", 
+      "requirement": "1.1", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.mail/mail", 
+      "requirement": "1.4", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.persistence/persistence-api", 
+      "requirement": "1.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.portlet/portlet-api", 
+      "requirement": "1.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.resource/connector-api", 
+      "requirement": "1.5", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/jsp-api", 
+      "requirement": "2.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/jstl", 
+      "requirement": "1.1.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/servlet-api", 
+      "requirement": "2.4", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.transaction/jta", 
+      "requirement": "1.1", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.xml/jaxrpc-api", 
+      "requirement": "1.1", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/testng/testng/5.7/testng-5.7.pom.json b/tests/packagedcode/data/m2/org/testng/testng/5.7/testng-5.7.pom.json
index fa0bd9b286f..130b1e10401 100644
--- a/tests/packagedcode/data/m2/org/testng/testng/5.7/testng-5.7.pom.json
+++ b/tests/packagedcode/data/m2/org/testng/testng/5.7/testng-5.7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "testng", 
   "version": "5.7", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "TestNG", 
   "description": "TestNG is a unit testing framework.", 
diff --git a/tests/packagedcode/data/m2/org/testng/testng/5.7/testng-5.7.pom.package.json b/tests/packagedcode/data/m2/org/testng/testng/5.7/testng-5.7.pom.package.json
index dd7aae4a8dc..5c20f07cec3 100644
--- a/tests/packagedcode/data/m2/org/testng/testng/5.7/testng-5.7.pom.package.json
+++ b/tests/packagedcode/data/m2/org/testng/testng/5.7/testng-5.7.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.testng:testng", 
+  "type": "maven", 
+  "namespace": "org.testng", 
+  "name": "testng", 
   "version": "5.7", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "TestNG is a unit testing framework.", 
+  "description": "TestNG\nTestNG is a unit testing framework.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,34 +21,42 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "Apache License, Version 2.0\nhttp://apache.org/licenses/LICENSE-2.0", 
   "license_expression": null, 
+  "asserted_license": "Apache License, Version 2.0\nhttp://apache.org/licenses/LICENSE-2.0", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "ant:ant", 
-        "version": "1.6.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "qdox:qdox", 
-        "version": "1.6.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.beanshell:bsh", 
-        "version": "2.0b4"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:ant/ant", 
+      "requirement": "1.6.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:qdox/qdox", 
+      "requirement": "1.6.1", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.beanshell/bsh", 
+      "requirement": "2.0b4", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/testng/testng/5.8/testng-5.8.pom.json b/tests/packagedcode/data/m2/org/testng/testng/5.8/testng-5.8.pom.json
index 372b6b8559e..72680ccb6f0 100644
--- a/tests/packagedcode/data/m2/org/testng/testng/5.8/testng-5.8.pom.json
+++ b/tests/packagedcode/data/m2/org/testng/testng/5.8/testng-5.8.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "testng", 
   "version": "5.8", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "TestNG", 
   "description": "TestNG is a testing framework inspired from JUnit and NUnit but introducing some new functionalities that make it more powerful and easier to use.", 
diff --git a/tests/packagedcode/data/m2/org/testng/testng/5.8/testng-5.8.pom.package.json b/tests/packagedcode/data/m2/org/testng/testng/5.8/testng-5.8.pom.package.json
index 9851be4c380..2a438dfc5d0 100644
--- a/tests/packagedcode/data/m2/org/testng/testng/5.8/testng-5.8.pom.package.json
+++ b/tests/packagedcode/data/m2/org/testng/testng/5.8/testng-5.8.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.testng:testng", 
+  "type": "maven", 
+  "namespace": "org.testng", 
+  "name": "testng", 
   "version": "5.8", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "TestNG is a testing framework inspired from JUnit and NUnit but introducing some new functionalities that make it more powerful and easier to use.", 
+  "description": "TestNG\nTestNG is a testing framework inspired from JUnit and NUnit but introducing some new functionalities that make it more powerful and easier to use.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,34 +21,42 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "Apache License, Version 2.0\nhttp://apache.org/licenses/LICENSE-2.0", 
   "license_expression": null, 
+  "asserted_license": "Apache License, Version 2.0\nhttp://apache.org/licenses/LICENSE-2.0", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "ant:ant", 
-        "version": "1.6.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "qdox:qdox", 
-        "version": "1.6.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.beanshell:bsh", 
-        "version": "2.0b4"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:ant/ant", 
+      "requirement": "1.6.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:qdox/qdox", 
+      "requirement": "1.6.1", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.beanshell/bsh", 
+      "requirement": "2.0b4", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/org/uncommons/reportng/0.9.5/reportng-0.9.5.pom.json b/tests/packagedcode/data/m2/org/uncommons/reportng/0.9.5/reportng-0.9.5.pom.json
index 2d8ab5f7569..d6a46165259 100644
--- a/tests/packagedcode/data/m2/org/uncommons/reportng/0.9.5/reportng-0.9.5.pom.json
+++ b/tests/packagedcode/data/m2/org/uncommons/reportng/0.9.5/reportng-0.9.5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "reportng", 
   "version": "0.9.5", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/org/uncommons/reportng/0.9.5/reportng-0.9.5.pom.package.json b/tests/packagedcode/data/m2/org/uncommons/reportng/0.9.5/reportng-0.9.5.pom.package.json
index fab1f23d26b..238ee615e8e 100644
--- a/tests/packagedcode/data/m2/org/uncommons/reportng/0.9.5/reportng-0.9.5.pom.package.json
+++ b/tests/packagedcode/data/m2/org/uncommons/reportng/0.9.5/reportng-0.9.5.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.uncommons:reportng", 
+  "type": "maven", 
+  "namespace": "org.uncommons", 
+  "name": "reportng", 
   "version": "0.9.5", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.velocity:velocity", 
-        "version": "1.5"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.velocity/velocity", 
+      "requirement": "1.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/oro/oro/2.0.7/oro-2.0.7.pom.json b/tests/packagedcode/data/m2/oro/oro/2.0.7/oro-2.0.7.pom.json
index 1166557add3..e7120436b66 100644
--- a/tests/packagedcode/data/m2/oro/oro/2.0.7/oro-2.0.7.pom.json
+++ b/tests/packagedcode/data/m2/oro/oro/2.0.7/oro-2.0.7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "oro", 
   "version": "2.0.7", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/oro/oro/2.0.7/oro-2.0.7.pom.package.json b/tests/packagedcode/data/m2/oro/oro/2.0.7/oro-2.0.7.pom.package.json
index cc9ce67426a..338cf5c8e82 100644
--- a/tests/packagedcode/data/m2/oro/oro/2.0.7/oro-2.0.7.pom.package.json
+++ b/tests/packagedcode/data/m2/oro/oro/2.0.7/oro-2.0.7.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "oro:oro", 
+  "type": "maven", 
+  "namespace": "oro", 
+  "name": "oro", 
   "version": "2.0.7", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/oro/oro/2.0.8/oro-2.0.8.pom.json b/tests/packagedcode/data/m2/oro/oro/2.0.8/oro-2.0.8.pom.json
index 7bb02cc5b68..ae14720ff65 100644
--- a/tests/packagedcode/data/m2/oro/oro/2.0.8/oro-2.0.8.pom.json
+++ b/tests/packagedcode/data/m2/oro/oro/2.0.8/oro-2.0.8.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "oro", 
   "version": "2.0.8", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/oro/oro/2.0.8/oro-2.0.8.pom.package.json b/tests/packagedcode/data/m2/oro/oro/2.0.8/oro-2.0.8.pom.package.json
index 6810ebbfdf3..f1a13d06e53 100644
--- a/tests/packagedcode/data/m2/oro/oro/2.0.8/oro-2.0.8.pom.package.json
+++ b/tests/packagedcode/data/m2/oro/oro/2.0.8/oro-2.0.8.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "oro:oro", 
+  "type": "maven", 
+  "namespace": "oro", 
+  "name": "oro", 
   "version": "2.0.8", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/p6spy/p6spy/1.3/p6spy-1.3.pom.json b/tests/packagedcode/data/m2/p6spy/p6spy/1.3/p6spy-1.3.pom.json
index 7cfd67da530..7dedc54bba0 100644
--- a/tests/packagedcode/data/m2/p6spy/p6spy/1.3/p6spy-1.3.pom.json
+++ b/tests/packagedcode/data/m2/p6spy/p6spy/1.3/p6spy-1.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "p6spy", 
   "version": "1.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "P6Spy", 
   "description": "P6Spy is an open source framework for applications that intercept and optionally modify database statements.", 
diff --git a/tests/packagedcode/data/m2/p6spy/p6spy/1.3/p6spy-1.3.pom.package.json b/tests/packagedcode/data/m2/p6spy/p6spy/1.3/p6spy-1.3.pom.package.json
index e119475a95b..5ba8c15f5e8 100644
--- a/tests/packagedcode/data/m2/p6spy/p6spy/1.3/p6spy-1.3.pom.package.json
+++ b/tests/packagedcode/data/m2/p6spy/p6spy/1.3/p6spy-1.3.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "p6spy:p6spy", 
+  "type": "maven", 
+  "namespace": "p6spy", 
+  "name": "p6spy", 
   "version": "1.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "P6Spy is an open source framework for applications that intercept and optionally modify database statements.", 
+  "description": "P6Spy\nP6Spy is an open source framework for applications that intercept and optionally modify database statements.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -54,42 +57,58 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The P6Spy Software License, Version 1.1\nhttp://cvs.sourceforge.net/viewcvs.py/*checkout*/p6spy/p6spy/license.txt?rev=HEAD", 
   "license_expression": null, 
+  "asserted_license": "The P6Spy Software License, Version 1.1\nhttp://cvs.sourceforge.net/viewcvs.py/*checkout*/p6spy/p6spy/license.txt?rev=HEAD", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "regexp:regexp", 
-        "version": "1.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "gnu-regexp:gnu-regexp", 
-        "version": "1.1.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "log4j:log4j", 
-        "version": "1.2.8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "ant:ant", 
-        "version": "1.6.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "oracle:classes12", 
-        "version": "9.2.0.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jboss:jboss", 
-        "version": "2.4.6"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:regexp/regexp", 
+      "requirement": "1.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:gnu-regexp/gnu-regexp", 
+      "requirement": "1.1.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:log4j/log4j", 
+      "requirement": "1.2.8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:ant/ant", 
+      "requirement": "1.6.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:oracle/classes12", 
+      "requirement": "9.2.0.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jboss/jboss", 
+      "requirement": "2.4.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/argus-webservices-2.7.0.pom.json b/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/argus-webservices-2.7.0.pom.json
index 951aa35fed1..c3bfeaa09fc 100644
--- a/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/argus-webservices-2.7.0.pom.json
+++ b/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/argus-webservices-2.7.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "argus-webservices", 
   "version": "${project.version}", 
   "classifier": null, 
-  "packaging ": "war", 
+  "packaging": "war", 
   "parent": {
     "group_id": "com.salesforce.argus", 
     "artifact_id": "argus", 
diff --git a/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/argus-webservices-2.7.0.pom.package.json b/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/argus-webservices-2.7.0.pom.package.json
index c1cc2c5e44e..228e38ab72c 100644
--- a/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/argus-webservices-2.7.0.pom.package.json
+++ b/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/argus-webservices-2.7.0.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "com.salesforce.argus:argus-webservices", 
+  "type": "maven", 
+  "namespace": "com.salesforce.argus", 
+  "name": "argus-webservices", 
   "version": "${project.version}", 
+  "qualifiers": {
+    "packaging": "war"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Web Services for the Argus Production Monitoring Tool.", 
+  "description": "ArgusWebServices\nWeb Services for the Argus Production Monitoring Tool.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,71 +23,98 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.glassfish.jersey.containers:jersey-container-servlet", 
-        "version": "2.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.glassfish.jersey.media:jersey-media-json-jackson", 
-        "version": "2.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.salesforce.argus:argus-core", 
-        "version": "${project.version}"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.fasterxml.jackson.core:jackson-annotations", 
-        "version": "2.3.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.fasterxml.jackson.jaxrs:jackson-jaxrs-base", 
-        "version": "2.3.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider", 
-        "version": "2.3.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.glassfish.jersey.core:jersey-common", 
-        "version": "2.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "io.jsonwebtoken:jjwt", 
-        "version": "0.7.0"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.salesforce.argus:argus", 
-        "version": "${project.version}"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:javax.servlet-api", 
-        "version": "3.1.0"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "4.10"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:com.salesforce.argus/argus", 
+      "requirement": "${project.version}", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/javax.servlet-api", 
+      "requirement": "3.1.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.glassfish.jersey.containers/jersey-container-servlet", 
+      "requirement": "2.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.glassfish.jersey.media/jersey-media-json-jackson", 
+      "requirement": "2.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.salesforce.argus/argus-core", 
+      "requirement": "${project.version}", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.fasterxml.jackson.core/jackson-annotations", 
+      "requirement": "2.3.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base", 
+      "requirement": "2.3.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider", 
+      "requirement": "2.3.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.glassfish.jersey.core/jersey-common", 
+      "requirement": "2.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:io.jsonwebtoken/jjwt", 
+      "requirement": "0.7.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "4.10", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/argus-webservices-2.8.0.pom.json b/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/argus-webservices-2.8.0.pom.json
index 951aa35fed1..c3bfeaa09fc 100644
--- a/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/argus-webservices-2.8.0.pom.json
+++ b/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/argus-webservices-2.8.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "argus-webservices", 
   "version": "${project.version}", 
   "classifier": null, 
-  "packaging ": "war", 
+  "packaging": "war", 
   "parent": {
     "group_id": "com.salesforce.argus", 
     "artifact_id": "argus", 
diff --git a/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/argus-webservices-2.8.0.pom.package.json b/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/argus-webservices-2.8.0.pom.package.json
index c1cc2c5e44e..228e38ab72c 100644
--- a/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/argus-webservices-2.8.0.pom.package.json
+++ b/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/argus-webservices-2.8.0.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "com.salesforce.argus:argus-webservices", 
+  "type": "maven", 
+  "namespace": "com.salesforce.argus", 
+  "name": "argus-webservices", 
   "version": "${project.version}", 
+  "qualifiers": {
+    "packaging": "war"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Web Services for the Argus Production Monitoring Tool.", 
+  "description": "ArgusWebServices\nWeb Services for the Argus Production Monitoring Tool.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,71 +23,98 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.glassfish.jersey.containers:jersey-container-servlet", 
-        "version": "2.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.glassfish.jersey.media:jersey-media-json-jackson", 
-        "version": "2.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.salesforce.argus:argus-core", 
-        "version": "${project.version}"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.fasterxml.jackson.core:jackson-annotations", 
-        "version": "2.3.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.fasterxml.jackson.jaxrs:jackson-jaxrs-base", 
-        "version": "2.3.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider", 
-        "version": "2.3.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.glassfish.jersey.core:jersey-common", 
-        "version": "2.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "io.jsonwebtoken:jjwt", 
-        "version": "0.7.0"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.salesforce.argus:argus", 
-        "version": "${project.version}"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:javax.servlet-api", 
-        "version": "3.1.0"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "4.10"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:com.salesforce.argus/argus", 
+      "requirement": "${project.version}", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/javax.servlet-api", 
+      "requirement": "3.1.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.glassfish.jersey.containers/jersey-container-servlet", 
+      "requirement": "2.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.glassfish.jersey.media/jersey-media-json-jackson", 
+      "requirement": "2.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.salesforce.argus/argus-core", 
+      "requirement": "${project.version}", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.fasterxml.jackson.core/jackson-annotations", 
+      "requirement": "2.3.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base", 
+      "requirement": "2.3.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider", 
+      "requirement": "2.3.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.glassfish.jersey.core/jersey-common", 
+      "requirement": "2.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:io.jsonwebtoken/jjwt", 
+      "requirement": "0.7.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "4.10", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/coreplugin-1.0.0.pom.json b/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/coreplugin-1.0.0.pom.json
index 676218c4f22..863fc72365c 100644
--- a/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/coreplugin-1.0.0.pom.json
+++ b/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/coreplugin-1.0.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "coreplugin", 
   "version": "1.0.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": "Core plugin supports the FindBugs tool", 
@@ -29,13 +29,6 @@
   "repositories": [], 
   "plugin_repositories": [], 
   "dependencies": {
-    "compile": [
-      {
-        "group_id": null, 
-        "artifact_id": null, 
-        "version": "latest.release", 
-        "required": true
-      }
-    ]
+    "compile": []
   }
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/coreplugin-1.0.0.pom.package.json b/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/coreplugin-1.0.0.pom.package.json
index be0d3dff1c9..e4d3511be26 100644
--- a/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/coreplugin-1.0.0.pom.package.json
+++ b/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/coreplugin-1.0.0.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "net.sourceforge.findbugs:coreplugin", 
+  "type": "maven", 
+  "namespace": "net.sourceforge.findbugs", 
+  "name": "coreplugin", 
   "version": "1.0.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Core plugin supports the FindBugs tool", 
@@ -18,17 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "None:None", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/jacuzzi-annotations-0.2.1.pom.json b/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/jacuzzi-annotations-0.2.1.pom.json
index 47979a87836..ee87fed54f5 100644
--- a/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/jacuzzi-annotations-0.2.1.pom.json
+++ b/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/jacuzzi-annotations-0.2.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "jacuzzi-annotations", 
   "version": "${version}", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "com.github.albertoanguita", 
     "artifact_id": "jacuzzi", 
diff --git a/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/jacuzzi-annotations-0.2.1.pom.package.json b/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/jacuzzi-annotations-0.2.1.pom.package.json
index c8463710be9..9675c7fe922 100644
--- a/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/jacuzzi-annotations-0.2.1.pom.package.json
+++ b/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/jacuzzi-annotations-0.2.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "com.github.albertoanguita:jacuzzi-annotations", 
+  "type": "maven", 
+  "namespace": "com.github.albertoanguita", 
+  "name": "jacuzzi-annotations", 
   "version": "${version}", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "A generic java utilities collection project - extended functionality with aspectj dependency", 
+  "description": "Jacuzzi - Annotations\nA generic java utilities collection project - extended functionality with aspectj dependency", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/jacuzzi-database-0.2.1.pom.json b/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/jacuzzi-database-0.2.1.pom.json
index 7473817c2b4..b58fc8f5549 100644
--- a/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/jacuzzi-database-0.2.1.pom.json
+++ b/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/jacuzzi-database-0.2.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "jacuzzi-database", 
   "version": "${version}", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "com.github.albertoanguita", 
     "artifact_id": "jacuzzi", 
diff --git a/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/jacuzzi-database-0.2.1.pom.package.json b/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/jacuzzi-database-0.2.1.pom.package.json
index cc86ed34b73..4d5b35eed11 100644
--- a/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/jacuzzi-database-0.2.1.pom.package.json
+++ b/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/jacuzzi-database-0.2.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "com.github.albertoanguita:jacuzzi-database", 
+  "type": "maven", 
+  "namespace": "com.github.albertoanguita", 
+  "name": "jacuzzi-database", 
   "version": "${version}", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "A generic java utilities collection project - extended functionality with ActiveJDBC dependencies", 
+  "description": "Jacuzzi - Database\nA generic java utilities collection project - extended functionality with ActiveJDBC dependencies", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,27 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.github.albertoanguita:jacuzzi-core", 
-        "version": "${version}"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.javalite:activejdbc", 
-        "version": "1.4.12"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.xerial:sqlite-jdbc", 
-        "version": "3.8.11.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:com.github.albertoanguita/jacuzzi-core", 
+      "requirement": "${version}", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.javalite/activejdbc", 
+      "requirement": "1.4.12", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.xerial/sqlite-jdbc", 
+      "requirement": "3.8.11.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/ojcms-beans-0.1-beta.pom.json b/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/ojcms-beans-0.1-beta.pom.json
index 97b8ad43f6c..bffee1bd809 100644
--- a/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/ojcms-beans-0.1-beta.pom.json
+++ b/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/ojcms-beans-0.1-beta.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "ojcms-beans", 
   "version": "${project.version}", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "com.github.simondan", 
     "artifact_id": "ojcms-parent", 
diff --git a/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/ojcms-beans-0.1-beta.pom.package.json b/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/ojcms-beans-0.1-beta.pom.package.json
index 78a490d359d..151a2053284 100644
--- a/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/ojcms-beans-0.1-beta.pom.package.json
+++ b/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/ojcms-beans-0.1-beta.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "com.github.simondan.ojcms:ojcms-beans", 
+  "type": "maven", 
+  "namespace": "com.github.simondan.ojcms", 
+  "name": "ojcms-beans", 
   "version": "${project.version}", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.glassfish.jersey.media:jersey-media-json-jackson", 
-        "version": "2.25.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.glassfish.jersey.media/jersey-media-json-jackson", 
+      "requirement": "2.25.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/pkg-2.0.13.1005.pom.json b/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/pkg-2.0.13.1005.pom.json
index 8916e1caf83..0a313980175 100644
--- a/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/pkg-2.0.13.1005.pom.json
+++ b/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/pkg-2.0.13.1005.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "pkg", 
   "version": "${version}", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Image Packaging System", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/pkg-2.0.13.1005.pom.package.json b/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/pkg-2.0.13.1005.pom.package.json
index f69fafb8e1d..6625fa6efdf 100644
--- a/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/pkg-2.0.13.1005.pom.package.json
+++ b/tests/packagedcode/data/m2/parsing_issues/inifinite_loop/pkg-2.0.13.1005.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.jvnet.updatecenter2:pkg", 
+  "type": "maven", 
+  "namespace": "org.jvnet.updatecenter2", 
+  "name": "pkg", 
   "version": "${version}", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Image Packaging System", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/parsing_issues/parse_error/jds-2.17.0718b.pom.json b/tests/packagedcode/data/m2/parsing_issues/parse_error/jds-2.17.0718b.pom.json
index 9f37922a7e7..21bc4c64159 100644
--- a/tests/packagedcode/data/m2/parsing_issues/parse_error/jds-2.17.0718b.pom.json
+++ b/tests/packagedcode/data/m2/parsing_issues/parse_error/jds-2.17.0718b.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "jds", 
   "version": "2.17.0718b", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Jenesis Data Store", 
   "description": "A dynamic, cross platform, high performance, ORM data-mapper. Designed to assist in rapid development and data mining", 
@@ -47,12 +47,6 @@
   "plugin_repositories": [], 
   "dependencies": {
     "test": [
-      {
-        "group_id": null, 
-        "artifact_id": "ojdbc8", 
-        "version": "latest.release", 
-        "required": true
-      }, 
       {
         "group_id": "junit", 
         "artifact_id": "junit", 
diff --git a/tests/packagedcode/data/m2/parsing_issues/parse_error/jds-2.17.0718b.pom.package.json b/tests/packagedcode/data/m2/parsing_issues/parse_error/jds-2.17.0718b.pom.package.json
index ce95649de59..c5dc76ace93 100644
--- a/tests/packagedcode/data/m2/parsing_issues/parse_error/jds-2.17.0718b.pom.package.json
+++ b/tests/packagedcode/data/m2/parsing_issues/parse_error/jds-2.17.0718b.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "io.github.subiyacryolite:jds", 
+  "type": "maven", 
+  "namespace": "io.github.subiyacryolite", 
+  "name": "jds", 
   "version": "2.17.0718b", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "A dynamic, cross platform, high performance, ORM data-mapper. Designed to assist in rapid development and data mining", 
+  "description": "Jenesis Data Store\nA dynamic, cross platform, high performance, ORM data-mapper. Designed to assist in rapid development and data mining", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,42 +29,50 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The 3-Clause BSD License\nhttps://opensource.org/licenses/BSD-3-Clause", 
   "license_expression": null, 
+  "asserted_license": "The 3-Clause BSD License\nhttps://opensource.org/licenses/BSD-3-Clause", 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "None:ojdbc8", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "4.12"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.xerial:sqlite-jdbc", 
-        "version": "3.16.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.microsoft.sqlserver:sqljdbc4", 
-        "version": "4.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.postgresql:postgresql", 
-        "version": "42.0.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "mysql:mysql-connector-java", 
-        "version": "6.0.6"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "4.12", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.xerial/sqlite-jdbc", 
+      "requirement": "3.16.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.microsoft.sqlserver/sqljdbc4", 
+      "requirement": "4.0", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.postgresql/postgresql", 
+      "requirement": "42.0.0", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:mysql/mysql-connector-java", 
+      "requirement": "6.0.6", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/parsing_issues/parse_error/jds-3.0.1.pom.json b/tests/packagedcode/data/m2/parsing_issues/parse_error/jds-3.0.1.pom.json
index c169598a166..160d2451989 100644
--- a/tests/packagedcode/data/m2/parsing_issues/parse_error/jds-3.0.1.pom.json
+++ b/tests/packagedcode/data/m2/parsing_issues/parse_error/jds-3.0.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "jds", 
   "version": "3.0.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Jenesis Data Store", 
   "description": "A dynamic, cross platform, high performance, ORM data-mapper. Designed to assist in rapid development and data mining", 
@@ -47,12 +47,6 @@
   "plugin_repositories": [], 
   "dependencies": {
     "test": [
-      {
-        "group_id": null, 
-        "artifact_id": "ojdbc8", 
-        "version": "latest.release", 
-        "required": true
-      }, 
       {
         "group_id": "junit", 
         "artifact_id": "junit", 
diff --git a/tests/packagedcode/data/m2/parsing_issues/parse_error/jds-3.0.1.pom.package.json b/tests/packagedcode/data/m2/parsing_issues/parse_error/jds-3.0.1.pom.package.json
index f2e1967096f..1b72cedf1f9 100644
--- a/tests/packagedcode/data/m2/parsing_issues/parse_error/jds-3.0.1.pom.package.json
+++ b/tests/packagedcode/data/m2/parsing_issues/parse_error/jds-3.0.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "io.github.subiyacryolite:jds", 
+  "type": "maven", 
+  "namespace": "io.github.subiyacryolite", 
+  "name": "jds", 
   "version": "3.0.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "A dynamic, cross platform, high performance, ORM data-mapper. Designed to assist in rapid development and data mining", 
+  "description": "Jenesis Data Store\nA dynamic, cross platform, high performance, ORM data-mapper. Designed to assist in rapid development and data mining", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,42 +29,50 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The 3-Clause BSD License\nhttps://opensource.org/licenses/BSD-3-Clause", 
   "license_expression": null, 
+  "asserted_license": "The 3-Clause BSD License\nhttps://opensource.org/licenses/BSD-3-Clause", 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "None:ojdbc8", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "4.12"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.xerial:sqlite-jdbc", 
-        "version": "3.16.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.microsoft.sqlserver:sqljdbc4", 
-        "version": "4.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.postgresql:postgresql", 
-        "version": "42.0.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "mysql:mysql-connector-java", 
-        "version": "6.0.6"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "4.12", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.xerial/sqlite-jdbc", 
+      "requirement": "3.16.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.microsoft.sqlserver/sqljdbc4", 
+      "requirement": "4.0", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.postgresql/postgresql", 
+      "requirement": "42.0.0", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:mysql/mysql-connector-java", 
+      "requirement": "6.0.6", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/parsing_issues/parse_error/maven-javanet-plugin-1.7.pom.json b/tests/packagedcode/data/m2/parsing_issues/parse_error/maven-javanet-plugin-1.7.pom.json
index b6aef7f8805..4795006569e 100644
--- a/tests/packagedcode/data/m2/parsing_issues/parse_error/maven-javanet-plugin-1.7.pom.json
+++ b/tests/packagedcode/data/m2/parsing_issues/parse_error/maven-javanet-plugin-1.7.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "maven-javanet-plugin", 
   "version": null, 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Maven java.net plugin", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/parsing_issues/parse_error/maven-javanet-plugin-1.7.pom.package.json b/tests/packagedcode/data/m2/parsing_issues/parse_error/maven-javanet-plugin-1.7.pom.package.json
index a3116ca5576..34a42278123 100644
--- a/tests/packagedcode/data/m2/parsing_issues/parse_error/maven-javanet-plugin-1.7.pom.package.json
+++ b/tests/packagedcode/data/m2/parsing_issues/parse_error/maven-javanet-plugin-1.7.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "maven-javanet-plugin:maven-javanet-plugin", 
+  "type": "maven", 
+  "namespace": "maven-javanet-plugin", 
+  "name": "maven-javanet-plugin", 
   "version": null, 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Maven java.net plugin", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -40,47 +43,66 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "httpunit:httpunit", 
-        "version": "1.5.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "xml-apis:xml-apis", 
-        "version": "2.0.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "xerces:xerces", 
-        "version": "2.2.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jtidy:jtidy", 
-        "version": "4aug2000r7-dev"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "nekohtml:nekohtml", 
-        "version": "0.9.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "dom4j:dom4j", 
-        "version": "1.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jaxen:jaxen", 
-        "version": "1.0-FCS-full"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:httpunit/httpunit", 
+      "requirement": "1.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:xml-apis/xml-apis", 
+      "requirement": "2.0.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:xerces/xerces", 
+      "requirement": "2.2.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jtidy/jtidy", 
+      "requirement": "4aug2000r7-dev", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:nekohtml/nekohtml", 
+      "requirement": "0.9.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:dom4j/dom4j", 
+      "requirement": "1.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jaxen/jaxen", 
+      "requirement": "1.0-FCS-full", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/parsing_issues/parse_error/springmvc-rest-docs-maven-plugin-1.0-RC1.pom.json b/tests/packagedcode/data/m2/parsing_issues/parse_error/springmvc-rest-docs-maven-plugin-1.0-RC1.pom.json
index 2bfacf143d9..769d933a95f 100644
--- a/tests/packagedcode/data/m2/parsing_issues/parse_error/springmvc-rest-docs-maven-plugin-1.0-RC1.pom.json
+++ b/tests/packagedcode/data/m2/parsing_issues/parse_error/springmvc-rest-docs-maven-plugin-1.0-RC1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "springmvc-rest-docs-maven-plugin", 
   "version": "1.0-RC1", 
   "classifier": null, 
-  "packaging ": "maven-plugin", 
+  "packaging": "maven-plugin", 
   "parent": {
     "group_id": "com.github.vincentrussell", 
     "artifact_id": "springmvc-rest-docs-parent", 
diff --git a/tests/packagedcode/data/m2/parsing_issues/parse_error/springmvc-rest-docs-maven-plugin-1.0-RC1.pom.package.json b/tests/packagedcode/data/m2/parsing_issues/parse_error/springmvc-rest-docs-maven-plugin-1.0-RC1.pom.package.json
index 7e01dba6b64..34836baf13d 100644
--- a/tests/packagedcode/data/m2/parsing_issues/parse_error/springmvc-rest-docs-maven-plugin-1.0-RC1.pom.package.json
+++ b/tests/packagedcode/data/m2/parsing_issues/parse_error/springmvc-rest-docs-maven-plugin-1.0-RC1.pom.package.json
@@ -1,7 +1,12 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "com.github.vincentrussell:springmvc-rest-docs-maven-plugin", 
+  "type": "maven", 
+  "namespace": "com.github.vincentrussell", 
+  "name": "springmvc-rest-docs-maven-plugin", 
   "version": "1.0-RC1", 
+  "qualifiers": {
+    "packaging": "maven-plugin"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,106 +23,154 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.github.vincentrussell:springmvc-rest-docs-deps", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.fasterxml.jackson.core:jackson-databind", 
-        "version": "2.7.8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.fasterxml.jackson.core:jackson-core", 
-        "version": "2.7.8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "io.springfox:springfox-swagger2", 
-        "version": "2.7.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.google.guava:guava", 
-        "version": "22.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-webmvc", 
-        "version": "4.3.8.RELEASE"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "io.github.swagger2markup:swagger2markup", 
-        "version": "1.3.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:javax.servlet-api", 
-        "version": "3.1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-test", 
-        "version": "4.3.8.RELEASE"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.plugin-tools:maven-plugin-annotations", 
-        "version": "3.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.eclipse.aether:aether-api", 
-        "version": "1.1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.eclipse.aether:aether-util", 
-        "version": "1.1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.commons:commons-lang3", 
-        "version": "3.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-io:commons-io", 
-        "version": "1.3.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.hamcrest:hamcrest-core", 
-        "version": "1.3"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-core", 
-        "version": "3.1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-plugin-api", 
-        "version": "3.1.0"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "4.11"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:com.github.vincentrussell/springmvc-rest-docs-deps", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.fasterxml.jackson.core/jackson-databind", 
+      "requirement": "2.7.8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.fasterxml.jackson.core/jackson-core", 
+      "requirement": "2.7.8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:io.springfox/springfox-swagger2", 
+      "requirement": "2.7.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.google.guava/guava", 
+      "requirement": "22.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-webmvc", 
+      "requirement": "4.3.8.RELEASE", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:io.github.swagger2markup/swagger2markup", 
+      "requirement": "1.3.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/javax.servlet-api", 
+      "requirement": "3.1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-test", 
+      "requirement": "4.3.8.RELEASE", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.plugin-tools/maven-plugin-annotations", 
+      "requirement": "3.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.eclipse.aether/aether-api", 
+      "requirement": "1.1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.eclipse.aether/aether-util", 
+      "requirement": "1.1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.commons/commons-lang3", 
+      "requirement": "3.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-io/commons-io", 
+      "requirement": "1.3.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.hamcrest/hamcrest-core", 
+      "requirement": "1.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-core", 
+      "requirement": "3.1.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven/maven-plugin-api", 
+      "requirement": "3.1.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "4.11", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/parsing_issues/was_empty/common-object-1.0.2.pom.json b/tests/packagedcode/data/m2/parsing_issues/was_empty/common-object-1.0.2.pom.json
index 9058ee1966f..a288651fb17 100644
--- a/tests/packagedcode/data/m2/parsing_issues/was_empty/common-object-1.0.2.pom.json
+++ b/tests/packagedcode/data/m2/parsing_issues/was_empty/common-object-1.0.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "common-object", 
   "version": "1.0.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "common-object", 
   "description": "XSON Common Object", 
diff --git a/tests/packagedcode/data/m2/parsing_issues/was_empty/common-object-1.0.2.pom.package.json b/tests/packagedcode/data/m2/parsing_issues/was_empty/common-object-1.0.2.pom.package.json
index c93e193d414..bdde182ff28 100644
--- a/tests/packagedcode/data/m2/parsing_issues/was_empty/common-object-1.0.2.pom.package.json
+++ b/tests/packagedcode/data/m2/parsing_issues/was_empty/common-object-1.0.2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.xson:common-object", 
+  "type": "maven", 
+  "namespace": "org.xson", 
+  "name": "common-object", 
   "version": "1.0.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "XSON Common Object", 
+  "description": "common-object\nXSON Common Object", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,36 +29,42 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "4.10"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.alibaba:fastjson", 
-        "version": "1.1.41"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.xson:xson", 
-        "version": "1.0.2"
-      }
-    ], 
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "be.cyberelf.nanoxml:lite", 
-        "version": "2.2.3"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "4.10", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.alibaba/fastjson", 
+      "requirement": "1.1.41", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.xson/xson", 
+      "requirement": "1.0.2", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:be.cyberelf.nanoxml/lite", 
+      "requirement": "2.2.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/parsing_issues/was_empty/osgl-http-1.1.2.pom.json b/tests/packagedcode/data/m2/parsing_issues/was_empty/osgl-http-1.1.2.pom.json
index e57291c5766..96460acac99 100644
--- a/tests/packagedcode/data/m2/parsing_issues/was_empty/osgl-http-1.1.2.pom.json
+++ b/tests/packagedcode/data/m2/parsing_issues/was_empty/osgl-http-1.1.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "osgl-http", 
   "version": "1.1.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.sonatype.oss", 
     "artifact_id": "oss-parent", 
diff --git a/tests/packagedcode/data/m2/parsing_issues/was_empty/osgl-http-1.1.2.pom.package.json b/tests/packagedcode/data/m2/parsing_issues/was_empty/osgl-http-1.1.2.pom.package.json
index d18aa135f78..2957ec3ed2d 100644
--- a/tests/packagedcode/data/m2/parsing_issues/was_empty/osgl-http-1.1.2.pom.package.json
+++ b/tests/packagedcode/data/m2/parsing_issues/was_empty/osgl-http-1.1.2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.osgl:osgl-http", 
+  "type": "maven", 
+  "namespace": "org.osgl", 
+  "name": "osgl-http", 
   "version": "1.1.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Utilities for HTTP", 
+  "description": "OSGL HTTP\nUtilities for HTTP", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,41 +21,50 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "4.10"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.carrotsearch:junit-benchmarks", 
-        "version": "0.7.2"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.osgl:osgl-storage", 
-        "version": "1.2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:servlet-api", 
-        "version": "2.5"
-      }
-    ], 
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.osgl:osgl-cache", 
-        "version": "1.0.2"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "4.10", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.carrotsearch/junit-benchmarks", 
+      "requirement": "0.7.2", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.osgl/osgl-storage", 
+      "requirement": "1.2.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/servlet-api", 
+      "requirement": "2.5", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.osgl/osgl-cache", 
+      "requirement": "1.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/plexus/plexus-containers/1.0.2/plexus-containers-1.0.2.pom.json b/tests/packagedcode/data/m2/plexus/plexus-containers/1.0.2/plexus-containers-1.0.2.pom.json
index 0b01dd8cef0..77f60bcfedd 100644
--- a/tests/packagedcode/data/m2/plexus/plexus-containers/1.0.2/plexus-containers-1.0.2.pom.json
+++ b/tests/packagedcode/data/m2/plexus/plexus-containers/1.0.2/plexus-containers-1.0.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-containers", 
   "version": "1.0.2", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "plexus", 
     "artifact_id": "plexus-root", 
diff --git a/tests/packagedcode/data/m2/plexus/plexus-containers/1.0.2/plexus-containers-1.0.2.pom.package.json b/tests/packagedcode/data/m2/plexus/plexus-containers/1.0.2/plexus-containers-1.0.2.pom.package.json
index 93627ea6d53..0e7ddfb2d1b 100644
--- a/tests/packagedcode/data/m2/plexus/plexus-containers/1.0.2/plexus-containers-1.0.2.pom.package.json
+++ b/tests/packagedcode/data/m2/plexus/plexus-containers/1.0.2/plexus-containers-1.0.2.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "plexus:plexus-containers", 
+  "type": "maven", 
+  "namespace": "plexus", 
+  "name": "plexus-containers", 
   "version": "1.0.2", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Parent Plexus Container POM", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/plexus/plexus-root/1.0.3/plexus-root-1.0.3.pom.json b/tests/packagedcode/data/m2/plexus/plexus-root/1.0.3/plexus-root-1.0.3.pom.json
index 2d4d554dc5e..5d14f3af793 100644
--- a/tests/packagedcode/data/m2/plexus/plexus-root/1.0.3/plexus-root-1.0.3.pom.json
+++ b/tests/packagedcode/data/m2/plexus/plexus-root/1.0.3/plexus-root-1.0.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-root", 
   "version": "1.0.3", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {}, 
   "name": "Plexus", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/plexus/plexus-root/1.0.3/plexus-root-1.0.3.pom.package.json b/tests/packagedcode/data/m2/plexus/plexus-root/1.0.3/plexus-root-1.0.3.pom.package.json
index af81d76f566..f425f2876f9 100644
--- a/tests/packagedcode/data/m2/plexus/plexus-root/1.0.3/plexus-root-1.0.3.pom.package.json
+++ b/tests/packagedcode/data/m2/plexus/plexus-root/1.0.3/plexus-root-1.0.3.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "plexus:plexus-root", 
+  "type": "maven", 
+  "namespace": "plexus", 
+  "name": "plexus-root", 
   "version": "1.0.3", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -103,17 +108,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/plexus/plexus-utils/1.0.2/plexus-utils-1.0.2.pom.json b/tests/packagedcode/data/m2/plexus/plexus-utils/1.0.2/plexus-utils-1.0.2.pom.json
index 0df208c8e99..6448779d24f 100644
--- a/tests/packagedcode/data/m2/plexus/plexus-utils/1.0.2/plexus-utils-1.0.2.pom.json
+++ b/tests/packagedcode/data/m2/plexus/plexus-utils/1.0.2/plexus-utils-1.0.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-utils", 
   "version": "1.0.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "plexus", 
     "artifact_id": "plexus-root", 
diff --git a/tests/packagedcode/data/m2/plexus/plexus-utils/1.0.2/plexus-utils-1.0.2.pom.package.json b/tests/packagedcode/data/m2/plexus/plexus-utils/1.0.2/plexus-utils-1.0.2.pom.package.json
index e6bc5f37988..7c0b9407176 100644
--- a/tests/packagedcode/data/m2/plexus/plexus-utils/1.0.2/plexus-utils-1.0.2.pom.package.json
+++ b/tests/packagedcode/data/m2/plexus/plexus-utils/1.0.2/plexus-utils-1.0.2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "plexus:plexus-utils", 
+  "type": "maven", 
+  "namespace": "plexus", 
+  "name": "plexus-utils", 
   "version": "1.0.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Common Utilities", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/quartz/quartz/1.5.1/quartz-1.5.1.pom.json b/tests/packagedcode/data/m2/quartz/quartz/1.5.1/quartz-1.5.1.pom.json
index 92860099254..c2514cb9a7c 100644
--- a/tests/packagedcode/data/m2/quartz/quartz/1.5.1/quartz-1.5.1.pom.json
+++ b/tests/packagedcode/data/m2/quartz/quartz/1.5.1/quartz-1.5.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "quartz", 
   "version": "1.5.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/quartz/quartz/1.5.1/quartz-1.5.1.pom.package.json b/tests/packagedcode/data/m2/quartz/quartz/1.5.1/quartz-1.5.1.pom.package.json
index 3d01f28b452..b058ddfff41 100644
--- a/tests/packagedcode/data/m2/quartz/quartz/1.5.1/quartz-1.5.1.pom.package.json
+++ b/tests/packagedcode/data/m2/quartz/quartz/1.5.1/quartz-1.5.1.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "quartz:quartz", 
+  "type": "maven", 
+  "namespace": "quartz", 
+  "name": "quartz", 
   "version": "1.5.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/regexp/regexp/1.3/regexp-1.3.pom.json b/tests/packagedcode/data/m2/regexp/regexp/1.3/regexp-1.3.pom.json
index 3a6fc1079f5..8cede3b261d 100644
--- a/tests/packagedcode/data/m2/regexp/regexp/1.3/regexp-1.3.pom.json
+++ b/tests/packagedcode/data/m2/regexp/regexp/1.3/regexp-1.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "regexp", 
   "version": "1.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/regexp/regexp/1.3/regexp-1.3.pom.package.json b/tests/packagedcode/data/m2/regexp/regexp/1.3/regexp-1.3.pom.package.json
index bdfc84966e3..1607af02dd2 100644
--- a/tests/packagedcode/data/m2/regexp/regexp/1.3/regexp-1.3.pom.package.json
+++ b/tests/packagedcode/data/m2/regexp/regexp/1.3/regexp-1.3.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "regexp:regexp", 
+  "type": "maven", 
+  "namespace": "regexp", 
+  "name": "regexp", 
   "version": "1.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/validator/commons-validator/1.1.4/commons-validator-1.1.4.pom.json b/tests/packagedcode/data/m2/validator/commons-validator/1.1.4/commons-validator-1.1.4.pom.json
index 923ae6280ed..332db6697f0 100644
--- a/tests/packagedcode/data/m2/validator/commons-validator/1.1.4/commons-validator-1.1.4.pom.json
+++ b/tests/packagedcode/data/m2/validator/commons-validator/1.1.4/commons-validator-1.1.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-validator", 
   "version": "1.1.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/validator/commons-validator/1.1.4/commons-validator-1.1.4.pom.package.json b/tests/packagedcode/data/m2/validator/commons-validator/1.1.4/commons-validator-1.1.4.pom.package.json
index 21d0ba7040c..dc3e430f68a 100644
--- a/tests/packagedcode/data/m2/validator/commons-validator/1.1.4/commons-validator-1.1.4.pom.package.json
+++ b/tests/packagedcode/data/m2/validator/commons-validator/1.1.4/commons-validator-1.1.4.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "commons-validator:commons-validator", 
+  "type": "maven", 
+  "namespace": "commons-validator", 
+  "name": "commons-validator", 
   "version": "1.1.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.json b/tests/packagedcode/data/m2/validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.json
index bd3bd85d5aa..544706ef30a 100644
--- a/tests/packagedcode/data/m2/validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.json
+++ b/tests/packagedcode/data/m2/validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-validator", 
   "version": "1.2.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Validator", 
   "description": "Commons Validator provides the building blocks for both client side validation\n    and server side data validation. It may be used standalone or with a framework like\n    Struts.", 
diff --git a/tests/packagedcode/data/m2/validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.package.json b/tests/packagedcode/data/m2/validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.package.json
index 878fe323c16..33be4a66b11 100644
--- a/tests/packagedcode/data/m2/validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.package.json
+++ b/tests/packagedcode/data/m2/validator/commons-validator/1.2.0/commons-validator-1.2.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "commons-validator:commons-validator", 
+  "type": "maven", 
+  "namespace": "commons-validator", 
+  "name": "commons-validator", 
   "version": "1.2.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Commons Validator provides the building blocks for both client side validation\n    and server side data validation. It may be used standalone or with a framework like\n    Struts.", 
+  "description": "Validator\nCommons Validator provides the building blocks for both client side validation\n    and server side data validation. It may be used standalone or with a framework like\n    Struts.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -243,44 +246,58 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\n/LICENSE.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\n/LICENSE.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-beanutils:commons-beanutils", 
-        "version": "1.7.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-digester:commons-digester", 
-        "version": "1.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "oro:oro", 
-        "version": "2.0.8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "xml-apis:xml-apis", 
-        "version": "2.0.2"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:commons-beanutils/commons-beanutils", 
+      "requirement": "1.7.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-digester/commons-digester", 
+      "requirement": "1.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:oro/oro", 
+      "requirement": "2.0.8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:xml-apis/xml-apis", 
+      "requirement": "2.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/validator/commons-validator/1.3.1/commons-validator-1.3.1.pom.json b/tests/packagedcode/data/m2/validator/commons-validator/1.3.1/commons-validator-1.3.1.pom.json
index df36df1130d..993099c73fc 100644
--- a/tests/packagedcode/data/m2/validator/commons-validator/1.3.1/commons-validator-1.3.1.pom.json
+++ b/tests/packagedcode/data/m2/validator/commons-validator/1.3.1/commons-validator-1.3.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-validator", 
   "version": "1.3.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Validator", 
   "description": "Commons Validator provides the building blocks for both client side validation\n    and server side data validation. It may be used standalone or with a framework like\n    Struts.", 
diff --git a/tests/packagedcode/data/m2/validator/commons-validator/1.3.1/commons-validator-1.3.1.pom.package.json b/tests/packagedcode/data/m2/validator/commons-validator/1.3.1/commons-validator-1.3.1.pom.package.json
index 5190054c13d..1e2d9499425 100644
--- a/tests/packagedcode/data/m2/validator/commons-validator/1.3.1/commons-validator-1.3.1.pom.package.json
+++ b/tests/packagedcode/data/m2/validator/commons-validator/1.3.1/commons-validator-1.3.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "commons-validator:commons-validator", 
+  "type": "maven", 
+  "namespace": "commons-validator", 
+  "name": "commons-validator", 
   "version": "1.3.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Commons Validator provides the building blocks for both client side validation\n    and server side data validation. It may be used standalone or with a framework like\n    Struts.", 
+  "description": "Validator\nCommons Validator provides the building blocks for both client side validation\n    and server side data validation. It may be used standalone or with a framework like\n    Struts.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -250,46 +253,58 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\n/LICENSE.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\n/LICENSE.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-beanutils:commons-beanutils", 
-        "version": "1.7.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-digester:commons-digester", 
-        "version": "1.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "oro:oro", 
-        "version": "2.0.8"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "xml-apis:xml-apis", 
-        "version": "2.0.2"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:commons-beanutils/commons-beanutils", 
+      "requirement": "1.7.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-digester/commons-digester", 
+      "requirement": "1.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:oro/oro", 
+      "requirement": "2.0.8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:xml-apis/xml-apis", 
+      "requirement": "2.0.2", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/velocity/velocity-dep/1.4/velocity-dep-1.4.pom.json b/tests/packagedcode/data/m2/velocity/velocity-dep/1.4/velocity-dep-1.4.pom.json
index 1b9f8898c5c..7b03f67ddca 100644
--- a/tests/packagedcode/data/m2/velocity/velocity-dep/1.4/velocity-dep-1.4.pom.json
+++ b/tests/packagedcode/data/m2/velocity/velocity-dep/1.4/velocity-dep-1.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "velocity-dep", 
   "version": "1.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Velocity", 
   "description": "Velocity is a Java-based template engine. It permits anyone to use the\n    simple yet powerful template language to reference objects defined in Java\n    code.", 
diff --git a/tests/packagedcode/data/m2/velocity/velocity-dep/1.4/velocity-dep-1.4.pom.package.json b/tests/packagedcode/data/m2/velocity/velocity-dep/1.4/velocity-dep-1.4.pom.package.json
index b98f7eac7f1..5cbf7589131 100644
--- a/tests/packagedcode/data/m2/velocity/velocity-dep/1.4/velocity-dep-1.4.pom.package.json
+++ b/tests/packagedcode/data/m2/velocity/velocity-dep/1.4/velocity-dep-1.4.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "velocity:velocity-dep", 
+  "type": "maven", 
+  "namespace": "velocity", 
+  "name": "velocity-dep", 
   "version": "1.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Velocity is a Java-based template engine. It permits anyone to use the\n    simple yet powerful template language to reference objects defined in Java\n    code.", 
+  "description": "Velocity\nVelocity is a Java-based template engine. It permits anyone to use the\n    simple yet powerful template language to reference objects defined in Java\n    code.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,9 +29,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/velocity/velocity/1.4/velocity-1.4.pom.json b/tests/packagedcode/data/m2/velocity/velocity/1.4/velocity-1.4.pom.json
index baf4db95844..620cab3d33b 100644
--- a/tests/packagedcode/data/m2/velocity/velocity/1.4/velocity-1.4.pom.json
+++ b/tests/packagedcode/data/m2/velocity/velocity/1.4/velocity-1.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "velocity", 
   "version": "1.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Velocity", 
   "description": "Velocity is a Java-based template engine. It permits anyone to use the\n    simple yet powerful template language to reference objects defined in Java\n    code.", 
diff --git a/tests/packagedcode/data/m2/velocity/velocity/1.4/velocity-1.4.pom.package.json b/tests/packagedcode/data/m2/velocity/velocity/1.4/velocity-1.4.pom.package.json
index 9147a2fe606..c376ee0f01c 100644
--- a/tests/packagedcode/data/m2/velocity/velocity/1.4/velocity-1.4.pom.package.json
+++ b/tests/packagedcode/data/m2/velocity/velocity/1.4/velocity-1.4.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "velocity:velocity", 
+  "type": "maven", 
+  "namespace": "velocity", 
+  "name": "velocity", 
   "version": "1.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Velocity is a Java-based template engine. It permits anyone to use the\n    simple yet powerful template language to reference objects defined in Java\n    code.", 
+  "description": "Velocity\nVelocity is a Java-based template engine. It permits anyone to use the\n    simple yet powerful template language to reference objects defined in Java\n    code.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,17 +29,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "runtime": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "velocity:velocity-dep", 
-        "version": "1.4"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:velocity/velocity-dep", 
+      "requirement": "1.4", 
+      "scope": "runtime", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom.json b/tests/packagedcode/data/m2/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom.json
index b2a82b643ad..4f17614cf9f 100644
--- a/tests/packagedcode/data/m2/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom.json
+++ b/tests/packagedcode/data/m2/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "xml-apis", 
   "version": "1.0.b2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "XML Commons External Components XML APIs", 
   "description": "xml-commons provides an Apache-hosted set of DOM, SAX, and \n    JAXP interfaces for use in other xml-based projects. Our hope is that we \n    can standardize on both a common version and packaging scheme for these \n    critical XML standards interfaces to make the lives of both our developers \n    and users easier. The External Components portion of xml-commons contains \n    interfaces that are defined by external standards organizations. For DOM, \n    that's the W3C; for SAX it's David Megginson and sax.sourceforge.net; for \n    JAXP it's Sun.", 
diff --git a/tests/packagedcode/data/m2/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom.package.json b/tests/packagedcode/data/m2/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom.package.json
index e29a63de057..652e52ccd3f 100644
--- a/tests/packagedcode/data/m2/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom.package.json
+++ b/tests/packagedcode/data/m2/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "xml-apis:xml-apis", 
+  "type": "maven", 
+  "namespace": "xml-apis", 
+  "name": "xml-apis", 
   "version": "1.0.b2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "xml-commons provides an Apache-hosted set of DOM, SAX, and \n    JAXP interfaces for use in other xml-based projects. Our hope is that we \n    can standardize on both a common version and packaging scheme for these \n    critical XML standards interfaces to make the lives of both our developers \n    and users easier. The External Components portion of xml-commons contains \n    interfaces that are defined by external standards organizations. For DOM, \n    that's the W3C; for SAX it's David Megginson and sax.sourceforge.net; for \n    JAXP it's Sun.", 
+  "description": "XML Commons External Components XML APIs\nxml-commons provides an Apache-hosted set of DOM, SAX, and \n    JAXP interfaces for use in other xml-based projects. Our hope is that we \n    can standardize on both a common version and packaging scheme for these \n    critical XML standards interfaces to make the lives of both our developers \n    and users easier. The External Components portion of xml-commons contains \n    interfaces that are defined by external standards organizations. For DOM, \n    that's the W3C; for SAX it's David Megginson and sax.sourceforge.net; for \n    JAXP it's Sun.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,9 +29,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom.json b/tests/packagedcode/data/m2/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom.json
index 400b2e4ee1f..2c36d5e8308 100644
--- a/tests/packagedcode/data/m2/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom.json
+++ b/tests/packagedcode/data/m2/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "xml-apis", 
   "version": "2.0.2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom.package.json b/tests/packagedcode/data/m2/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom.package.json
index fc302a67b9d..47173b3e1d9 100644
--- a/tests/packagedcode/data/m2/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom.package.json
+++ b/tests/packagedcode/data/m2/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "xml-apis:xml-apis", 
+  "type": "maven", 
+  "namespace": "xml-apis", 
+  "name": "xml-apis", 
   "version": "2.0.2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,17 +21,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "relocation": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "xml-apis:xml-apis", 
-        "version": "1.0.b2"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:xml-apis/xml-apis", 
+      "requirement": "1.0.b2", 
+      "scope": "relocation", 
+      "is_runtime": false, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.pom.json b/tests/packagedcode/data/m2/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.pom.json
index 6b3cb43c601..dd56ff8f37c 100644
--- a/tests/packagedcode/data/m2/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.pom.json
+++ b/tests/packagedcode/data/m2/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "xmlpull", 
   "version": "1.1.3.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "XML Pull Parsing API", 
   "description": null, 
diff --git a/tests/packagedcode/data/m2/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.pom.package.json b/tests/packagedcode/data/m2/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.pom.package.json
index 6254157252a..444d6a8e8d8 100644
--- a/tests/packagedcode/data/m2/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.pom.package.json
+++ b/tests/packagedcode/data/m2/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "xmlpull:xmlpull", 
+  "type": "maven", 
+  "namespace": "xmlpull", 
+  "name": "xmlpull", 
   "version": "1.1.3.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "XML Pull Parsing API", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "Public Domain\nhttp://www.xmlpull.org/v1/download/unpacked/LICENSE.txt", 
   "license_expression": null, 
+  "asserted_license": "Public Domain\nhttp://www.xmlpull.org/v1/download/unpacked/LICENSE.txt", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/m2/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.pom.json b/tests/packagedcode/data/m2/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.pom.json
index 5526b8bc7cb..08094ef3375 100644
--- a/tests/packagedcode/data/m2/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.pom.json
+++ b/tests/packagedcode/data/m2/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "xpp3_min", 
   "version": "1.1.3.4.O", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": "MXP1 is a stable XmlPull parsing engine that is based on ideas from XPP and in particular XPP2 but completely revised and rewritten to take the best advantage of latest JIT JVMs such as Hotspot in JDK 1.4+.", 
diff --git a/tests/packagedcode/data/m2/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.pom.package.json b/tests/packagedcode/data/m2/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.pom.package.json
index 4b585decde4..84a8b7f3408 100644
--- a/tests/packagedcode/data/m2/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.pom.package.json
+++ b/tests/packagedcode/data/m2/xpp3/xpp3_min/1.1.3.4.O/xpp3_min-1.1.3.4.O.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "xpp3:xpp3_min", 
+  "type": "maven", 
+  "namespace": "xpp3", 
+  "name": "xpp3_min", 
   "version": "1.1.3.4.O", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "MXP1 is a stable XmlPull parsing engine that is based on ideas from XPP and in particular XPP2 but completely revised and rewritten to take the best advantage of latest JIT JVMs such as Hotspot in JDK 1.4+.", 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/activemq-camel-pom.xml.json b/tests/packagedcode/data/maven2/activemq-camel-pom.xml.json
index 51a5e2be0eb..a9737f90128 100644
--- a/tests/packagedcode/data/maven2/activemq-camel-pom.xml.json
+++ b/tests/packagedcode/data/maven2/activemq-camel-pom.xml.json
@@ -4,7 +4,7 @@
   "artifact_id": "activemq-camel", 
   "version": "5.4.2", 
   "classifier": null, 
-  "packaging ": "bundle", 
+  "packaging": "bundle", 
   "parent": {
     "group_id": "org.apache.activemq", 
     "artifact_id": "activemq-parent", 
diff --git a/tests/packagedcode/data/maven2/activemq-camel-pom.xml.package.json b/tests/packagedcode/data/maven2/activemq-camel-pom.xml.package.json
index 9d213d42bdb..9f6a13b15f9 100644
--- a/tests/packagedcode/data/maven2/activemq-camel-pom.xml.package.json
+++ b/tests/packagedcode/data/maven2/activemq-camel-pom.xml.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.activemq:activemq-camel", 
+  "type": "maven", 
+  "namespace": "org.apache.activemq", 
+  "name": "activemq-camel", 
   "version": "5.4.2", 
+  "qualifiers": {
+    "packaging": "bundle"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "ActiveMQ component for Camel", 
+  "description": "ActiveMQ :: Camel\nActiveMQ component for Camel", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,69 +23,98 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging-api", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.camel:camel-jms", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.activemq:activemq-core", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.activemq:activemq-pool", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.geronimo.specs:geronimo-annotation_1.0_spec", 
-        "version": "latest.release"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.activemq:activemq-core", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.camel:camel-core", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.camel:camel-spring", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-test", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.hamcrest:hamcrest-all", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:commons-logging/commons-logging-api", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.camel/camel-jms", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.activemq/activemq-core", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.activemq/activemq-pool", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.geronimo.specs/geronimo-annotation_1.0_spec", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.activemq/activemq-core", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.camel/camel-core", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.camel/camel-spring", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-test", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.hamcrest/hamcrest-all", 
+      "requirement": null, 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/adarwin-1.0.pom.json b/tests/packagedcode/data/maven2/adarwin-1.0.pom.json
index 0e74abbf812..ebf777642e2 100644
--- a/tests/packagedcode/data/maven2/adarwin-1.0.pom.json
+++ b/tests/packagedcode/data/maven2/adarwin-1.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "adarwin", 
   "version": "1.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/maven2/adarwin-1.0.pom.package.json b/tests/packagedcode/data/maven2/adarwin-1.0.pom.package.json
index 3f7eb22827f..9c0370cb870 100644
--- a/tests/packagedcode/data/maven2/adarwin-1.0.pom.package.json
+++ b/tests/packagedcode/data/maven2/adarwin-1.0.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "adarwin:adarwin", 
+  "type": "maven", 
+  "namespace": "adarwin", 
+  "name": "adarwin", 
   "version": "1.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/ant-jai-1.7.0.pom.json b/tests/packagedcode/data/maven2/ant-jai-1.7.0.pom.json
index 65df31dec01..83475dea097 100644
--- a/tests/packagedcode/data/maven2/ant-jai-1.7.0.pom.json
+++ b/tests/packagedcode/data/maven2/ant-jai-1.7.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "ant-jai", 
   "version": "1.7.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.ant", 
     "artifact_id": "ant-parent", 
diff --git a/tests/packagedcode/data/maven2/ant-jai-1.7.0.pom.package.json b/tests/packagedcode/data/maven2/ant-jai-1.7.0.pom.package.json
index 9924eac42b4..39218f44588 100644
--- a/tests/packagedcode/data/maven2/ant-jai-1.7.0.pom.package.json
+++ b/tests/packagedcode/data/maven2/ant-jai-1.7.0.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.ant:ant-jai", 
+  "type": "maven", 
+  "namespace": "org.apache.ant", 
+  "name": "ant-jai", 
   "version": "1.7.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "image task and corresponding types.\n  jai (Java Advanced Imaging) is not available in public Maven repositories, therefore the dependencies are included with a scope provided\n    the download URL is http://java.sun.com/products/java-media/jai/", 
@@ -18,29 +21,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.ant:ant", 
-        "version": "1.7.0"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.media:jai-core", 
-        "version": "1.1.2_01"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jai:jai-codec", 
-        "version": "1.1.2.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.ant/ant", 
+      "requirement": "1.7.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.media/jai-core", 
+      "requirement": "1.1.2_01", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jai/jai-codec", 
+      "requirement": "1.1.2.1", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/ant-jsch-1.7.0.pom.json b/tests/packagedcode/data/maven2/ant-jsch-1.7.0.pom.json
index 3ae29e791e9..81e613812f0 100644
--- a/tests/packagedcode/data/maven2/ant-jsch-1.7.0.pom.json
+++ b/tests/packagedcode/data/maven2/ant-jsch-1.7.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "ant-jsch", 
   "version": "1.7.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "org.apache.ant", 
     "artifact_id": "ant-parent", 
diff --git a/tests/packagedcode/data/maven2/ant-jsch-1.7.0.pom.package.json b/tests/packagedcode/data/maven2/ant-jsch-1.7.0.pom.package.json
index 20b5b75d57d..eeddf45daf4 100644
--- a/tests/packagedcode/data/maven2/ant-jsch-1.7.0.pom.package.json
+++ b/tests/packagedcode/data/maven2/ant-jsch-1.7.0.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.ant:ant-jsch", 
+  "type": "maven", 
+  "namespace": "org.apache.ant", 
+  "name": "ant-jsch", 
   "version": "1.7.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "contains the sshexec and scp tasks\n  jsch 0.1.29 might not be available from maven", 
@@ -18,22 +21,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.ant:ant", 
-        "version": "1.7.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.jcraft:jsch", 
-        "version": "0.1.29"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.ant/ant", 
+      "requirement": "1.7.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.jcraft/jsch", 
+      "requirement": "0.1.29", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/aopalliance-1.0.pom.json b/tests/packagedcode/data/maven2/aopalliance-1.0.pom.json
index 11fc39414a6..1de425f89ba 100644
--- a/tests/packagedcode/data/maven2/aopalliance-1.0.pom.json
+++ b/tests/packagedcode/data/maven2/aopalliance-1.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "aopalliance", 
   "version": "1.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "AOP alliance", 
   "description": "AOP Alliance", 
diff --git a/tests/packagedcode/data/maven2/aopalliance-1.0.pom.package.json b/tests/packagedcode/data/maven2/aopalliance-1.0.pom.package.json
index 8d095b0eec2..581a2054fc6 100644
--- a/tests/packagedcode/data/maven2/aopalliance-1.0.pom.package.json
+++ b/tests/packagedcode/data/maven2/aopalliance-1.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "aopalliance:aopalliance", 
+  "type": "maven", 
+  "namespace": "aopalliance", 
+  "name": "aopalliance", 
   "version": "1.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "AOP Alliance", 
+  "description": "AOP alliance\nAOP Alliance", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "Public Domain\nGPL\nhttp://nexb.com", 
   "license_expression": null, 
+  "asserted_license": "Public Domain\nGPL\nhttp://nexb.com", 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/bcel-5.1.pom.json b/tests/packagedcode/data/maven2/bcel-5.1.pom.json
index d11e507269b..b14096a95b9 100644
--- a/tests/packagedcode/data/maven2/bcel-5.1.pom.json
+++ b/tests/packagedcode/data/maven2/bcel-5.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "bcel", 
   "version": "5.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/maven2/bcel-5.1.pom.package.json b/tests/packagedcode/data/maven2/bcel-5.1.pom.package.json
index 0c4a417ea73..84059b20e26 100644
--- a/tests/packagedcode/data/maven2/bcel-5.1.pom.package.json
+++ b/tests/packagedcode/data/maven2/bcel-5.1.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "bcel:bcel", 
+  "type": "maven", 
+  "namespace": "bcel", 
+  "name": "bcel", 
   "version": "5.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/classworlds-1.1-alpha-2.pom.json b/tests/packagedcode/data/maven2/classworlds-1.1-alpha-2.pom.json
index 5081720e304..667630421ae 100644
--- a/tests/packagedcode/data/maven2/classworlds-1.1-alpha-2.pom.json
+++ b/tests/packagedcode/data/maven2/classworlds-1.1-alpha-2.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "classworlds", 
   "version": "1.1-alpha-2", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "classworlds", 
   "description": null, 
diff --git a/tests/packagedcode/data/maven2/classworlds-1.1-alpha-2.pom.package.json b/tests/packagedcode/data/maven2/classworlds-1.1-alpha-2.pom.package.json
index 0bd9f816905..8d5c3264935 100644
--- a/tests/packagedcode/data/maven2/classworlds-1.1-alpha-2.pom.package.json
+++ b/tests/packagedcode/data/maven2/classworlds-1.1-alpha-2.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "classworlds:classworlds", 
+  "type": "maven", 
+  "namespace": "classworlds", 
+  "name": "classworlds", 
   "version": "1.1-alpha-2", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "classworlds", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -47,9 +50,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/commons-fileupload-1.0.pom.json b/tests/packagedcode/data/maven2/commons-fileupload-1.0.pom.json
index 4c8dd393adc..d3c52164aaf 100644
--- a/tests/packagedcode/data/maven2/commons-fileupload-1.0.pom.json
+++ b/tests/packagedcode/data/maven2/commons-fileupload-1.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-fileupload", 
   "version": "1.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "FileUpload", 
   "description": "The FileUpload component provides a simple yet flexible means of adding\n    support for multipart file upload functionality to servlets and web\n    applications.", 
diff --git a/tests/packagedcode/data/maven2/commons-fileupload-1.0.pom.package.json b/tests/packagedcode/data/maven2/commons-fileupload-1.0.pom.package.json
index 9873ee18a50..8433eb9541a 100644
--- a/tests/packagedcode/data/maven2/commons-fileupload-1.0.pom.package.json
+++ b/tests/packagedcode/data/maven2/commons-fileupload-1.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "commons-fileupload:commons-fileupload", 
+  "type": "maven", 
+  "namespace": "commons-fileupload", 
+  "name": "commons-fileupload", 
   "version": "1.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "The FileUpload component provides a simple yet flexible means of adding\n    support for multipart file upload functionality to servlets and web\n    applications.", 
+  "description": "FileUpload\nThe FileUpload component provides a simple yet flexible means of adding\n    support for multipart file upload functionality to servlets and web\n    applications.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -68,24 +71,26 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "servletapi:servletapi", 
-        "version": "2.3"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:servletapi/servletapi", 
+      "requirement": "2.3", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/commons-validator-1.2.0.pom.json b/tests/packagedcode/data/maven2/commons-validator-1.2.0.pom.json
index bd3bd85d5aa..544706ef30a 100644
--- a/tests/packagedcode/data/maven2/commons-validator-1.2.0.pom.json
+++ b/tests/packagedcode/data/maven2/commons-validator-1.2.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "commons-validator", 
   "version": "1.2.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Validator", 
   "description": "Commons Validator provides the building blocks for both client side validation\n    and server side data validation. It may be used standalone or with a framework like\n    Struts.", 
diff --git a/tests/packagedcode/data/maven2/commons-validator-1.2.0.pom.package.json b/tests/packagedcode/data/maven2/commons-validator-1.2.0.pom.package.json
index 878fe323c16..33be4a66b11 100644
--- a/tests/packagedcode/data/maven2/commons-validator-1.2.0.pom.package.json
+++ b/tests/packagedcode/data/maven2/commons-validator-1.2.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "commons-validator:commons-validator", 
+  "type": "maven", 
+  "namespace": "commons-validator", 
+  "name": "commons-validator", 
   "version": "1.2.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Commons Validator provides the building blocks for both client side validation\n    and server side data validation. It may be used standalone or with a framework like\n    Struts.", 
+  "description": "Validator\nCommons Validator provides the building blocks for both client side validation\n    and server side data validation. It may be used standalone or with a framework like\n    Struts.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -243,44 +246,58 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\n/LICENSE.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\n/LICENSE.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-beanutils:commons-beanutils", 
-        "version": "1.7.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-digester:commons-digester", 
-        "version": "1.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "oro:oro", 
-        "version": "2.0.8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "xml-apis:xml-apis", 
-        "version": "2.0.2"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:commons-beanutils/commons-beanutils", 
+      "requirement": "1.7.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-digester/commons-digester", 
+      "requirement": "1.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:oro/oro", 
+      "requirement": "2.0.8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:xml-apis/xml-apis", 
+      "requirement": "2.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/dbwebx_pom.xml.json b/tests/packagedcode/data/maven2/dbwebx_pom.xml.json
index 3aec607a002..8530e98ab5c 100644
--- a/tests/packagedcode/data/maven2/dbwebx_pom.xml.json
+++ b/tests/packagedcode/data/maven2/dbwebx_pom.xml.json
@@ -4,7 +4,7 @@
   "artifact_id": "tools", 
   "version": "0.0.1.SNAPSHOT", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.dbwebx", 
     "artifact_id": "dbwebx", 
diff --git a/tests/packagedcode/data/maven2/dbwebx_pom.xml.package.json b/tests/packagedcode/data/maven2/dbwebx_pom.xml.package.json
index 352e7e11923..ff51d71fc3f 100644
--- a/tests/packagedcode/data/maven2/dbwebx_pom.xml.package.json
+++ b/tests/packagedcode/data/maven2/dbwebx_pom.xml.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.dbwebx:tools", 
+  "type": "maven", 
+  "namespace": "org.dbwebx", 
+  "name": "tools", 
   "version": "0.0.1.SNAPSHOT", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "org.dbwebx::tools", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/easyconf-0.9.0.pom.json b/tests/packagedcode/data/maven2/easyconf-0.9.0.pom.json
index dadf741f0cc..dbb43ce4edf 100644
--- a/tests/packagedcode/data/maven2/easyconf-0.9.0.pom.json
+++ b/tests/packagedcode/data/maven2/easyconf-0.9.0.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "easyconf", 
   "version": "0.9.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Easyconf library", 
   "description": "EasyConf is a library to access configuration of software components and applications. \n     It defines simple conventions to make it easier to use. It was born in a portlets-based \n     portal and has several features useful for this and similar environments.", 
diff --git a/tests/packagedcode/data/maven2/easyconf-0.9.0.pom.package.json b/tests/packagedcode/data/maven2/easyconf-0.9.0.pom.package.json
index 9710c5d357e..813856fd3b2 100644
--- a/tests/packagedcode/data/maven2/easyconf-0.9.0.pom.package.json
+++ b/tests/packagedcode/data/maven2/easyconf-0.9.0.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "easyconf:easyconf", 
+  "type": "maven", 
+  "namespace": "easyconf", 
+  "name": "easyconf", 
   "version": "0.9.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "EasyConf is a library to access configuration of software components and applications. \n     It defines simple conventions to make it easier to use. It was born in a portlets-based \n     portal and has several features useful for this and similar environments.", 
+  "description": "Easyconf library\nEasyConf is a library to access configuration of software components and applications. \n     It defines simple conventions to make it easier to use. It was born in a portlets-based \n     portal and has several features useful for this and similar environments.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -54,102 +57,154 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "log4j:log4j", 
-        "version": "1.2.8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "servletapi:servletapi", 
-        "version": "2.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "struts:struts", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-configuration:commons-configuration", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-collections:commons-collections", 
-        "version": "3.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-lang:commons-lang", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "dom4j:dom4j", 
-        "version": "1.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-digester:commons-digester", 
-        "version": "1.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "xerces:xerces", 
-        "version": "2.2.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "xml-apis:xml-apis", 
-        "version": "2.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "xdoclet:xdoclet", 
-        "version": "1.2.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-beanutils:commons-beanutils-core", 
-        "version": "1.7.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-beanutils:commons-beanutils-bean-collections", 
-        "version": "1.7.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "xdoclet:xdoclet-web-module", 
-        "version": "1.2.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "mx4j:mx4j-jmx", 
-        "version": "2.1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "mx4j:mx4j-impl", 
-        "version": "2.1.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:log4j/log4j", 
+      "requirement": "1.2.8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:servletapi/servletapi", 
+      "requirement": "2.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:struts/struts", 
+      "requirement": "1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-configuration/commons-configuration", 
+      "requirement": "1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-collections/commons-collections", 
+      "requirement": "3.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-lang/commons-lang", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:dom4j/dom4j", 
+      "requirement": "1.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-digester/commons-digester", 
+      "requirement": "1.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:xerces/xerces", 
+      "requirement": "2.2.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:xml-apis/xml-apis", 
+      "requirement": "2.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:xdoclet/xdoclet", 
+      "requirement": "1.2.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-beanutils/commons-beanutils-core", 
+      "requirement": "1.7.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-beanutils/commons-beanutils-bean-collections", 
+      "requirement": "1.7.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:xdoclet/xdoclet-web-module", 
+      "requirement": "1.2.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:mx4j/mx4j-jmx", 
+      "requirement": "2.1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:mx4j/mx4j-impl", 
+      "requirement": "2.1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/findbugs-maven-plugin-1.1.1.pom.json b/tests/packagedcode/data/maven2/findbugs-maven-plugin-1.1.1.pom.json
index 54488ab370b..8ebf8245a4f 100644
--- a/tests/packagedcode/data/maven2/findbugs-maven-plugin-1.1.1.pom.json
+++ b/tests/packagedcode/data/maven2/findbugs-maven-plugin-1.1.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "findbugs-maven-plugin", 
   "version": "1.1.1", 
   "classifier": null, 
-  "packaging ": "maven-plugin", 
+  "packaging": "maven-plugin", 
   "parent": {
     "group_id": "org.codehaus.mojo", 
     "artifact_id": "mojo", 
diff --git a/tests/packagedcode/data/maven2/findbugs-maven-plugin-1.1.1.pom.package.json b/tests/packagedcode/data/maven2/findbugs-maven-plugin-1.1.1.pom.package.json
index 30389cbdc2a..599bf3a2f15 100644
--- a/tests/packagedcode/data/maven2/findbugs-maven-plugin-1.1.1.pom.package.json
+++ b/tests/packagedcode/data/maven2/findbugs-maven-plugin-1.1.1.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.mojo:findbugs-maven-plugin", 
+  "type": "maven", 
+  "namespace": "org.codehaus.mojo", 
+  "name": "findbugs-maven-plugin", 
   "version": "1.1.1", 
+  "qualifiers": {
+    "packaging": "maven-plugin"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "This Plug-In generates reports based on the FindBugs Library", 
+  "description": "Maven FindBugs PlugIn\nThis Plug-In generates reports based on the FindBugs Library", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -47,37 +52,50 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "MIT\nLICENSE.txt", 
   "license_expression": null, 
+  "asserted_license": "MIT\nLICENSE.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven:maven-artifact", 
-        "version": "2.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.reporting:maven-reporting-impl", 
-        "version": "2.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.reporting:maven-reporting-api", 
-        "version": "2.0.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.maven.doxia:doxia-core", 
-        "version": "1.0-alpha-8"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "net.sourceforge.findbugs:findbugs", 
-        "version": "1.2.0"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.maven/maven-artifact", 
+      "requirement": "2.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.reporting/maven-reporting-impl", 
+      "requirement": "2.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.reporting/maven-reporting-api", 
+      "requirement": "2.0.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.maven.doxia/doxia-core", 
+      "requirement": "1.0-alpha-8", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:net.sourceforge.findbugs/findbugs", 
+      "requirement": "1.2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/fna2_pom.xml.json b/tests/packagedcode/data/maven2/fna2_pom.xml.json
index b2a71862947..ec8363d1bc8 100644
--- a/tests/packagedcode/data/maven2/fna2_pom.xml.json
+++ b/tests/packagedcode/data/maven2/fna2_pom.xml.json
@@ -4,7 +4,7 @@
   "artifact_id": "flex_app", 
   "version": "1.0-SNAPSHOT", 
   "classifier": null, 
-  "packaging ": "swf", 
+  "packaging": "swf", 
   "parent": {
     "group_id": "com.adobe.ac.samples.lcds", 
     "artifact_id": "custom", 
diff --git a/tests/packagedcode/data/maven2/fna2_pom.xml.package.json b/tests/packagedcode/data/maven2/fna2_pom.xml.package.json
index 9181293777b..28b978ec13f 100644
--- a/tests/packagedcode/data/maven2/fna2_pom.xml.package.json
+++ b/tests/packagedcode/data/maven2/fna2_pom.xml.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "com.adobe.ac.samples.lcds:flex_app", 
+  "type": "maven", 
+  "namespace": "com.adobe.ac.samples.lcds", 
+  "name": "flex_app", 
   "version": "1.0-SNAPSHOT", 
+  "qualifiers": {
+    "packaging": "swf"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "This project hold the flex (blazeds enabled) flex front-end.\n        Its architecture is based on adobe consulting mvn framework: cairngorm.", 
+  "description": "com.adobe.ac.samples.lcds custom flex_app\nThis project hold the flex (blazeds enabled) flex front-end.\n        Its architecture is based on adobe consulting mvn framework: cairngorm.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,68 +23,90 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "info.flex-mojos:testing-support", 
-        "version": "${flex-mojos.version}"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.adobe.flexunit:flexunit", 
-        "version": "${flexUnit.version}"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.adobe.flexunit:flexunit-optional", 
-        "version": "${flexUnit.version}"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.adobe.ac.samples.lcds:blazeds_service_config", 
-        "version": "1.0-SNAPSHOT"
-      }
-    ], 
-    "internal": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.adobe.ac.samples.lcds:flex_remoted_objects", 
-        "version": "1.0-SNAPSHOT"
-      }
-    ], 
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.adobe.flex:compiler", 
-        "version": "${flex.sdk.version}"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.adobe.flex.framework:flex-framework", 
-        "version": "${flex.sdk.version}"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.adobe.cairngorm:cairngorm", 
-        "version": "${cairngorm.version}"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.adobe.cairngorm:cairngorm-enterprise", 
-        "version": "${cairngorm.version}"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.adobe.lcds:fds", 
-        "version": "${lcds.version}"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:info.flex-mojos/testing-support", 
+      "requirement": "${flex-mojos.version}", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.adobe.flexunit/flexunit", 
+      "requirement": "${flexUnit.version}", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.adobe.flexunit/flexunit-optional", 
+      "requirement": "${flexUnit.version}", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.adobe.ac.samples.lcds/blazeds_service_config", 
+      "requirement": "1.0-SNAPSHOT", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.adobe.ac.samples.lcds/flex_remoted_objects", 
+      "requirement": "1.0-SNAPSHOT", 
+      "scope": "internal", 
+      "is_runtime": false, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.adobe.flex/compiler", 
+      "requirement": "${flex.sdk.version}", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.adobe.flex.framework/flex-framework", 
+      "requirement": "${flex.sdk.version}", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.adobe.cairngorm/cairngorm", 
+      "requirement": "${cairngorm.version}", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.adobe.cairngorm/cairngorm-enterprise", 
+      "requirement": "${cairngorm.version}", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.adobe.lcds/fds", 
+      "requirement": "${lcds.version}", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/fna_pom_project.xml.json b/tests/packagedcode/data/maven2/fna_pom_project.xml.json
index d08f87aa130..00b8171b441 100644
--- a/tests/packagedcode/data/maven2/fna_pom_project.xml.json
+++ b/tests/packagedcode/data/maven2/fna_pom_project.xml.json
@@ -4,7 +4,7 @@
   "artifact_id": "bash_flex_app", 
   "version": "1.0", 
   "classifier": null, 
-  "packaging ": "swf", 
+  "packaging": "swf", 
   "parent": {
     "group_id": "com.adobe.ac.samples.bash", 
     "artifact_id": "bash", 
diff --git a/tests/packagedcode/data/maven2/fna_pom_project.xml.package.json b/tests/packagedcode/data/maven2/fna_pom_project.xml.package.json
index 07da585a357..416fd91d917 100644
--- a/tests/packagedcode/data/maven2/fna_pom_project.xml.package.json
+++ b/tests/packagedcode/data/maven2/fna_pom_project.xml.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "com.adobe.ac.samples.bash:bash_flex_app", 
+  "type": "maven", 
+  "namespace": "com.adobe.ac.samples.bash", 
+  "name": "bash_flex_app", 
   "version": "1.0", 
+  "qualifiers": {
+    "packaging": "swf"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "This project hold the flex (blazeds enabled) flex front-end.\n\tIts architecture is based on adobe consulting mvn framework: cairngorm.", 
+  "description": "com.adobe.ac.samples.bash bash bash_flex_app\nThis project hold the flex (blazeds enabled) flex front-end.\n\tIts architecture is based on adobe consulting mvn framework: cairngorm.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,53 +23,66 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.adobe.flex:compiler", 
-        "version": "${flex.sdk.version}"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.adobe.flex.framework:flex-framework", 
-        "version": "${flex.sdk.version}"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.adobe.cairngorm:cairngorm", 
-        "version": "${cairngorm.version}"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.adobe.ac.samples.bash:bash_blazeds_service_config", 
-        "version": "1.0"
-      }
-    ], 
-    "internal": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.adobe.ac.samples.bash:bash_flex_remoted_objects", 
-        "version": "1.0"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.adobe.flexunit:flexunit", 
-        "version": "${flexunit.version}"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "info.flex-mojos:testing-support", 
-        "version": "${flex-mojos.version}"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:com.adobe.ac.samples.bash/bash_blazeds_service_config", 
+      "requirement": "1.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.adobe.ac.samples.bash/bash_flex_remoted_objects", 
+      "requirement": "1.0", 
+      "scope": "internal", 
+      "is_runtime": false, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.adobe.flex/compiler", 
+      "requirement": "${flex.sdk.version}", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.adobe.flex.framework/flex-framework", 
+      "requirement": "${flex.sdk.version}", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.adobe.cairngorm/cairngorm", 
+      "requirement": "${cairngorm.version}", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.adobe.flexunit/flexunit", 
+      "requirement": "${flexunit.version}", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:info.flex-mojos/testing-support", 
+      "requirement": "${flex-mojos.version}", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/foo-pom.xml.json b/tests/packagedcode/data/maven2/foo-pom.xml.json
index 41d3869af21..91b3a056f5f 100644
--- a/tests/packagedcode/data/maven2/foo-pom.xml.json
+++ b/tests/packagedcode/data/maven2/foo-pom.xml.json
@@ -4,7 +4,7 @@
   "artifact_id": "baz-bar-parent", 
   "version": "1.0", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "com.myco.foo", 
     "artifact_id": "root-parent", 
diff --git a/tests/packagedcode/data/maven2/foo-pom.xml.package.json b/tests/packagedcode/data/maven2/foo-pom.xml.package.json
index b55c3404408..c799ec75550 100644
--- a/tests/packagedcode/data/maven2/foo-pom.xml.package.json
+++ b/tests/packagedcode/data/maven2/foo-pom.xml.package.json
@@ -1,7 +1,12 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "com.myco.foo.bar.baz:baz-bar-parent", 
+  "type": "maven", 
+  "namespace": "com.myco.foo.bar.baz", 
+  "name": "baz-bar-parent", 
   "version": "1.0", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": null, 
@@ -26,27 +31,34 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "Eclipse Public License - v 1.0\nhttp://www.eclipse.org/legal/epl-v10.html", 
   "license_expression": null, 
+  "asserted_license": "Eclipse Public License - v 1.0\nhttp://www.eclipse.org/legal/epl-v10.html", 
   "notice_text": null, 
-  "dependencies": {
-    "import": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.myco.foo:common-dependencies", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework.boot:spring-boot-dependencies", 
-        "version": "1.4.2.RELEASE"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework.cloud:spring-cloud-dependencies", 
-        "version": "Camden.SR5"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:com.myco.foo/common-dependencies", 
+      "requirement": "1.1", 
+      "scope": "import", 
+      "is_runtime": false, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework.boot/spring-boot-dependencies", 
+      "requirement": "1.4.2.RELEASE", 
+      "scope": "import", 
+      "is_runtime": false, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework.cloud/spring-cloud-dependencies", 
+      "requirement": "Camden.SR5", 
+      "scope": "import", 
+      "is_runtime": false, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/gero_pom.xml.json b/tests/packagedcode/data/maven2/gero_pom.xml.json
index 164be99b944..4b328c00fde 100644
--- a/tests/packagedcode/data/maven2/gero_pom.xml.json
+++ b/tests/packagedcode/data/maven2/gero_pom.xml.json
@@ -4,7 +4,7 @@
   "artifact_id": "axis", 
   "version": "1.4_1-SNAPSHOT", 
   "classifier": null, 
-  "packaging ": "bundle", 
+  "packaging": "bundle", 
   "parent": {
     "group_id": "org.apache.geronimo.framework", 
     "artifact_id": "framework", 
diff --git a/tests/packagedcode/data/maven2/gero_pom.xml.package.json b/tests/packagedcode/data/maven2/gero_pom.xml.package.json
index 95b85e2e768..0ed759e09b6 100644
--- a/tests/packagedcode/data/maven2/gero_pom.xml.package.json
+++ b/tests/packagedcode/data/maven2/gero_pom.xml.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.geronimo.bundles:axis", 
+  "type": "maven", 
+  "namespace": "org.apache.geronimo.bundles", 
+  "name": "axis", 
   "version": "1.4_1-SNAPSHOT", 
+  "qualifiers": {
+    "packaging": "bundle"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "This bundle simply wraps axis-1.4.jar.", 
+  "description": "Apache Geronimo Bundles: axis-1.4\nThis bundle simply wraps axis-1.4.jar.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +23,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.axis:axis", 
-        "version": "1.4"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.axis/axis", 
+      "requirement": "1.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/idega_pom.xml.json b/tests/packagedcode/data/maven2/idega_pom.xml.json
index 190ec9b7d41..d7d6e8a3ff2 100644
--- a/tests/packagedcode/data/maven2/idega_pom.xml.json
+++ b/tests/packagedcode/data/maven2/idega_pom.xml.json
@@ -4,7 +4,7 @@
   "artifact_id": "com.idega.block.contract", 
   "version": "4.1.3-SNAPSHOT", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "com.idega.block.addon", 
     "artifact_id": "com.idega.block.addon", 
diff --git a/tests/packagedcode/data/maven2/idega_pom.xml.package.json b/tests/packagedcode/data/maven2/idega_pom.xml.package.json
index 0680ac7d47f..ce6eb96beb3 100644
--- a/tests/packagedcode/data/maven2/idega_pom.xml.package.json
+++ b/tests/packagedcode/data/maven2/idega_pom.xml.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "com.idega.block.addon:com.idega.block.contract", 
+  "type": "maven", 
+  "namespace": "com.idega.block.addon", 
+  "name": "com.idega.block.contract", 
   "version": "4.1.3-SNAPSHOT", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Contract", 
+  "description": "idegaWeb Contract Block\nContract", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -47,32 +50,42 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.idega.block.platform:com.idega.core", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.idega.block.platform:com.idega.block.media", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "itextpdf:itext-paulo", 
-        "version": "${itextpdf-itext-paulo-version}"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "itext:itext-xml", 
-        "version": "${itext-itext-xml-version}"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:com.idega.block.platform/com.idega.core", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.idega.block.platform/com.idega.block.media", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:itextpdf/itext-paulo", 
+      "requirement": "${itextpdf-itext-paulo-version}", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:itext/itext-xml", 
+      "requirement": "${itext-itext-xml-version}", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/jrecordbind-2.3.4.pom.json b/tests/packagedcode/data/maven2/jrecordbind-2.3.4.pom.json
index c1f8baf21cc..adb1b78461b 100644
--- a/tests/packagedcode/data/maven2/jrecordbind-2.3.4.pom.json
+++ b/tests/packagedcode/data/maven2/jrecordbind-2.3.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "jrecordbind${artifactId.ext}", 
   "version": "2.3.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "jrecordbind", 
   "description": "Transform fixed-length and variable-length text files into beans and back", 
diff --git a/tests/packagedcode/data/maven2/jrecordbind-2.3.4.pom.package.json b/tests/packagedcode/data/maven2/jrecordbind-2.3.4.pom.package.json
index 3f222424c14..82759ce2c1e 100644
--- a/tests/packagedcode/data/maven2/jrecordbind-2.3.4.pom.package.json
+++ b/tests/packagedcode/data/maven2/jrecordbind-2.3.4.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "it.assist.jrecordbind:jrecordbind${artifactId.ext}", 
+  "type": "maven", 
+  "namespace": "it.assist.jrecordbind", 
+  "name": "jrecordbind${artifactId.ext}", 
   "version": "2.3.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Transform fixed-length and variable-length text files into beans and back", 
+  "description": "jrecordbind\nTransform fixed-length and variable-length text files into beans and back", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,32 +29,42 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "LGPL\nhttp://www.gnu.org/copyleft/lesser.html", 
   "license_expression": null, 
+  "asserted_license": "LGPL\nhttp://www.gnu.org/copyleft/lesser.html", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "relaxngDatatype:relaxngDatatype", 
-        "version": "20020414"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.sun.xml.bind:jaxb-impl", 
-        "version": "2.1.11"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.sun.xml.bind:jaxb-xjc", 
-        "version": "2.1.11"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.sun.xsom:xsom", 
-        "version": "20081112"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:relaxngDatatype/relaxngDatatype", 
+      "requirement": "20020414", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.sun.xml.bind/jaxb-impl", 
+      "requirement": "2.1.11", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.sun.xml.bind/jaxb-xjc", 
+      "requirement": "2.1.11", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.sun.xsom/xsom", 
+      "requirement": "20081112", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/logback-access.pom.json b/tests/packagedcode/data/maven2/logback-access.pom.json
index 4cdc7ab520e..e98f3d8917e 100644
--- a/tests/packagedcode/data/maven2/logback-access.pom.json
+++ b/tests/packagedcode/data/maven2/logback-access.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "logback-access", 
   "version": "0.2.5", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "ch.qos.logback", 
     "artifact_id": "logback", 
diff --git a/tests/packagedcode/data/maven2/logback-access.pom.package.json b/tests/packagedcode/data/maven2/logback-access.pom.package.json
index 2d372281121..15782c58bf8 100644
--- a/tests/packagedcode/data/maven2/logback-access.pom.package.json
+++ b/tests/packagedcode/data/maven2/logback-access.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "ch.qos.logback:logback-access", 
+  "type": "maven", 
+  "namespace": "ch.qos.logback", 
+  "name": "logback-access", 
   "version": "0.2.5", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Logback: the generic, reliable, fast and flexible logging library for Java.", 
+  "description": "Logback Access Module\nLogback: the generic, reliable, fast and flexible logging library for Java.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,37 +21,50 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "GNU Lesser General Public License\nhttp://www.gnu.org/licenses/lgpl.html", 
   "license_expression": null, 
+  "asserted_license": "GNU Lesser General Public License\nhttp://www.gnu.org/licenses/lgpl.html", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "ch.qos.logback:logback-core", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "tomcat:catalina", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.mortbay.jetty:jetty", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.caucho:resin", 
-        "version": "latest.release"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.mortbay.jetty:servlet-api-2.5", 
-        "version": "latest.release"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:ch.qos.logback/logback-core", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:tomcat/catalina", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.mortbay.jetty/jetty", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.caucho/resin", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.mortbay.jetty/servlet-api-2.5", 
+      "requirement": null, 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/plexus-interactivity-api-1.0-alpha-4.pom.json b/tests/packagedcode/data/maven2/plexus-interactivity-api-1.0-alpha-4.pom.json
index 972410fdd4c..4fdd661088b 100644
--- a/tests/packagedcode/data/maven2/plexus-interactivity-api-1.0-alpha-4.pom.json
+++ b/tests/packagedcode/data/maven2/plexus-interactivity-api-1.0-alpha-4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "plexus-interactivity-api", 
   "version": "1.0-alpha-4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Plexus Default Interactivity Handler", 
   "description": null, 
diff --git a/tests/packagedcode/data/maven2/plexus-interactivity-api-1.0-alpha-4.pom.package.json b/tests/packagedcode/data/maven2/plexus-interactivity-api-1.0-alpha-4.pom.package.json
index 64e9e3f1a0e..562bb0efae7 100644
--- a/tests/packagedcode/data/maven2/plexus-interactivity-api-1.0-alpha-4.pom.package.json
+++ b/tests/packagedcode/data/maven2/plexus-interactivity-api-1.0-alpha-4.pom.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.codehaus.plexus:plexus-interactivity-api", 
+  "type": "maven", 
+  "namespace": "org.codehaus.plexus", 
+  "name": "plexus-interactivity-api", 
   "version": "1.0-alpha-4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Plexus Default Interactivity Handler", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -103,34 +106,42 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.codehaus.plexus:plexus-container-default", 
-        "version": "1.0-alpha-7"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "classworlds:classworlds", 
-        "version": "1.1-alpha-2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "plexus:plexus-utils", 
-        "version": "1.0.2"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.codehaus.plexus/plexus-container-default", 
+      "requirement": "1.0-alpha-7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:classworlds/classworlds", 
+      "requirement": "1.1-alpha-2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:plexus/plexus-utils", 
+      "requirement": "1.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/proper_pom.xml.json b/tests/packagedcode/data/maven2/proper_pom.xml.json
index 164be99b944..4b328c00fde 100644
--- a/tests/packagedcode/data/maven2/proper_pom.xml.json
+++ b/tests/packagedcode/data/maven2/proper_pom.xml.json
@@ -4,7 +4,7 @@
   "artifact_id": "axis", 
   "version": "1.4_1-SNAPSHOT", 
   "classifier": null, 
-  "packaging ": "bundle", 
+  "packaging": "bundle", 
   "parent": {
     "group_id": "org.apache.geronimo.framework", 
     "artifact_id": "framework", 
diff --git a/tests/packagedcode/data/maven2/proper_pom.xml.package.json b/tests/packagedcode/data/maven2/proper_pom.xml.package.json
index 95b85e2e768..0ed759e09b6 100644
--- a/tests/packagedcode/data/maven2/proper_pom.xml.package.json
+++ b/tests/packagedcode/data/maven2/proper_pom.xml.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.geronimo.bundles:axis", 
+  "type": "maven", 
+  "namespace": "org.apache.geronimo.bundles", 
+  "name": "axis", 
   "version": "1.4_1-SNAPSHOT", 
+  "qualifiers": {
+    "packaging": "bundle"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "This bundle simply wraps axis-1.4.jar.", 
+  "description": "Apache Geronimo Bundles: axis-1.4\nThis bundle simply wraps axis-1.4.jar.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +23,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.axis:axis", 
-        "version": "1.4"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.axis/axis", 
+      "requirement": "1.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/rel_pom.xml.json b/tests/packagedcode/data/maven2/rel_pom.xml.json
index a1db0dd8a88..4ece15018bf 100644
--- a/tests/packagedcode/data/maven2/rel_pom.xml.json
+++ b/tests/packagedcode/data/maven2/rel_pom.xml.json
@@ -4,7 +4,7 @@
   "artifact_id": "modeler", 
   "version": "0.1", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "org.modeler~modeler", 
   "description": null, 
diff --git a/tests/packagedcode/data/maven2/rel_pom.xml.package.json b/tests/packagedcode/data/maven2/rel_pom.xml.package.json
index 7476aee3b7c..36e178c5ab6 100644
--- a/tests/packagedcode/data/maven2/rel_pom.xml.package.json
+++ b/tests/packagedcode/data/maven2/rel_pom.xml.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.modeler:modeler", 
+  "type": "maven", 
+  "namespace": "org.modeler", 
+  "name": "modeler", 
   "version": "0.1", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "org.modeler~modeler", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,57 +21,82 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.ant:ant", 
-        "version": "1.7.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-lang:commons-lang", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-digester:commons-digester", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "dom4j:dom4j", 
-        "version": "1.6.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.hibernate:hibernate-annotations", 
-        "version": "3.4.0.GA"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.hibernate:hibernate-entitymanager", 
-        "version": "3.4.0.GA"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.hibernate:ejb3-persistence", 
-        "version": "3.3.2.Beta1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.slf4j:slf4j-jcl", 
-        "version": "1.4.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "postgresql:postgresql", 
-        "version": "8.3-603.jdbc4"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.apache.ant/ant", 
+      "requirement": "1.7.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-lang/commons-lang", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-digester/commons-digester", 
+      "requirement": "2.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:dom4j/dom4j", 
+      "requirement": "1.6.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.hibernate/hibernate-annotations", 
+      "requirement": "3.4.0.GA", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.hibernate/hibernate-entitymanager", 
+      "requirement": "3.4.0.GA", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.hibernate/ejb3-persistence", 
+      "requirement": "3.3.2.Beta1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.slf4j/slf4j-jcl", 
+      "requirement": "1.4.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:postgresql/postgresql", 
+      "requirement": "8.3-603.jdbc4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/sea_pom.xml.json b/tests/packagedcode/data/maven2/sea_pom.xml.json
index 3dae5df34fa..d0fced77003 100644
--- a/tests/packagedcode/data/maven2/sea_pom.xml.json
+++ b/tests/packagedcode/data/maven2/sea_pom.xml.json
@@ -4,7 +4,7 @@
   "artifact_id": "root", 
   "version": "2.2.0-SNAPSHOT", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.jboss.seam", 
     "artifact_id": "root", 
diff --git a/tests/packagedcode/data/maven2/sea_pom.xml.package.json b/tests/packagedcode/data/maven2/sea_pom.xml.package.json
index 90750b91a64..04733a22f28 100644
--- a/tests/packagedcode/data/maven2/sea_pom.xml.package.json
+++ b/tests/packagedcode/data/maven2/sea_pom.xml.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "no.knowit.seam:root", 
+  "type": "maven", 
+  "namespace": "no.knowit.seam", 
+  "name": "root", 
   "version": "2.2.0-SNAPSHOT", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "The Seam Maven Reference implementation root POM. \n    You can use this POM as a template for your own root pom.", 
+  "description": "no.knowit.seam : root : 2.2.0-SNAPSHOT\nThe Seam Maven Reference implementation root POM. \n    You can use this POM as a template for your own root pom.", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -40,9 +45,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/specs-1.3.pom.json b/tests/packagedcode/data/maven2/specs-1.3.pom.json
index a454eb03a08..6d63d5e1a21 100644
--- a/tests/packagedcode/data/maven2/specs-1.3.pom.json
+++ b/tests/packagedcode/data/maven2/specs-1.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "specs", 
   "version": "1.3", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "org.apache.geronimo.genesis.config", 
     "artifact_id": "project-config", 
diff --git a/tests/packagedcode/data/maven2/specs-1.3.pom.package.json b/tests/packagedcode/data/maven2/specs-1.3.pom.package.json
index 6f38b8387f2..b7833e1da7e 100644
--- a/tests/packagedcode/data/maven2/specs-1.3.pom.package.json
+++ b/tests/packagedcode/data/maven2/specs-1.3.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.apache.geronimo.specs:specs", 
+  "type": "maven", 
+  "namespace": "org.apache.geronimo.specs", 
+  "name": "specs", 
   "version": "1.3", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": "Provides open-source implementations of Sun specifications.", 
+  "description": "Geronimo Specifications\nProvides open-source implementations of Sun specifications.", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,17 +23,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/spring-2.5.4.pom.json b/tests/packagedcode/data/maven2/spring-2.5.4.pom.json
index f75fc83171a..804c8aadc07 100644
--- a/tests/packagedcode/data/maven2/spring-2.5.4.pom.json
+++ b/tests/packagedcode/data/maven2/spring-2.5.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "spring", 
   "version": "2.5.4", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Spring Framework", 
   "description": "Spring Framework", 
diff --git a/tests/packagedcode/data/maven2/spring-2.5.4.pom.package.json b/tests/packagedcode/data/maven2/spring-2.5.4.pom.package.json
index 4c97b710c8e..e453c47c846 100644
--- a/tests/packagedcode/data/maven2/spring-2.5.4.pom.package.json
+++ b/tests/packagedcode/data/maven2/spring-2.5.4.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.springframework:spring", 
+  "type": "maven", 
+  "namespace": "org.springframework", 
+  "name": "spring", 
   "version": "2.5.4", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Spring Framework", 
@@ -26,339 +29,530 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "aopalliance:aopalliance", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "asm:asm", 
-        "version": "2.2.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "asm:asm-commons", 
-        "version": "2.2.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "asm:asm-util", 
-        "version": "2.2.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "aspectj:aspectjrt", 
-        "version": "1.5.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "aspectj:aspectjweaver", 
-        "version": "1.5.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "backport-util-concurrent:backport-util-concurrent", 
-        "version": "3.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "c3p0:c3p0", 
-        "version": "0.9.1.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "cglib:cglib-nodep", 
-        "version": "2.1_3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-attributes:commons-attributes-api", 
-        "version": "2.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-attributes:commons-attributes-compiler", 
-        "version": "2.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-beanutils:commons-beanutils", 
-        "version": "1.7.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-collections:commons-collections", 
-        "version": "3.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-dbcp:commons-dbcp", 
-        "version": "1.2.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-fileupload:commons-fileupload", 
-        "version": "1.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-httpclient:commons-httpclient", 
-        "version": "3.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-pool:commons-pool", 
-        "version": "1.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.bea.wlplatform:commonj-twm", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.experlog:xapool", 
-        "version": "1.5.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.ibatis:ibatis-sqlmap", 
-        "version": "2.3.0.677"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.jamonapi:jamon", 
-        "version": "2.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.lowagie:itext", 
-        "version": "2.0.7"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.oracle.toplink:toplink", 
-        "version": "10.1.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.oracle:toplink-essentials", 
-        "version": "2.41"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.oracle:oc4j", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "freemarker:freemarker", 
-        "version": "2.3.12"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "groovy:groovy", 
-        "version": "1.5.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "hessian:hessian", 
-        "version": "3.1.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jasperreports:jasperreports", 
-        "version": "2.0.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jexcelapi:jxl", 
-        "version": "2.6.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jotm:jotm", 
-        "version": "2.0.10"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jruby:jruby-bin", 
-        "version": "1.0.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "log4j:log4j", 
-        "version": "1.2.15"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "net.sf.ehcache:ehcache", 
-        "version": "1.4.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.axis:axis", 
-        "version": "1.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.tiles:tiles-api", 
-        "version": "2.0.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.tiles:tiles-core", 
-        "version": "2.0.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.tiles:tiles-jsp", 
-        "version": "2.0.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.beanshell:bsh", 
-        "version": "2.0b4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.hibernate:hibernate", 
-        "version": "3.2.6.ga"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.hibernate:hibernate-entitymanager", 
-        "version": "3.3.2.ga"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "poi:poi", 
-        "version": "3.0.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "opensymphony:quartz-all", 
-        "version": "1.6.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "struts:struts", 
-        "version": "1.2.9"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "taglibs:standard", 
-        "version": "1.1.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "tomcat:catalina", 
-        "version": "5.5.23"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "velocity:velocity", 
-        "version": "1.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "velocity-tools:velocity-tools-generic", 
-        "version": "1.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "velocity-tools:velocity-tools-view", 
-        "version": "1.4"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.activation:activation", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.ejb:ejb", 
-        "version": "3.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.faces:jsf-api", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.jdo:jdo2-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.jms:jms", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.mail:mail", 
-        "version": "1.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.persistence:persistence-api", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.portlet:portlet-api", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.resource:connector-api", 
-        "version": "1.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:jsp-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:jstl", 
-        "version": "1.1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:servlet-api", 
-        "version": "2.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.transaction:jta", 
-        "version": "1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.xml:jaxrpc-api", 
-        "version": "1.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:aopalliance/aopalliance", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:asm/asm", 
+      "requirement": "2.2.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:asm/asm-commons", 
+      "requirement": "2.2.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:asm/asm-util", 
+      "requirement": "2.2.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:aspectj/aspectjrt", 
+      "requirement": "1.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:aspectj/aspectjweaver", 
+      "requirement": "1.5.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:backport-util-concurrent/backport-util-concurrent", 
+      "requirement": "3.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:c3p0/c3p0", 
+      "requirement": "0.9.1.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:cglib/cglib-nodep", 
+      "requirement": "2.1_3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-attributes/commons-attributes-api", 
+      "requirement": "2.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-attributes/commons-attributes-compiler", 
+      "requirement": "2.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-beanutils/commons-beanutils", 
+      "requirement": "1.7.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-collections/commons-collections", 
+      "requirement": "3.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-dbcp/commons-dbcp", 
+      "requirement": "1.2.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-fileupload/commons-fileupload", 
+      "requirement": "1.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-httpclient/commons-httpclient", 
+      "requirement": "3.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-pool/commons-pool", 
+      "requirement": "1.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.bea.wlplatform/commonj-twm", 
+      "requirement": "1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.experlog/xapool", 
+      "requirement": "1.5.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.ibatis/ibatis-sqlmap", 
+      "requirement": "2.3.0.677", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.jamonapi/jamon", 
+      "requirement": "2.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.lowagie/itext", 
+      "requirement": "2.0.7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.oracle.toplink/toplink", 
+      "requirement": "10.1.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.oracle/toplink-essentials", 
+      "requirement": "2.41", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.oracle/oc4j", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:freemarker/freemarker", 
+      "requirement": "2.3.12", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:groovy/groovy", 
+      "requirement": "1.5.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:hessian/hessian", 
+      "requirement": "3.1.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jasperreports/jasperreports", 
+      "requirement": "2.0.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jexcelapi/jxl", 
+      "requirement": "2.6.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jotm/jotm", 
+      "requirement": "2.0.10", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jruby/jruby-bin", 
+      "requirement": "1.0.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:log4j/log4j", 
+      "requirement": "1.2.15", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:net.sf.ehcache/ehcache", 
+      "requirement": "1.4.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.axis/axis", 
+      "requirement": "1.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.tiles/tiles-api", 
+      "requirement": "2.0.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.tiles/tiles-core", 
+      "requirement": "2.0.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.tiles/tiles-jsp", 
+      "requirement": "2.0.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.beanshell/bsh", 
+      "requirement": "2.0b4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.hibernate/hibernate", 
+      "requirement": "3.2.6.ga", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.hibernate/hibernate-entitymanager", 
+      "requirement": "3.3.2.ga", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:poi/poi", 
+      "requirement": "3.0.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:opensymphony/quartz-all", 
+      "requirement": "1.6.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:struts/struts", 
+      "requirement": "1.2.9", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:taglibs/standard", 
+      "requirement": "1.1.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:tomcat/catalina", 
+      "requirement": "5.5.23", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:velocity/velocity", 
+      "requirement": "1.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:velocity-tools/velocity-tools-generic", 
+      "requirement": "1.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:velocity-tools/velocity-tools-view", 
+      "requirement": "1.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.activation/activation", 
+      "requirement": "1.1", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.ejb/ejb", 
+      "requirement": "3.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.faces/jsf-api", 
+      "requirement": "1.1", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.jdo/jdo2-api", 
+      "requirement": "2.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.jms/jms", 
+      "requirement": "1.1", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.mail/mail", 
+      "requirement": "1.4", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.persistence/persistence-api", 
+      "requirement": "1.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.portlet/portlet-api", 
+      "requirement": "1.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.resource/connector-api", 
+      "requirement": "1.5", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/jsp-api", 
+      "requirement": "2.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/jstl", 
+      "requirement": "1.1.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/servlet-api", 
+      "requirement": "2.4", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.transaction/jta", 
+      "requirement": "1.1", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.xml/jaxrpc-api", 
+      "requirement": "1.1", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/spring-orm-2.5.3.pom.json b/tests/packagedcode/data/maven2/spring-orm-2.5.3.pom.json
index 1aa563c1c59..7ed4bda074f 100644
--- a/tests/packagedcode/data/maven2/spring-orm-2.5.3.pom.json
+++ b/tests/packagedcode/data/maven2/spring-orm-2.5.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "spring-orm", 
   "version": "2.5.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Spring Framework: ORM", 
   "description": "Spring Framework: ORM", 
diff --git a/tests/packagedcode/data/maven2/spring-orm-2.5.3.pom.package.json b/tests/packagedcode/data/maven2/spring-orm-2.5.3.pom.package.json
index 20fed2f093e..435e65fdef6 100644
--- a/tests/packagedcode/data/maven2/spring-orm-2.5.3.pom.package.json
+++ b/tests/packagedcode/data/maven2/spring-orm-2.5.3.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.springframework:spring-orm", 
+  "type": "maven", 
+  "namespace": "org.springframework", 
+  "name": "spring-orm", 
   "version": "2.5.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Spring Framework: ORM", 
@@ -26,94 +29,138 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "aopalliance:aopalliance", 
-        "version": "1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.oracle:toplink-essentials", 
-        "version": "2.41"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.oracle.toplink:toplink", 
-        "version": "10.1.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.ibatis:ibatis-sqlmap", 
-        "version": "2.3.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.hibernate:hibernate", 
-        "version": "3.2.6.ga"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.hibernate:hibernate-entitymanager", 
-        "version": "3.3.1.ga"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-aop", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-beans", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-context", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-core", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-jdbc", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-tx", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-web", 
-        "version": "2.5.3"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.jdo:jdo2-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.persistence:persistence-api", 
-        "version": "1.0"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:aopalliance/aopalliance", 
+      "requirement": "1.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.oracle/toplink-essentials", 
+      "requirement": "2.41", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.oracle.toplink/toplink", 
+      "requirement": "10.1.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.ibatis/ibatis-sqlmap", 
+      "requirement": "2.3.0", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.hibernate/hibernate", 
+      "requirement": "3.2.6.ga", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.hibernate/hibernate-entitymanager", 
+      "requirement": "3.3.1.ga", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-aop", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-beans", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-context", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-core", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-jdbc", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-tx", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-web", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.jdo/jdo2-api", 
+      "requirement": "2.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.persistence/persistence-api", 
+      "requirement": "1.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/spring-webmvc-2.5.3.pom.json b/tests/packagedcode/data/maven2/spring-webmvc-2.5.3.pom.json
index ceba9c0c891..d55592dfd1a 100644
--- a/tests/packagedcode/data/maven2/spring-webmvc-2.5.3.pom.json
+++ b/tests/packagedcode/data/maven2/spring-webmvc-2.5.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "spring-webmvc", 
   "version": "2.5.3", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Spring Framework: Web MVC", 
   "description": "Spring Framework: Web MVC", 
diff --git a/tests/packagedcode/data/maven2/spring-webmvc-2.5.3.pom.package.json b/tests/packagedcode/data/maven2/spring-webmvc-2.5.3.pom.package.json
index 02208e9a70d..858f61a6c97 100644
--- a/tests/packagedcode/data/maven2/spring-webmvc-2.5.3.pom.package.json
+++ b/tests/packagedcode/data/maven2/spring-webmvc-2.5.3.pom.package.json
@@ -1,7 +1,10 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.springframework:spring-webmvc", 
+  "type": "maven", 
+  "namespace": "org.springframework", 
+  "name": "spring-webmvc", 
   "version": "2.5.3", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
   "description": "Spring Framework: Web MVC", 
@@ -26,124 +29,186 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "license_expression": null, 
+  "asserted_license": "The Apache Software License, Version 2.0\nhttp://www.apache.org/licenses/LICENSE-2.0.txt", 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-attributes:commons-attributes-api", 
-        "version": "2.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-attributes:commons-attributes-compiler", 
-        "version": "2.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "commons-logging:commons-logging", 
-        "version": "1.1.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.lowagie:itext", 
-        "version": "2.0.7"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "freemarker:freemarker", 
-        "version": "2.3.12"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jasperreports:jasperreports", 
-        "version": "2.0.2"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "jexcelapi:jxl", 
-        "version": "2.6.6"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.tiles:tiles-api", 
-        "version": "2.0.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.tiles:tiles-core", 
-        "version": "2.0.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.apache.tiles:tiles-jsp", 
-        "version": "2.0.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "poi:poi", 
-        "version": "3.0.1"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "velocity:velocity", 
-        "version": "1.5"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "velocity-tools:velocity-tools-generic", 
-        "version": "1.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "velocity-tools:velocity-tools-view", 
-        "version": "1.4"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-beans", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-context", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-context-support", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-core", 
-        "version": "2.5.3"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.springframework:spring-web", 
-        "version": "2.5.3"
-      }
-    ], 
-    "provided": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:jsp-api", 
-        "version": "2.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:jstl", 
-        "version": "1.1.0"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "javax.servlet:servlet-api", 
-        "version": "2.4"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:commons-attributes/commons-attributes-api", 
+      "requirement": "2.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-attributes/commons-attributes-compiler", 
+      "requirement": "2.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:commons-logging/commons-logging", 
+      "requirement": "1.1.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.lowagie/itext", 
+      "requirement": "2.0.7", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:freemarker/freemarker", 
+      "requirement": "2.3.12", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jasperreports/jasperreports", 
+      "requirement": "2.0.2", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:jexcelapi/jxl", 
+      "requirement": "2.6.6", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.tiles/tiles-api", 
+      "requirement": "2.0.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.tiles/tiles-core", 
+      "requirement": "2.0.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.apache.tiles/tiles-jsp", 
+      "requirement": "2.0.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:poi/poi", 
+      "requirement": "3.0.1", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:velocity/velocity", 
+      "requirement": "1.5", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:velocity-tools/velocity-tools-generic", 
+      "requirement": "1.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:velocity-tools/velocity-tools-view", 
+      "requirement": "1.4", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": true, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-beans", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-context", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-context-support", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-core", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:org.springframework/spring-web", 
+      "requirement": "2.5.3", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/jsp-api", 
+      "requirement": "2.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/jstl", 
+      "requirement": "1.1.0", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:javax.servlet/servlet-api", 
+      "requirement": "2.4", 
+      "scope": "provided", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/startup-trigger-plugin-0.1.pom.json b/tests/packagedcode/data/maven2/startup-trigger-plugin-0.1.pom.json
index 0176ffb45ba..fa3a62f4014 100644
--- a/tests/packagedcode/data/maven2/startup-trigger-plugin-0.1.pom.json
+++ b/tests/packagedcode/data/maven2/startup-trigger-plugin-0.1.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": "startup-trigger-plugin", 
   "version": "0.1", 
   "classifier": null, 
-  "packaging ": "hpi", 
+  "packaging": "hpi", 
   "parent": {
     "group_id": "org.jvnet.hudson.plugins", 
     "artifact_id": "plugin", 
diff --git a/tests/packagedcode/data/maven2/startup-trigger-plugin-0.1.pom.package.json b/tests/packagedcode/data/maven2/startup-trigger-plugin-0.1.pom.package.json
index 670915374be..61484194e50 100644
--- a/tests/packagedcode/data/maven2/startup-trigger-plugin-0.1.pom.package.json
+++ b/tests/packagedcode/data/maven2/startup-trigger-plugin-0.1.pom.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.jvnet.hudson.plugins:startup-trigger-plugin", 
+  "type": "maven", 
+  "namespace": "org.jvnet.hudson.plugins", 
+  "name": "startup-trigger-plugin", 
   "version": "0.1", 
+  "qualifiers": {
+    "packaging": "hpi"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Startup Trigger", 
   "size": null, 
   "release_date": null, 
   "parties": [
@@ -26,17 +31,18 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "org.mockito:mockito-all", 
-        "version": "1.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:org.mockito/mockito-all", 
+      "requirement": "1.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/uni_pom.xml.json b/tests/packagedcode/data/maven2/uni_pom.xml.json
index 139c217d87d..d6d829d4bd2 100644
--- a/tests/packagedcode/data/maven2/uni_pom.xml.json
+++ b/tests/packagedcode/data/maven2/uni_pom.xml.json
@@ -4,7 +4,7 @@
   "artifact_id": "eclipseSequencePlugin", 
   "version": "0.0.1-SNAPSHOT", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": "Eclipse Sequence Plugin", 
   "description": null, 
diff --git a/tests/packagedcode/data/maven2/uni_pom.xml.package.json b/tests/packagedcode/data/maven2/uni_pom.xml.package.json
index 42114c24be9..f238976a6c5 100644
--- a/tests/packagedcode/data/maven2/uni_pom.xml.package.json
+++ b/tests/packagedcode/data/maven2/uni_pom.xml.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "de.fzj.unicore.rcp:eclipseSequencePlugin", 
+  "type": "maven", 
+  "namespace": "de.fzj.unicore.rcp", 
+  "name": "eclipseSequencePlugin", 
   "version": "0.0.1-SNAPSHOT", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "Eclipse Sequence Plugin", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,39 +21,50 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {
-    "compile": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.intel.gpe.clients:gpe-clients-all", 
-        "version": "2.0.4-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.intel.gpe.clients:gpe-gridbean-api", 
-        "version": "2.0.5-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.intel.gpe:gpe-utils", 
-        "version": "2.0.5-SNAPSHOT"
-      }, 
-      {
-        "type": "Apache Maven POM", 
-        "name": "com.intel.gpe.clients:gpe-gridbeans-swt", 
-        "version": "0.0.2-SNAPSHOT"
-      }
-    ], 
-    "test": [
-      {
-        "type": "Apache Maven POM", 
-        "name": "junit:junit", 
-        "version": "3.8.1"
-      }
-    ]
-  }, 
+  "dependencies": [
+    {
+      "identifier": "maven:com.intel.gpe.clients/gpe-clients-all", 
+      "requirement": "2.0.4-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.intel.gpe.clients/gpe-gridbean-api", 
+      "requirement": "2.0.5-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.intel.gpe/gpe-utils", 
+      "requirement": "2.0.5-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:com.intel.gpe.clients/gpe-gridbeans-swt", 
+      "requirement": "0.0.2-SNAPSHOT", 
+      "scope": "compile", 
+      "is_runtime": true, 
+      "is_optional": false, 
+      "is_resolved": false
+    }, 
+    {
+      "identifier": "maven:junit/junit", 
+      "requirement": "3.8.1", 
+      "scope": "test", 
+      "is_runtime": false, 
+      "is_optional": true, 
+      "is_resolved": false
+    }
+  ], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/urwerk_pom.xml.json b/tests/packagedcode/data/maven2/urwerk_pom.xml.json
index 02eda5e38ca..427e6ad9c32 100644
--- a/tests/packagedcode/data/maven2/urwerk_pom.xml.json
+++ b/tests/packagedcode/data/maven2/urwerk_pom.xml.json
@@ -4,7 +4,7 @@
   "artifact_id": "main", 
   "version": "1.0.0-SNAPSHOT", 
   "classifier": null, 
-  "packaging ": "pom", 
+  "packaging": "pom", 
   "parent": {
     "group_id": "ur.urwerk", 
     "artifact_id": "project", 
diff --git a/tests/packagedcode/data/maven2/urwerk_pom.xml.package.json b/tests/packagedcode/data/maven2/urwerk_pom.xml.package.json
index c75c124289a..d0b88c92b49 100644
--- a/tests/packagedcode/data/maven2/urwerk_pom.xml.package.json
+++ b/tests/packagedcode/data/maven2/urwerk_pom.xml.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "ur.urwerk.test.modules:main", 
+  "type": "maven", 
+  "namespace": "ur.urwerk.test.modules", 
+  "name": "main", 
   "version": "1.0.0-SNAPSHOT", 
+  "qualifiers": {
+    "packaging": "pom"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "ur.urwerk.test.modules:main:pom:1.0.0-SNAPSHOT", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/urwerky_pom.xml.json b/tests/packagedcode/data/maven2/urwerky_pom.xml.json
index e831fc175fe..80c0ca50a0f 100644
--- a/tests/packagedcode/data/maven2/urwerky_pom.xml.json
+++ b/tests/packagedcode/data/maven2/urwerky_pom.xml.json
@@ -4,7 +4,7 @@
   "artifact_id": "ur.urwerk.test.module-y", 
   "version": "1.0.0", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {
     "group_id": "ur.urwerk.test.modules", 
     "artifact_id": "main", 
diff --git a/tests/packagedcode/data/maven2/urwerky_pom.xml.package.json b/tests/packagedcode/data/maven2/urwerky_pom.xml.package.json
index 895fc882f08..226a924796a 100644
--- a/tests/packagedcode/data/maven2/urwerky_pom.xml.package.json
+++ b/tests/packagedcode/data/maven2/urwerky_pom.xml.package.json
@@ -1,10 +1,13 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "ur.urwerk.test:ur.urwerk.test.module-y", 
+  "type": "maven", 
+  "namespace": "ur.urwerk.test", 
+  "name": "ur.urwerk.test.module-y", 
   "version": "1.0.0", 
+  "qualifiers": null, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "ur.urwerk.test:ur.urwerk.test.module-y:jar:1.0.0", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +21,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven2/webre_pom.xml.json b/tests/packagedcode/data/maven2/webre_pom.xml.json
index 27b8364d40d..5dfb9580f5f 100644
--- a/tests/packagedcode/data/maven2/webre_pom.xml.json
+++ b/tests/packagedcode/data/maven2/webre_pom.xml.json
@@ -4,7 +4,7 @@
   "artifact_id": "com.google.gwt.query", 
   "version": "0.1.5.SNAPSHOT", 
   "classifier": null, 
-  "packaging ": "bundle", 
+  "packaging": "bundle", 
   "parent": {
     "group_id": "org.webreformatter", 
     "artifact_id": "parent-gwt", 
diff --git a/tests/packagedcode/data/maven2/webre_pom.xml.package.json b/tests/packagedcode/data/maven2/webre_pom.xml.package.json
index 1f24b6ed0f8..144cde33bd9 100644
--- a/tests/packagedcode/data/maven2/webre_pom.xml.package.json
+++ b/tests/packagedcode/data/maven2/webre_pom.xml.package.json
@@ -1,10 +1,15 @@
 {
-  "type": "Apache Maven POM", 
-  "name": "org.webreformatter.wrappers:com.google.gwt.query", 
+  "type": "maven", 
+  "namespace": "org.webreformatter.wrappers", 
+  "name": "com.google.gwt.query", 
   "version": "0.1.5.SNAPSHOT", 
+  "qualifiers": {
+    "packaging": "bundle"
+  }, 
+  "path": null, 
   "primary_language": "Java", 
   "code_type": null, 
-  "description": null, 
+  "description": "com.google.gwt.query", 
   "size": null, 
   "release_date": null, 
   "parties": [], 
@@ -18,9 +23,9 @@
   "vcs_repository": null, 
   "vcs_revision": null, 
   "copyright": null, 
-  "asserted_license": "", 
   "license_expression": null, 
+  "asserted_license": null, 
   "notice_text": null, 
-  "dependencies": {}, 
+  "dependencies": [], 
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/maven_misc/parse/ant-1.6.5.pom.json b/tests/packagedcode/data/maven_misc/parse/ant-1.6.5.pom.json
index f962cc2ccdf..7b15c55ee4e 100644
--- a/tests/packagedcode/data/maven_misc/parse/ant-1.6.5.pom.json
+++ b/tests/packagedcode/data/maven_misc/parse/ant-1.6.5.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": null, 
   "version": "1.6.5", 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/maven_misc/parse/mysql-connector-java-5.0.4.pom.json b/tests/packagedcode/data/maven_misc/parse/mysql-connector-java-5.0.4.pom.json
index 10836526649..e9a4708f1d1 100644
--- a/tests/packagedcode/data/maven_misc/parse/mysql-connector-java-5.0.4.pom.json
+++ b/tests/packagedcode/data/maven_misc/parse/mysql-connector-java-5.0.4.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": null, 
   "version": null, 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/maven_misc/parse/plexus-root-1.0.3.pom.json b/tests/packagedcode/data/maven_misc/parse/plexus-root-1.0.3.pom.json
index 175ef162e59..38db8796d99 100644
--- a/tests/packagedcode/data/maven_misc/parse/plexus-root-1.0.3.pom.json
+++ b/tests/packagedcode/data/maven_misc/parse/plexus-root-1.0.3.pom.json
@@ -4,7 +4,7 @@
   "artifact_id": null, 
   "version": null, 
   "classifier": null, 
-  "packaging ": "jar", 
+  "packaging": "jar", 
   "parent": {}, 
   "name": null, 
   "description": null, 
diff --git a/tests/packagedcode/data/npm/as_installed/package.json.expected b/tests/packagedcode/data/npm/as_installed/package.json.expected
index 513c6a3aec5..17c4d5ae0a1 100644
--- a/tests/packagedcode/data/npm/as_installed/package.json.expected
+++ b/tests/packagedcode/data/npm/as_installed/package.json.expected
@@ -1,7 +1,10 @@
 {
   "type": "npm",
+  "namespace": null,
   "name": "npm",
   "version": "2.13.5",
+  "qualifiers": null,
+  "path": null,
   "primary_language": "JavaScript",
   "code_type": null,
   "description": null,
@@ -2203,399 +2206,626 @@
   "vcs_repository": "git+https://github.com/npm/npm.git",
   "vcs_revision": null,
   "copyright": null,
-  "asserted_license": "Artistic-2.0",
   "license_expression": null,
+  "asserted_license": "Artistic-2.0",
   "notice_text": null,
-  "dependencies": {
-    "development": [
-      {
-        "type": "npm",
-        "name": "deep-equal",
-        "version": "~1.0.0"
-      },
-      {
-        "type": "npm",
-        "name": "marked",
-        "version": "~0.3.3"
-      },
-      {
-        "type": "npm",
-        "name": "marked-man",
-        "version": "~0.1.5"
-      },
-      {
-        "type": "npm",
-        "name": "nock",
-        "version": "~2.10.0"
-      },
-      {
-        "type": "npm",
-        "name": "npm-registry-couchapp",
-        "version": "~2.6.7"
-      },
-      {
-        "type": "npm",
-        "name": "npm-registry-mock",
-        "version": "~1.0.0"
-      },
-      {
-        "type": "npm",
-        "name": "require-inject",
-        "version": "~1.2.0"
-      },
-      {
-        "type": "npm",
-        "name": "sprintf-js",
-        "version": "~1.0.2"
-      },
-      {
-        "type": "npm",
-        "name": "tap",
-        "version": "~1.3.1"
-      }
-    ],
-    "runtime": [
-      {
-        "type": "npm",
-        "name": "abbrev",
-        "version": "~1.0.7"
-      },
-      {
-        "type": "npm",
-        "name": "ansi",
-        "version": "~0.3.0"
-      },
-      {
-        "type": "npm",
-        "name": "ansicolors",
-        "version": "~0.3.2"
-      },
-      {
-        "type": "npm",
-        "name": "ansistyles",
-        "version": "~0.1.3"
-      },
-      {
-        "type": "npm",
-        "name": "archy",
-        "version": "~1.0.0"
-      },
-      {
-        "type": "npm",
-        "name": "async-some",
-        "version": "~1.0.2"
-      },
-      {
-        "type": "npm",
-        "name": "block-stream",
-        "version": "0.0.8"
-      },
-      {
-        "type": "npm",
-        "name": "char-spinner",
-        "version": "~1.0.1"
-      },
-      {
-        "type": "npm",
-        "name": "chmodr",
-        "version": "~1.0.1"
-      },
-      {
-        "type": "npm",
-        "name": "chownr",
-        "version": "0.0.2"
-      },
-      {
-        "type": "npm",
-        "name": "cmd-shim",
-        "version": "~2.0.1"
-      },
-      {
-        "type": "npm",
-        "name": "columnify",
-        "version": "~1.5.1"
-      },
-      {
-        "type": "npm",
-        "name": "config-chain",
-        "version": "~1.1.9"
-      },
-      {
-        "type": "npm",
-        "name": "dezalgo",
-        "version": "~1.0.3"
-      },
-      {
-        "type": "npm",
-        "name": "editor",
-        "version": "~1.0.0"
-      },
-      {
-        "type": "npm",
-        "name": "fs-vacuum",
-        "version": "~1.2.6"
-      },
-      {
-        "type": "npm",
-        "name": "fs-write-stream-atomic",
-        "version": "~1.0.3"
-      },
-      {
-        "type": "npm",
-        "name": "fstream",
-        "version": "~1.0.7"
-      },
-      {
-        "type": "npm",
-        "name": "fstream-npm",
-        "version": "~1.0.4"
-      },
-      {
-        "type": "npm",
-        "name": "github-url-from-git",
-        "version": "~1.4.0"
-      },
-      {
-        "type": "npm",
-        "name": "github-url-from-username-repo",
-        "version": "~1.0.2"
-      },
-      {
-        "type": "npm",
-        "name": "glob",
-        "version": "~5.0.14"
-      },
-      {
-        "type": "npm",
-        "name": "graceful-fs",
-        "version": "~4.1.2"
-      },
-      {
-        "type": "npm",
-        "name": "hosted-git-info",
-        "version": "~2.1.4"
-      },
-      {
-        "type": "npm",
-        "name": "inflight",
-        "version": "~1.0.4"
-      },
-      {
-        "type": "npm",
-        "name": "inherits",
-        "version": "~2.0.1"
-      },
-      {
-        "type": "npm",
-        "name": "ini",
-        "version": "~1.3.4"
-      },
-      {
-        "type": "npm",
-        "name": "init-package-json",
-        "version": "~1.7.1"
-      },
-      {
-        "type": "npm",
-        "name": "lockfile",
-        "version": "~1.0.1"
-      },
-      {
-        "type": "npm",
-        "name": "lru-cache",
-        "version": "~2.6.5"
-      },
-      {
-        "type": "npm",
-        "name": "minimatch",
-        "version": "~2.0.10"
-      },
-      {
-        "type": "npm",
-        "name": "mkdirp",
-        "version": "~0.5.1"
-      },
-      {
-        "type": "npm",
-        "name": "node-gyp",
-        "version": "~2.0.2"
-      },
-      {
-        "type": "npm",
-        "name": "nopt",
-        "version": "~3.0.3"
-      },
-      {
-        "type": "npm",
-        "name": "normalize-git-url",
-        "version": "~3.0.1"
-      },
-      {
-        "type": "npm",
-        "name": "normalize-package-data",
-        "version": "~2.3.1"
-      },
-      {
-        "type": "npm",
-        "name": "npm-cache-filename",
-        "version": "~1.0.2"
-      },
-      {
-        "type": "npm",
-        "name": "npm-install-checks",
-        "version": "~1.0.6"
-      },
-      {
-        "type": "npm",
-        "name": "npm-package-arg",
-        "version": "~4.0.2"
-      },
-      {
-        "type": "npm",
-        "name": "npm-registry-client",
-        "version": "~6.5.1"
-      },
-      {
-        "type": "npm",
-        "name": "npm-user-validate",
-        "version": "~0.1.2"
-      },
-      {
-        "type": "npm",
-        "name": "npmlog",
-        "version": "~1.2.1"
-      },
-      {
-        "type": "npm",
-        "name": "once",
-        "version": "~1.3.2"
-      },
-      {
-        "type": "npm",
-        "name": "opener",
-        "version": "~1.4.1"
-      },
-      {
-        "type": "npm",
-        "name": "osenv",
-        "version": "~0.1.3"
-      },
-      {
-        "type": "npm",
-        "name": "path-is-inside",
-        "version": "~1.0.0"
-      },
-      {
-        "type": "npm",
-        "name": "read",
-        "version": "~1.0.6"
-      },
-      {
-        "type": "npm",
-        "name": "read-installed",
-        "version": "~4.0.2"
-      },
-      {
-        "type": "npm",
-        "name": "read-package-json",
-        "version": "~2.0.0"
-      },
-      {
-        "type": "npm",
-        "name": "readable-stream",
-        "version": "~1.1.13"
-      },
-      {
-        "type": "npm",
-        "name": "realize-package-specifier",
-        "version": "~3.0.1"
-      },
-      {
-        "type": "npm",
-        "name": "request",
-        "version": "~2.60.0"
-      },
-      {
-        "type": "npm",
-        "name": "retry",
-        "version": "~0.6.1"
-      },
-      {
-        "type": "npm",
-        "name": "rimraf",
-        "version": "~2.4.2"
-      },
-      {
-        "type": "npm",
-        "name": "semver",
-        "version": "~5.0.1"
-      },
-      {
-        "type": "npm",
-        "name": "sha",
-        "version": "~1.3.0"
-      },
-      {
-        "type": "npm",
-        "name": "slide",
-        "version": "~1.1.6"
-      },
-      {
-        "type": "npm",
-        "name": "sorted-object",
-        "version": "~1.0.0"
-      },
-      {
-        "type": "npm",
-        "name": "spdx",
-        "version": "~0.4.1"
-      },
-      {
-        "type": "npm",
-        "name": "tar",
-        "version": "~2.1.1"
-      },
-      {
-        "type": "npm",
-        "name": "text-table",
-        "version": "~0.2.0"
-      },
-      {
-        "type": "npm",
-        "name": "uid-number",
-        "version": "0.0.6"
-      },
-      {
-        "type": "npm",
-        "name": "umask",
-        "version": "~1.1.0"
-      },
-      {
-        "type": "npm",
-        "name": "validate-npm-package-name",
-        "version": "~2.2.2"
-      },
-      {
-        "type": "npm",
-        "name": "which",
-        "version": "~1.1.1"
-      },
-      {
-        "type": "npm",
-        "name": "wrappy",
-        "version": "~1.0.1"
-      },
-      {
-        "type": "npm",
-        "name": "write-file-atomic",
-        "version": "~1.1.2"
-      },
-      {
-        "type": "npm",
-        "name": "validate-npm-package-license",
-        "version": "*"
-      }
-    ]
-  },
+  "dependencies": [
+    {
+      "identifier": "npm:abbrev",
+      "requirement": "~1.0.7",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:ansi",
+      "requirement": "~0.3.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:ansicolors",
+      "requirement": "~0.3.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:ansistyles",
+      "requirement": "~0.1.3",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:archy",
+      "requirement": "~1.0.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:async-some",
+      "requirement": "~1.0.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:block-stream",
+      "requirement": "0.0.8",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:char-spinner",
+      "requirement": "~1.0.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:chmodr",
+      "requirement": "~1.0.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:chownr",
+      "requirement": "0.0.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:cmd-shim",
+      "requirement": "~2.0.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:columnify",
+      "requirement": "~1.5.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:config-chain",
+      "requirement": "~1.1.9",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:dezalgo",
+      "requirement": "~1.0.3",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:editor",
+      "requirement": "~1.0.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:fs-vacuum",
+      "requirement": "~1.2.6",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:fs-write-stream-atomic",
+      "requirement": "~1.0.3",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:fstream",
+      "requirement": "~1.0.7",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:fstream-npm",
+      "requirement": "~1.0.4",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:github-url-from-git",
+      "requirement": "~1.4.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:github-url-from-username-repo",
+      "requirement": "~1.0.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:glob",
+      "requirement": "~5.0.14",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:graceful-fs",
+      "requirement": "~4.1.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:hosted-git-info",
+      "requirement": "~2.1.4",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:inflight",
+      "requirement": "~1.0.4",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:inherits",
+      "requirement": "~2.0.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:ini",
+      "requirement": "~1.3.4",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:init-package-json",
+      "requirement": "~1.7.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:lockfile",
+      "requirement": "~1.0.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:lru-cache",
+      "requirement": "~2.6.5",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:minimatch",
+      "requirement": "~2.0.10",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:mkdirp",
+      "requirement": "~0.5.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:node-gyp",
+      "requirement": "~2.0.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:nopt",
+      "requirement": "~3.0.3",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:normalize-git-url",
+      "requirement": "~3.0.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:normalize-package-data",
+      "requirement": "~2.3.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:npm-cache-filename",
+      "requirement": "~1.0.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:npm-install-checks",
+      "requirement": "~1.0.6",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:npm-package-arg",
+      "requirement": "~4.0.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:npm-registry-client",
+      "requirement": "~6.5.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:npm-user-validate",
+      "requirement": "~0.1.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:npmlog",
+      "requirement": "~1.2.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:once",
+      "requirement": "~1.3.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:opener",
+      "requirement": "~1.4.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:osenv",
+      "requirement": "~0.1.3",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:path-is-inside",
+      "requirement": "~1.0.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:read",
+      "requirement": "~1.0.6",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:read-installed",
+      "requirement": "~4.0.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:read-package-json",
+      "requirement": "~2.0.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:readable-stream",
+      "requirement": "~1.1.13",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:realize-package-specifier",
+      "requirement": "~3.0.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:request",
+      "requirement": "~2.60.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:retry",
+      "requirement": "~0.6.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:rimraf",
+      "requirement": "~2.4.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:semver",
+      "requirement": "~5.0.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:sha",
+      "requirement": "~1.3.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:slide",
+      "requirement": "~1.1.6",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:sorted-object",
+      "requirement": "~1.0.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:spdx",
+      "requirement": "~0.4.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:tar",
+      "requirement": "~2.1.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:text-table",
+      "requirement": "~0.2.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:uid-number",
+      "requirement": "0.0.6",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:umask",
+      "requirement": "~1.1.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:validate-npm-package-name",
+      "requirement": "~2.2.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:which",
+      "requirement": "~1.1.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:wrappy",
+      "requirement": "~1.0.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:write-file-atomic",
+      "requirement": "~1.1.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:validate-npm-package-license",
+      "requirement": "*",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:deep-equal",
+      "requirement": "~1.0.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:marked",
+      "requirement": "~0.3.3",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:marked-man",
+      "requirement": "~0.1.5",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:nock",
+      "requirement": "~2.10.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:npm-registry-couchapp",
+      "requirement": "~2.6.7",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:npm-registry-mock",
+      "requirement": "~1.0.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:require-inject",
+      "requirement": "~1.2.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:sprintf-js",
+      "requirement": "~1.0.2",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:tap",
+      "requirement": "~1.3.1",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    }
+  ],
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/npm/basic/package.json.expected b/tests/packagedcode/data/npm/basic/package.json.expected
index 23540a0eec3..8e424b8fd93 100644
--- a/tests/packagedcode/data/npm/basic/package.json.expected
+++ b/tests/packagedcode/data/npm/basic/package.json.expected
@@ -1,7 +1,10 @@
 {
   "type": "npm",
+  "namespace": null,
   "name": "cookie-signature",
   "version": "1.0.3",
+  "qualifiers": null,
+  "path": null,
   "primary_language": "JavaScript",
   "code_type": null,
   "description": null,
@@ -30,22 +33,26 @@
   "vcs_repository": "https://github.com/visionmedia/node-cookie-signature.git",
   "vcs_revision": null,
   "copyright": null,
-  "asserted_license": null,
   "license_expression": null,
+  "asserted_license": null,
   "notice_text": null,
-  "dependencies": {
-    "development": [
-      {
-        "type": "npm",
-        "name": "mocha",
-        "version": "*"
-      },
-      {
-        "type": "npm",
-        "name": "should",
-        "version": "*"
-      }
-    ]
-  },
+  "dependencies": [
+    {
+      "identifier": "npm:mocha",
+      "requirement": "*",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:should",
+      "requirement": "*",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    }
+  ],
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/npm/from_npmjs/package.json.expected b/tests/packagedcode/data/npm/from_npmjs/package.json.expected
index 0f76b3f056e..cd93629c8c3 100644
--- a/tests/packagedcode/data/npm/from_npmjs/package.json.expected
+++ b/tests/packagedcode/data/npm/from_npmjs/package.json.expected
@@ -1,7 +1,10 @@
 {
   "type": "npm",
+  "namespace": null,
   "name": "npm",
   "version": "2.13.5",
+  "qualifiers": null,
+  "path": null,
   "primary_language": "JavaScript",
   "code_type": null,
   "description": null,
@@ -2203,399 +2206,626 @@
   "vcs_repository": "git+https://github.com/npm/npm.git",
   "vcs_revision": null,
   "copyright": null,
-  "asserted_license": "Artistic-2.0",
   "license_expression": null,
+  "asserted_license": "Artistic-2.0",
   "notice_text": null,
-  "dependencies": {
-    "development": [
-      {
-        "type": "npm",
-        "name": "deep-equal",
-        "version": "~1.0.0"
-      },
-      {
-        "type": "npm",
-        "name": "marked",
-        "version": "~0.3.3"
-      },
-      {
-        "type": "npm",
-        "name": "marked-man",
-        "version": "~0.1.5"
-      },
-      {
-        "type": "npm",
-        "name": "nock",
-        "version": "~2.10.0"
-      },
-      {
-        "type": "npm",
-        "name": "npm-registry-couchapp",
-        "version": "~2.6.7"
-      },
-      {
-        "type": "npm",
-        "name": "npm-registry-mock",
-        "version": "~1.0.0"
-      },
-      {
-        "type": "npm",
-        "name": "require-inject",
-        "version": "~1.2.0"
-      },
-      {
-        "type": "npm",
-        "name": "sprintf-js",
-        "version": "~1.0.2"
-      },
-      {
-        "type": "npm",
-        "name": "tap",
-        "version": "~1.3.1"
-      }
-    ],
-    "runtime": [
-      {
-        "type": "npm",
-        "name": "abbrev",
-        "version": "~1.0.7"
-      },
-      {
-        "type": "npm",
-        "name": "ansi",
-        "version": "~0.3.0"
-      },
-      {
-        "type": "npm",
-        "name": "ansicolors",
-        "version": "~0.3.2"
-      },
-      {
-        "type": "npm",
-        "name": "ansistyles",
-        "version": "~0.1.3"
-      },
-      {
-        "type": "npm",
-        "name": "archy",
-        "version": "~1.0.0"
-      },
-      {
-        "type": "npm",
-        "name": "async-some",
-        "version": "~1.0.2"
-      },
-      {
-        "type": "npm",
-        "name": "block-stream",
-        "version": "0.0.8"
-      },
-      {
-        "type": "npm",
-        "name": "char-spinner",
-        "version": "~1.0.1"
-      },
-      {
-        "type": "npm",
-        "name": "chmodr",
-        "version": "~1.0.1"
-      },
-      {
-        "type": "npm",
-        "name": "chownr",
-        "version": "0.0.2"
-      },
-      {
-        "type": "npm",
-        "name": "cmd-shim",
-        "version": "~2.0.1"
-      },
-      {
-        "type": "npm",
-        "name": "columnify",
-        "version": "~1.5.1"
-      },
-      {
-        "type": "npm",
-        "name": "config-chain",
-        "version": "~1.1.9"
-      },
-      {
-        "type": "npm",
-        "name": "dezalgo",
-        "version": "~1.0.3"
-      },
-      {
-        "type": "npm",
-        "name": "editor",
-        "version": "~1.0.0"
-      },
-      {
-        "type": "npm",
-        "name": "fs-vacuum",
-        "version": "~1.2.6"
-      },
-      {
-        "type": "npm",
-        "name": "fs-write-stream-atomic",
-        "version": "~1.0.3"
-      },
-      {
-        "type": "npm",
-        "name": "fstream",
-        "version": "~1.0.7"
-      },
-      {
-        "type": "npm",
-        "name": "fstream-npm",
-        "version": "~1.0.4"
-      },
-      {
-        "type": "npm",
-        "name": "github-url-from-git",
-        "version": "~1.4.0"
-      },
-      {
-        "type": "npm",
-        "name": "github-url-from-username-repo",
-        "version": "~1.0.2"
-      },
-      {
-        "type": "npm",
-        "name": "glob",
-        "version": "~5.0.14"
-      },
-      {
-        "type": "npm",
-        "name": "graceful-fs",
-        "version": "~4.1.2"
-      },
-      {
-        "type": "npm",
-        "name": "hosted-git-info",
-        "version": "~2.1.4"
-      },
-      {
-        "type": "npm",
-        "name": "inflight",
-        "version": "~1.0.4"
-      },
-      {
-        "type": "npm",
-        "name": "inherits",
-        "version": "~2.0.1"
-      },
-      {
-        "type": "npm",
-        "name": "ini",
-        "version": "~1.3.4"
-      },
-      {
-        "type": "npm",
-        "name": "init-package-json",
-        "version": "~1.7.1"
-      },
-      {
-        "type": "npm",
-        "name": "lockfile",
-        "version": "~1.0.1"
-      },
-      {
-        "type": "npm",
-        "name": "lru-cache",
-        "version": "~2.6.5"
-      },
-      {
-        "type": "npm",
-        "name": "minimatch",
-        "version": "~2.0.10"
-      },
-      {
-        "type": "npm",
-        "name": "mkdirp",
-        "version": "~0.5.1"
-      },
-      {
-        "type": "npm",
-        "name": "node-gyp",
-        "version": "~2.0.2"
-      },
-      {
-        "type": "npm",
-        "name": "nopt",
-        "version": "~3.0.3"
-      },
-      {
-        "type": "npm",
-        "name": "normalize-git-url",
-        "version": "~3.0.1"
-      },
-      {
-        "type": "npm",
-        "name": "normalize-package-data",
-        "version": "~2.3.1"
-      },
-      {
-        "type": "npm",
-        "name": "npm-cache-filename",
-        "version": "~1.0.2"
-      },
-      {
-        "type": "npm",
-        "name": "npm-install-checks",
-        "version": "~1.0.6"
-      },
-      {
-        "type": "npm",
-        "name": "npm-package-arg",
-        "version": "~4.0.2"
-      },
-      {
-        "type": "npm",
-        "name": "npm-registry-client",
-        "version": "~6.5.1"
-      },
-      {
-        "type": "npm",
-        "name": "npm-user-validate",
-        "version": "~0.1.2"
-      },
-      {
-        "type": "npm",
-        "name": "npmlog",
-        "version": "~1.2.1"
-      },
-      {
-        "type": "npm",
-        "name": "once",
-        "version": "~1.3.2"
-      },
-      {
-        "type": "npm",
-        "name": "opener",
-        "version": "~1.4.1"
-      },
-      {
-        "type": "npm",
-        "name": "osenv",
-        "version": "~0.1.3"
-      },
-      {
-        "type": "npm",
-        "name": "path-is-inside",
-        "version": "~1.0.0"
-      },
-      {
-        "type": "npm",
-        "name": "read",
-        "version": "~1.0.6"
-      },
-      {
-        "type": "npm",
-        "name": "read-installed",
-        "version": "~4.0.2"
-      },
-      {
-        "type": "npm",
-        "name": "read-package-json",
-        "version": "~2.0.0"
-      },
-      {
-        "type": "npm",
-        "name": "readable-stream",
-        "version": "~1.1.13"
-      },
-      {
-        "type": "npm",
-        "name": "realize-package-specifier",
-        "version": "~3.0.1"
-      },
-      {
-        "type": "npm",
-        "name": "request",
-        "version": "~2.60.0"
-      },
-      {
-        "type": "npm",
-        "name": "retry",
-        "version": "~0.6.1"
-      },
-      {
-        "type": "npm",
-        "name": "rimraf",
-        "version": "~2.4.2"
-      },
-      {
-        "type": "npm",
-        "name": "semver",
-        "version": "~5.0.1"
-      },
-      {
-        "type": "npm",
-        "name": "sha",
-        "version": "~1.3.0"
-      },
-      {
-        "type": "npm",
-        "name": "slide",
-        "version": "~1.1.6"
-      },
-      {
-        "type": "npm",
-        "name": "sorted-object",
-        "version": "~1.0.0"
-      },
-      {
-        "type": "npm",
-        "name": "spdx",
-        "version": "~0.4.1"
-      },
-      {
-        "type": "npm",
-        "name": "tar",
-        "version": "~2.1.1"
-      },
-      {
-        "type": "npm",
-        "name": "text-table",
-        "version": "~0.2.0"
-      },
-      {
-        "type": "npm",
-        "name": "uid-number",
-        "version": "0.0.6"
-      },
-      {
-        "type": "npm",
-        "name": "umask",
-        "version": "~1.1.0"
-      },
-      {
-        "type": "npm",
-        "name": "validate-npm-package-name",
-        "version": "~2.2.2"
-      },
-      {
-        "type": "npm",
-        "name": "which",
-        "version": "~1.1.1"
-      },
-      {
-        "type": "npm",
-        "name": "wrappy",
-        "version": "~1.0.1"
-      },
-      {
-        "type": "npm",
-        "name": "write-file-atomic",
-        "version": "~1.1.2"
-      },
-      {
-        "type": "npm",
-        "name": "validate-npm-package-license",
-        "version": "*"
-      }
-    ]
-  },
+  "dependencies": [
+    {
+      "identifier": "npm:abbrev",
+      "requirement": "~1.0.7",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:ansi",
+      "requirement": "~0.3.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:ansicolors",
+      "requirement": "~0.3.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:ansistyles",
+      "requirement": "~0.1.3",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:archy",
+      "requirement": "~1.0.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:async-some",
+      "requirement": "~1.0.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:block-stream",
+      "requirement": "0.0.8",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:char-spinner",
+      "requirement": "~1.0.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:chmodr",
+      "requirement": "~1.0.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:chownr",
+      "requirement": "0.0.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:cmd-shim",
+      "requirement": "~2.0.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:columnify",
+      "requirement": "~1.5.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:config-chain",
+      "requirement": "~1.1.9",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:dezalgo",
+      "requirement": "~1.0.3",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:editor",
+      "requirement": "~1.0.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:fs-vacuum",
+      "requirement": "~1.2.6",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:fs-write-stream-atomic",
+      "requirement": "~1.0.3",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:fstream",
+      "requirement": "~1.0.7",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:fstream-npm",
+      "requirement": "~1.0.4",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:github-url-from-git",
+      "requirement": "~1.4.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:github-url-from-username-repo",
+      "requirement": "~1.0.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:glob",
+      "requirement": "~5.0.14",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:graceful-fs",
+      "requirement": "~4.1.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:hosted-git-info",
+      "requirement": "~2.1.4",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:inflight",
+      "requirement": "~1.0.4",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:inherits",
+      "requirement": "~2.0.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:ini",
+      "requirement": "~1.3.4",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:init-package-json",
+      "requirement": "~1.7.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:lockfile",
+      "requirement": "~1.0.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:lru-cache",
+      "requirement": "~2.6.5",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:minimatch",
+      "requirement": "~2.0.10",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:mkdirp",
+      "requirement": "~0.5.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:node-gyp",
+      "requirement": "~2.0.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:nopt",
+      "requirement": "~3.0.3",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:normalize-git-url",
+      "requirement": "~3.0.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:normalize-package-data",
+      "requirement": "~2.3.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:npm-cache-filename",
+      "requirement": "~1.0.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:npm-install-checks",
+      "requirement": "~1.0.6",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:npm-package-arg",
+      "requirement": "~4.0.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:npm-registry-client",
+      "requirement": "~6.5.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:npm-user-validate",
+      "requirement": "~0.1.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:npmlog",
+      "requirement": "~1.2.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:once",
+      "requirement": "~1.3.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:opener",
+      "requirement": "~1.4.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:osenv",
+      "requirement": "~0.1.3",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:path-is-inside",
+      "requirement": "~1.0.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:read",
+      "requirement": "~1.0.6",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:read-installed",
+      "requirement": "~4.0.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:read-package-json",
+      "requirement": "~2.0.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:readable-stream",
+      "requirement": "~1.1.13",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:realize-package-specifier",
+      "requirement": "~3.0.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:request",
+      "requirement": "~2.60.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:retry",
+      "requirement": "~0.6.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:rimraf",
+      "requirement": "~2.4.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:semver",
+      "requirement": "~5.0.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:sha",
+      "requirement": "~1.3.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:slide",
+      "requirement": "~1.1.6",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:sorted-object",
+      "requirement": "~1.0.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:spdx",
+      "requirement": "~0.4.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:tar",
+      "requirement": "~2.1.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:text-table",
+      "requirement": "~0.2.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:uid-number",
+      "requirement": "0.0.6",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:umask",
+      "requirement": "~1.1.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:validate-npm-package-name",
+      "requirement": "~2.2.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:which",
+      "requirement": "~1.1.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:wrappy",
+      "requirement": "~1.0.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:write-file-atomic",
+      "requirement": "~1.1.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:validate-npm-package-license",
+      "requirement": "*",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:deep-equal",
+      "requirement": "~1.0.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:marked",
+      "requirement": "~0.3.3",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:marked-man",
+      "requirement": "~0.1.5",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:nock",
+      "requirement": "~2.10.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:npm-registry-couchapp",
+      "requirement": "~2.6.7",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:npm-registry-mock",
+      "requirement": "~1.0.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:require-inject",
+      "requirement": "~1.2.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:sprintf-js",
+      "requirement": "~1.0.2",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:tap",
+      "requirement": "~1.3.1",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    }
+  ],
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/npm/from_tarball/package.json.expected b/tests/packagedcode/data/npm/from_tarball/package.json.expected
index ddfe4fb7d0a..d7b00b004c9 100644
--- a/tests/packagedcode/data/npm/from_tarball/package.json.expected
+++ b/tests/packagedcode/data/npm/from_tarball/package.json.expected
@@ -1,7 +1,10 @@
 {
   "type": "npm",
+  "namespace": null,
   "name": "npm",
   "version": "2.13.5",
+  "qualifiers": null,
+  "path": null,
   "primary_language": "JavaScript",
   "code_type": null,
   "description": null,
@@ -31,394 +34,618 @@
   "vcs_repository": "https://github.com/npm/npm",
   "vcs_revision": null,
   "copyright": null,
-  "asserted_license": "Artistic-2.0",
   "license_expression": null,
+  "asserted_license": "Artistic-2.0",
   "notice_text": null,
-  "dependencies": {
-    "development": [
-      {
-        "type": "npm",
-        "name": "deep-equal",
-        "version": "~1.0.0"
-      },
-      {
-        "type": "npm",
-        "name": "marked",
-        "version": "~0.3.3"
-      },
-      {
-        "type": "npm",
-        "name": "marked-man",
-        "version": "~0.1.5"
-      },
-      {
-        "type": "npm",
-        "name": "nock",
-        "version": "~2.10.0"
-      },
-      {
-        "type": "npm",
-        "name": "npm-registry-couchapp",
-        "version": "~2.6.7"
-      },
-      {
-        "type": "npm",
-        "name": "npm-registry-mock",
-        "version": "~1.0.0"
-      },
-      {
-        "type": "npm",
-        "name": "require-inject",
-        "version": "~1.2.0"
-      },
-      {
-        "type": "npm",
-        "name": "sprintf-js",
-        "version": "~1.0.2"
-      },
-      {
-        "type": "npm",
-        "name": "tap",
-        "version": "~1.3.1"
-      }
-    ],
-    "runtime": [
-      {
-        "type": "npm",
-        "name": "abbrev",
-        "version": "~1.0.7"
-      },
-      {
-        "type": "npm",
-        "name": "ansi",
-        "version": "~0.3.0"
-      },
-      {
-        "type": "npm",
-        "name": "ansicolors",
-        "version": "~0.3.2"
-      },
-      {
-        "type": "npm",
-        "name": "ansistyles",
-        "version": "~0.1.3"
-      },
-      {
-        "type": "npm",
-        "name": "archy",
-        "version": "~1.0.0"
-      },
-      {
-        "type": "npm",
-        "name": "async-some",
-        "version": "~1.0.2"
-      },
-      {
-        "type": "npm",
-        "name": "block-stream",
-        "version": "0.0.8"
-      },
-      {
-        "type": "npm",
-        "name": "char-spinner",
-        "version": "~1.0.1"
-      },
-      {
-        "type": "npm",
-        "name": "chmodr",
-        "version": "~1.0.1"
-      },
-      {
-        "type": "npm",
-        "name": "chownr",
-        "version": "0.0.2"
-      },
-      {
-        "type": "npm",
-        "name": "cmd-shim",
-        "version": "~2.0.1"
-      },
-      {
-        "type": "npm",
-        "name": "columnify",
-        "version": "~1.5.1"
-      },
-      {
-        "type": "npm",
-        "name": "config-chain",
-        "version": "~1.1.9"
-      },
-      {
-        "type": "npm",
-        "name": "dezalgo",
-        "version": "~1.0.3"
-      },
-      {
-        "type": "npm",
-        "name": "editor",
-        "version": "~1.0.0"
-      },
-      {
-        "type": "npm",
-        "name": "fs-vacuum",
-        "version": "~1.2.6"
-      },
-      {
-        "type": "npm",
-        "name": "fs-write-stream-atomic",
-        "version": "~1.0.3"
-      },
-      {
-        "type": "npm",
-        "name": "fstream",
-        "version": "~1.0.7"
-      },
-      {
-        "type": "npm",
-        "name": "fstream-npm",
-        "version": "~1.0.4"
-      },
-      {
-        "type": "npm",
-        "name": "github-url-from-git",
-        "version": "~1.4.0"
-      },
-      {
-        "type": "npm",
-        "name": "github-url-from-username-repo",
-        "version": "~1.0.2"
-      },
-      {
-        "type": "npm",
-        "name": "glob",
-        "version": "~5.0.14"
-      },
-      {
-        "type": "npm",
-        "name": "graceful-fs",
-        "version": "~4.1.2"
-      },
-      {
-        "type": "npm",
-        "name": "hosted-git-info",
-        "version": "~2.1.4"
-      },
-      {
-        "type": "npm",
-        "name": "inflight",
-        "version": "~1.0.4"
-      },
-      {
-        "type": "npm",
-        "name": "inherits",
-        "version": "~2.0.1"
-      },
-      {
-        "type": "npm",
-        "name": "ini",
-        "version": "~1.3.4"
-      },
-      {
-        "type": "npm",
-        "name": "init-package-json",
-        "version": "~1.7.1"
-      },
-      {
-        "type": "npm",
-        "name": "lockfile",
-        "version": "~1.0.1"
-      },
-      {
-        "type": "npm",
-        "name": "lru-cache",
-        "version": "~2.6.5"
-      },
-      {
-        "type": "npm",
-        "name": "minimatch",
-        "version": "~2.0.10"
-      },
-      {
-        "type": "npm",
-        "name": "mkdirp",
-        "version": "~0.5.1"
-      },
-      {
-        "type": "npm",
-        "name": "node-gyp",
-        "version": "~2.0.2"
-      },
-      {
-        "type": "npm",
-        "name": "nopt",
-        "version": "~3.0.3"
-      },
-      {
-        "type": "npm",
-        "name": "normalize-git-url",
-        "version": "~3.0.1"
-      },
-      {
-        "type": "npm",
-        "name": "normalize-package-data",
-        "version": "~2.3.1"
-      },
-      {
-        "type": "npm",
-        "name": "npm-cache-filename",
-        "version": "~1.0.2"
-      },
-      {
-        "type": "npm",
-        "name": "npm-install-checks",
-        "version": "~1.0.6"
-      },
-      {
-        "type": "npm",
-        "name": "npm-package-arg",
-        "version": "~4.0.2"
-      },
-      {
-        "type": "npm",
-        "name": "npm-registry-client",
-        "version": "~6.5.1"
-      },
-      {
-        "type": "npm",
-        "name": "npm-user-validate",
-        "version": "~0.1.2"
-      },
-      {
-        "type": "npm",
-        "name": "npmlog",
-        "version": "~1.2.1"
-      },
-      {
-        "type": "npm",
-        "name": "once",
-        "version": "~1.3.2"
-      },
-      {
-        "type": "npm",
-        "name": "opener",
-        "version": "~1.4.1"
-      },
-      {
-        "type": "npm",
-        "name": "osenv",
-        "version": "~0.1.3"
-      },
-      {
-        "type": "npm",
-        "name": "path-is-inside",
-        "version": "~1.0.0"
-      },
-      {
-        "type": "npm",
-        "name": "read",
-        "version": "~1.0.6"
-      },
-      {
-        "type": "npm",
-        "name": "read-installed",
-        "version": "~4.0.2"
-      },
-      {
-        "type": "npm",
-        "name": "read-package-json",
-        "version": "~2.0.0"
-      },
-      {
-        "type": "npm",
-        "name": "readable-stream",
-        "version": "~1.1.13"
-      },
-      {
-        "type": "npm",
-        "name": "realize-package-specifier",
-        "version": "~3.0.1"
-      },
-      {
-        "type": "npm",
-        "name": "request",
-        "version": "~2.60.0"
-      },
-      {
-        "type": "npm",
-        "name": "retry",
-        "version": "~0.6.1"
-      },
-      {
-        "type": "npm",
-        "name": "rimraf",
-        "version": "~2.4.2"
-      },
-      {
-        "type": "npm",
-        "name": "semver",
-        "version": "~5.0.1"
-      },
-      {
-        "type": "npm",
-        "name": "sha",
-        "version": "~1.3.0"
-      },
-      {
-        "type": "npm",
-        "name": "slide",
-        "version": "~1.1.6"
-      },
-      {
-        "type": "npm",
-        "name": "sorted-object",
-        "version": "~1.0.0"
-      },
-      {
-        "type": "npm",
-        "name": "spdx",
-        "version": "~0.4.1"
-      },
-      {
-        "type": "npm",
-        "name": "tar",
-        "version": "~2.1.1"
-      },
-      {
-        "type": "npm",
-        "name": "text-table",
-        "version": "~0.2.0"
-      },
-      {
-        "type": "npm",
-        "name": "uid-number",
-        "version": "0.0.6"
-      },
-      {
-        "type": "npm",
-        "name": "umask",
-        "version": "~1.1.0"
-      },
-      {
-        "type": "npm",
-        "name": "validate-npm-package-name",
-        "version": "~2.2.2"
-      },
-      {
-        "type": "npm",
-        "name": "which",
-        "version": "~1.1.1"
-      },
-      {
-        "type": "npm",
-        "name": "wrappy",
-        "version": "~1.0.1"
-      },
-      {
-        "type": "npm",
-        "name": "write-file-atomic",
-        "version": "~1.1.2"
-      }
-    ]
-  },
+  "dependencies": [
+    {
+      "identifier": "npm:abbrev",
+      "requirement": "~1.0.7",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:ansi",
+      "requirement": "~0.3.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:ansicolors",
+      "requirement": "~0.3.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:ansistyles",
+      "requirement": "~0.1.3",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:archy",
+      "requirement": "~1.0.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:async-some",
+      "requirement": "~1.0.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:block-stream",
+      "requirement": "0.0.8",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:char-spinner",
+      "requirement": "~1.0.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:chmodr",
+      "requirement": "~1.0.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:chownr",
+      "requirement": "0.0.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:cmd-shim",
+      "requirement": "~2.0.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:columnify",
+      "requirement": "~1.5.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:config-chain",
+      "requirement": "~1.1.9",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:dezalgo",
+      "requirement": "~1.0.3",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:editor",
+      "requirement": "~1.0.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:fs-vacuum",
+      "requirement": "~1.2.6",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:fs-write-stream-atomic",
+      "requirement": "~1.0.3",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:fstream",
+      "requirement": "~1.0.7",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:fstream-npm",
+      "requirement": "~1.0.4",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:github-url-from-git",
+      "requirement": "~1.4.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:github-url-from-username-repo",
+      "requirement": "~1.0.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:glob",
+      "requirement": "~5.0.14",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:graceful-fs",
+      "requirement": "~4.1.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:hosted-git-info",
+      "requirement": "~2.1.4",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:inflight",
+      "requirement": "~1.0.4",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:inherits",
+      "requirement": "~2.0.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:ini",
+      "requirement": "~1.3.4",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:init-package-json",
+      "requirement": "~1.7.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:lockfile",
+      "requirement": "~1.0.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:lru-cache",
+      "requirement": "~2.6.5",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:minimatch",
+      "requirement": "~2.0.10",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:mkdirp",
+      "requirement": "~0.5.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:node-gyp",
+      "requirement": "~2.0.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:nopt",
+      "requirement": "~3.0.3",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:normalize-git-url",
+      "requirement": "~3.0.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:normalize-package-data",
+      "requirement": "~2.3.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:npm-cache-filename",
+      "requirement": "~1.0.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:npm-install-checks",
+      "requirement": "~1.0.6",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:npm-package-arg",
+      "requirement": "~4.0.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:npm-registry-client",
+      "requirement": "~6.5.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:npm-user-validate",
+      "requirement": "~0.1.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:npmlog",
+      "requirement": "~1.2.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:once",
+      "requirement": "~1.3.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:opener",
+      "requirement": "~1.4.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:osenv",
+      "requirement": "~0.1.3",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:path-is-inside",
+      "requirement": "~1.0.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:read",
+      "requirement": "~1.0.6",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:read-installed",
+      "requirement": "~4.0.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:read-package-json",
+      "requirement": "~2.0.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:readable-stream",
+      "requirement": "~1.1.13",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:realize-package-specifier",
+      "requirement": "~3.0.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:request",
+      "requirement": "~2.60.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:retry",
+      "requirement": "~0.6.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:rimraf",
+      "requirement": "~2.4.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:semver",
+      "requirement": "~5.0.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:sha",
+      "requirement": "~1.3.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:slide",
+      "requirement": "~1.1.6",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:sorted-object",
+      "requirement": "~1.0.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:spdx",
+      "requirement": "~0.4.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:tar",
+      "requirement": "~2.1.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:text-table",
+      "requirement": "~0.2.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:uid-number",
+      "requirement": "0.0.6",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:umask",
+      "requirement": "~1.1.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:validate-npm-package-name",
+      "requirement": "~2.2.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:which",
+      "requirement": "~1.1.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:wrappy",
+      "requirement": "~1.0.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:write-file-atomic",
+      "requirement": "~1.1.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:deep-equal",
+      "requirement": "~1.0.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:marked",
+      "requirement": "~0.3.3",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:marked-man",
+      "requirement": "~0.1.5",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:nock",
+      "requirement": "~2.10.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:npm-registry-couchapp",
+      "requirement": "~2.6.7",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:npm-registry-mock",
+      "requirement": "~1.0.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:require-inject",
+      "requirement": "~1.2.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:sprintf-js",
+      "requirement": "~1.0.2",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:tap",
+      "requirement": "~1.3.1",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    }
+  ],
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/npm/nodep/package.json.expected b/tests/packagedcode/data/npm/nodep/package.json.expected
index 6acca9d0ae4..8537092f6e9 100644
--- a/tests/packagedcode/data/npm/nodep/package.json.expected
+++ b/tests/packagedcode/data/npm/nodep/package.json.expected
@@ -1,7 +1,10 @@
 {
   "type": "npm",
+  "namespace": null,
   "name": "etcd-dashboard",
   "version": "0.0.0",
+  "qualifiers": null,
+  "path": null,
   "primary_language": "JavaScript",
   "code_type": null,
   "description": null,
@@ -18,137 +21,210 @@
   "vcs_repository": null,
   "vcs_revision": null,
   "copyright": null,
-  "asserted_license": null,
   "license_expression": null,
+  "asserted_license": null,
   "notice_text": null,
-  "dependencies": {
-    "development": [
-      {
-        "type": "npm",
-        "name": "grunt",
-        "version": "~0.4.1"
-      },
-      {
-        "type": "npm",
-        "name": "grunt-contrib-copy",
-        "version": "~0.4.1"
-      },
-      {
-        "type": "npm",
-        "name": "grunt-contrib-concat",
-        "version": "~0.3.0"
-      },
-      {
-        "type": "npm",
-        "name": "grunt-contrib-coffee",
-        "version": "~0.7.0"
-      },
-      {
-        "type": "npm",
-        "name": "grunt-contrib-uglify",
-        "version": "~0.2.0"
-      },
-      {
-        "type": "npm",
-        "name": "grunt-contrib-compass",
-        "version": "~0.5.0"
-      },
-      {
-        "type": "npm",
-        "name": "grunt-contrib-jshint",
-        "version": "~0.6.0"
-      },
-      {
-        "type": "npm",
-        "name": "grunt-contrib-cssmin",
-        "version": "~0.6.0"
-      },
-      {
-        "type": "npm",
-        "name": "grunt-contrib-connect",
-        "version": "~0.3.0"
-      },
-      {
-        "type": "npm",
-        "name": "grunt-contrib-clean",
-        "version": "~0.5.0"
-      },
-      {
-        "type": "npm",
-        "name": "grunt-contrib-htmlmin",
-        "version": "~0.1.3"
-      },
-      {
-        "type": "npm",
-        "name": "grunt-contrib-imagemin",
-        "version": "~0.2.0"
-      },
-      {
-        "type": "npm",
-        "name": "grunt-contrib-watch",
-        "version": "~0.5.2"
-      },
-      {
-        "type": "npm",
-        "name": "grunt-autoprefixer",
-        "version": "~0.2.0"
-      },
-      {
-        "type": "npm",
-        "name": "grunt-usemin",
-        "version": "~0.1.11"
-      },
-      {
-        "type": "npm",
-        "name": "grunt-svgmin",
-        "version": "~0.2.0"
-      },
-      {
-        "type": "npm",
-        "name": "grunt-rev",
-        "version": "~0.1.0"
-      },
-      {
-        "type": "npm",
-        "name": "grunt-open",
-        "version": "~0.2.0"
-      },
-      {
-        "type": "npm",
-        "name": "grunt-concurrent",
-        "version": "~0.3.0"
-      },
-      {
-        "type": "npm",
-        "name": "load-grunt-tasks",
-        "version": "~0.1.0"
-      },
-      {
-        "type": "npm",
-        "name": "connect-livereload",
-        "version": "~0.2.0"
-      },
-      {
-        "type": "npm",
-        "name": "grunt-google-cdn",
-        "version": "~0.2.0"
-      },
-      {
-        "type": "npm",
-        "name": "grunt-ngmin",
-        "version": "~0.0.2"
-      },
-      {
-        "type": "npm",
-        "name": "time-grunt",
-        "version": "~0.1.0"
-      },
-      {
-        "type": "npm",
-        "name": "grunt-karma",
-        "version": "~0.6.2"
-      }
-    ]
-  },
+  "dependencies": [
+    {
+      "identifier": "npm:grunt",
+      "requirement": "~0.4.1",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:grunt-contrib-copy",
+      "requirement": "~0.4.1",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:grunt-contrib-concat",
+      "requirement": "~0.3.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:grunt-contrib-coffee",
+      "requirement": "~0.7.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:grunt-contrib-uglify",
+      "requirement": "~0.2.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:grunt-contrib-compass",
+      "requirement": "~0.5.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:grunt-contrib-jshint",
+      "requirement": "~0.6.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:grunt-contrib-cssmin",
+      "requirement": "~0.6.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:grunt-contrib-connect",
+      "requirement": "~0.3.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:grunt-contrib-clean",
+      "requirement": "~0.5.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:grunt-contrib-htmlmin",
+      "requirement": "~0.1.3",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:grunt-contrib-imagemin",
+      "requirement": "~0.2.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:grunt-contrib-watch",
+      "requirement": "~0.5.2",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:grunt-autoprefixer",
+      "requirement": "~0.2.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:grunt-usemin",
+      "requirement": "~0.1.11",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:grunt-svgmin",
+      "requirement": "~0.2.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:grunt-rev",
+      "requirement": "~0.1.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:grunt-open",
+      "requirement": "~0.2.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:grunt-concurrent",
+      "requirement": "~0.3.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:load-grunt-tasks",
+      "requirement": "~0.1.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:connect-livereload",
+      "requirement": "~0.2.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:grunt-google-cdn",
+      "requirement": "~0.2.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:grunt-ngmin",
+      "requirement": "~0.0.2",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:time-grunt",
+      "requirement": "~0.1.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:grunt-karma",
+      "requirement": "~0.6.2",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    }
+  ],
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/npm/repo_url/package.json.expected b/tests/packagedcode/data/npm/repo_url/package.json.expected
index 3e0a96cb948..e15dc5bec34 100644
--- a/tests/packagedcode/data/npm/repo_url/package.json.expected
+++ b/tests/packagedcode/data/npm/repo_url/package.json.expected
@@ -1,7 +1,10 @@
 {
   "type": "npm",
+  "namespace": null,
   "name": "react-mobile-navigation-modal",
   "version": "0.1.0-rc.3",
+  "qualifiers": null,
+  "path": null,
   "primary_language": "JavaScript",
   "code_type": null,
   "description": null,
@@ -35,176 +38,266 @@
   "vcs_repository": null,
   "vcs_revision": null,
   "copyright": null,
-  "asserted_license": null,
   "license_expression": null,
+  "asserted_license": null,
   "notice_text": null,
-  "dependencies": {
-    "development": [
-      {
-        "type": "npm",
-        "name": "babel",
-        "version": "^6.3.26"
-      },
-      {
-        "type": "npm",
-        "name": "babel-cli",
-        "version": "^6.7.7"
-      },
-      {
-        "type": "npm",
-        "name": "babel-core",
-        "version": "^6.7.7"
-      },
-      {
-        "type": "npm",
-        "name": "babel-eslint",
-        "version": "^6.0.3"
-      },
-      {
-        "type": "npm",
-        "name": "babel-loader",
-        "version": "^6.2.1"
-      },
-      {
-        "type": "npm",
-        "name": "babel-plugin-transform-decorators-legacy",
-        "version": "^1.3.4"
-      },
-      {
-        "type": "npm",
-        "name": "babel-plugin-transform-object-rest-spread",
-        "version": "^6.5.0"
-      },
-      {
-        "type": "npm",
-        "name": "babel-preset-es2015",
-        "version": "^6.3.13"
-      },
-      {
-        "type": "npm",
-        "name": "babel-preset-es2015-allow-top-level-this",
-        "version": "0.0.1"
-      },
-      {
-        "type": "npm",
-        "name": "babel-preset-react",
-        "version": "^6.3.13"
-      },
-      {
-        "type": "npm",
-        "name": "eslint",
-        "version": "^2.5.3"
-      },
-      {
-        "type": "npm",
-        "name": "eslint-config-airbnb",
-        "version": "^9.0.1"
-      },
-      {
-        "type": "npm",
-        "name": "eslint-plugin-import",
-        "version": "^1.5.0"
-      },
-      {
-        "type": "npm",
-        "name": "eslint-plugin-jsx-a11y",
-        "version": "^1.0.2"
-      },
-      {
-        "type": "npm",
-        "name": "eslint-plugin-react",
-        "version": "^5.0.1"
-      },
-      {
-        "type": "npm",
-        "name": "node-uuid",
-        "version": "^1.4.7"
-      },
-      {
-        "type": "npm",
-        "name": "react",
-        "version": "~15.3.2"
-      },
-      {
-        "type": "npm",
-        "name": "react-art",
-        "version": "^0.15.1"
-      },
-      {
-        "type": "npm",
-        "name": "react-dom",
-        "version": "~15.3.2"
-      },
-      {
-        "type": "npm",
-        "name": "react-motion",
-        "version": "^0.4.7"
-      },
-      {
-        "type": "npm",
-        "name": "react-redux",
-        "version": "^4.0.6"
-      },
-      {
-        "type": "npm",
-        "name": "redux",
-        "version": "^3.0.5"
-      },
-      {
-        "type": "npm",
-        "name": "rimraf",
-        "version": "^2.3.4"
-      },
-      {
-        "type": "npm",
-        "name": "webpack",
-        "version": "^1.12.15"
-      },
-      {
-        "type": "npm",
-        "name": "webpack-dev-server",
-        "version": "^1.14.1"
-      }
-    ],
-    "runtime": [
-      {
-        "type": "npm",
-        "name": "binary-ui-icons",
-        "version": "^0.1.0-rc.8"
-      },
-      {
-        "type": "npm",
-        "name": "binary-ui-stack",
-        "version": "^0.0.1-rc.4"
-      },
-      {
-        "type": "npm",
-        "name": "binary-ui-styles",
-        "version": "^0.1.0-rc.8"
-      },
-      {
-        "type": "npm",
-        "name": "invariant",
-        "version": "^2.2.1"
-      },
-      {
-        "type": "npm",
-        "name": "react-mobile-navigation-core",
-        "version": "^0.1.0-rc.3"
-      },
-      {
-        "type": "npm",
-        "name": "react-mobile-navigation-engine",
-        "version": "^0.1.0-rc.3"
-      }
-    ],
-    "optional": [
-      {
-        "type": "npm",
-        "name": "react",
-        "version": "~15.3.2"
-      }
-    ]
-  },
+  "dependencies": [
+    {
+      "identifier": "npm:binary-ui-icons",
+      "requirement": "^0.1.0-rc.8",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:binary-ui-stack",
+      "requirement": "^0.0.1-rc.4",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:binary-ui-styles",
+      "requirement": "^0.1.0-rc.8",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:invariant",
+      "requirement": "^2.2.1",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:react-mobile-navigation-core",
+      "requirement": "^0.1.0-rc.3",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:react-mobile-navigation-engine",
+      "requirement": "^0.1.0-rc.3",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:babel",
+      "requirement": "^6.3.26",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:babel-cli",
+      "requirement": "^6.7.7",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:babel-core",
+      "requirement": "^6.7.7",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:babel-eslint",
+      "requirement": "^6.0.3",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:babel-loader",
+      "requirement": "^6.2.1",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:babel-plugin-transform-decorators-legacy",
+      "requirement": "^1.3.4",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:babel-plugin-transform-object-rest-spread",
+      "requirement": "^6.5.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:babel-preset-es2015",
+      "requirement": "^6.3.13",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:babel-preset-es2015-allow-top-level-this",
+      "requirement": "0.0.1",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:babel-preset-react",
+      "requirement": "^6.3.13",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:eslint",
+      "requirement": "^2.5.3",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:eslint-config-airbnb",
+      "requirement": "^9.0.1",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:eslint-plugin-import",
+      "requirement": "^1.5.0",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:eslint-plugin-jsx-a11y",
+      "requirement": "^1.0.2",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:eslint-plugin-react",
+      "requirement": "^5.0.1",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:node-uuid",
+      "requirement": "^1.4.7",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:react",
+      "requirement": "~15.3.2",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:react-art",
+      "requirement": "^0.15.1",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:react-dom",
+      "requirement": "~15.3.2",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:react-motion",
+      "requirement": "^0.4.7",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:react-redux",
+      "requirement": "^4.0.6",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:redux",
+      "requirement": "^3.0.5",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:rimraf",
+      "requirement": "^2.3.4",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:webpack",
+      "requirement": "^1.12.15",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:webpack-dev-server",
+      "requirement": "^1.14.1",
+      "scope": "devDependencies",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:react",
+      "requirement": "~15.3.2",
+      "scope": "peerDependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    }
+  ],
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/npm/uri_vcs/package.json.expected b/tests/packagedcode/data/npm/uri_vcs/package.json.expected
index 2bd3cadb7d6..42528df65ef 100644
--- a/tests/packagedcode/data/npm/uri_vcs/package.json.expected
+++ b/tests/packagedcode/data/npm/uri_vcs/package.json.expected
@@ -1,7 +1,10 @@
 {
   "type": "npm",
+  "namespace": null,
   "name": "npm2aur",
   "version": "0.1.3",
+  "qualifiers": null,
+  "path": null,
   "primary_language": "JavaScript",
   "code_type": null,
   "description": null,
@@ -26,47 +29,66 @@
   "vcs_repository": "https://github.com/Filirom1/npm2aur.git",
   "vcs_revision": null,
   "copyright": null,
-  "asserted_license": "MIT\nhttp://www.opensource.org/licenses/MIT",
   "license_expression": null,
+  "asserted_license": "MIT\nhttp://www.opensource.org/licenses/MIT",
   "notice_text": null,
-  "dependencies": {
-    "runtime": [
-      {
-        "type": "npm",
-        "name": "optimist",
-        "version": "0.2.x"
-      },
-      {
-        "type": "npm",
-        "name": "colors",
-        "version": "0.5.x"
-      },
-      {
-        "type": "npm",
-        "name": "coffee-script",
-        "version": "~1.3.3"
-      },
-      {
-        "type": "npm",
-        "name": "underscore",
-        "version": "~1.3.3"
-      },
-      {
-        "type": "npm",
-        "name": "npm",
-        "version": "~1.1.32"
-      },
-      {
-        "type": "npm",
-        "name": "npm2arch",
-        "version": "~0.1.10"
-      },
-      {
-        "type": "npm",
-        "name": "aur",
-        "version": "~0.1.2"
-      }
-    ]
-  },
+  "dependencies": [
+    {
+      "identifier": "npm:optimist",
+      "requirement": "0.2.x",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:colors",
+      "requirement": "0.5.x",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:coffee-script",
+      "requirement": "~1.3.3",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:underscore",
+      "requirement": "~1.3.3",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:npm",
+      "requirement": "~1.1.32",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:npm2arch",
+      "requirement": "~0.1.10",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    },
+    {
+      "identifier": "npm:aur",
+      "requirement": "~0.1.2",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    }
+  ],
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/npm/urls_dict/package.json.expected b/tests/packagedcode/data/npm/urls_dict/package.json.expected
index d6e23828e82..fe1df338050 100644
--- a/tests/packagedcode/data/npm/urls_dict/package.json.expected
+++ b/tests/packagedcode/data/npm/urls_dict/package.json.expected
@@ -1,7 +1,10 @@
 {
   "type": "npm",
+  "namespace": null,
   "name": "jsonp-filter",
   "version": "0.0.3",
+  "qualifiers": null,
+  "path": null,
   "primary_language": "JavaScript",
   "code_type": null,
   "description": null,
@@ -31,17 +34,18 @@
   "vcs_repository": "git://github.com/Postmedia/jsonp-filter",
   "vcs_revision": null,
   "copyright": null,
-  "asserted_license": "MIT\nhttps://github.com/Postmedia/jsonp-filter/blob/master/LICENSE",
   "license_expression": null,
+  "asserted_license": "MIT\nhttps://github.com/Postmedia/jsonp-filter/blob/master/LICENSE",
   "notice_text": null,
-  "dependencies": {
-    "runtime": [
-      {
-        "type": "npm",
-        "name": "styout",
-        "version": ">= 0.6.0"
-      }
-    ]
-  },
+  "dependencies": [
+    {
+      "identifier": "npm:styout",
+      "requirement": ">= 0.6.0",
+      "scope": "dependencies",
+      "is_runtime": true,
+      "is_optional": false,
+      "is_resolved": null
+    }
+  ],
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/phpcomposer/a-timer/composer.json.expected b/tests/packagedcode/data/phpcomposer/a-timer/composer.json.expected
index 38b26ebcaa7..40f63bf9ee5 100644
--- a/tests/packagedcode/data/phpcomposer/a-timer/composer.json.expected
+++ b/tests/packagedcode/data/phpcomposer/a-timer/composer.json.expected
@@ -1,7 +1,10 @@
 {
-  "type": "phpcomposer",
-  "name": "jandreasn/a-timer",
+  "type": "composer",
+  "namespace": "jandreasn",
+  "name": "a-timer",
   "version": null,
+  "qualifiers": null,
+  "path": null,
   "primary_language": "PHP",
   "code_type": null,
   "description": null,
@@ -37,29 +40,34 @@
   "vcs_repository": null,
   "vcs_revision": null,
   "copyright": null,
-  "asserted_license": "MIT",
   "license_expression": null,
+  "asserted_license": "MIT",
   "notice_text": null,
-  "dependencies": {
-    "development": [
-      {
-        "type": "phpcomposer",
-        "name": "phpunit/phpunit",
-        "version": "^5.6"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "squizlabs/php_codesniffer",
-        "version": "^2.7"
-      }
-    ],
-    "runtime": [
-      {
-        "type": "phpcomposer",
-        "name": "php",
-        "version": ">=5.6.0"
-      }
-    ]
-  },
+  "dependencies": [
+    {
+      "identifier": "composer:php",
+      "requirement": ">=5.6.0",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:phpunit/phpunit",
+      "requirement": "^5.6",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:squizlabs/php_codesniffer",
+      "requirement": "^2.7",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    }
+  ],
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/phpcomposer/framework/composer.json.expected b/tests/packagedcode/data/phpcomposer/framework/composer.json.expected
index ef7ca200977..28315d8cc77 100644
--- a/tests/packagedcode/data/phpcomposer/framework/composer.json.expected
+++ b/tests/packagedcode/data/phpcomposer/framework/composer.json.expected
@@ -1,7 +1,10 @@
 {
-  "type": "phpcomposer",
-  "name": "narrowspark/framework",
+  "type": "composer",
+  "namespace": "narrowspark",
+  "name": "framework",
   "version": null,
+  "qualifiers": null,
+  "path": null,
   "primary_language": "PHP",
   "code_type": null,
   "description": null,
@@ -44,374 +47,1130 @@
   "vcs_repository": null,
   "vcs_revision": null,
   "copyright": null,
-  "asserted_license": "MIT",
   "license_expression": null,
+  "asserted_license": "MIT",
   "notice_text": null,
-  "dependencies": {
-    "development": [
-      {
-        "type": "phpcomposer",
-        "name": "aws/aws-sdk-php",
-        "version": "^3.18"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "cache/array-adapter",
-        "version": "^0.4"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "cache/filesystem-adapter",
-        "version": "^0.3"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "cache/session-handler",
-        "version": "^0.2"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "cache/void-adapter",
-        "version": "^0.3"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "guzzlehttp/guzzle",
-        "version": "^6.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "league/flysystem-aws-s3-v3",
-        "version": "^1.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "league/flysystem-cached-adapter",
-        "version": "^1.0.3"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "league/flysystem-dropbox",
-        "version": "^1.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "league/flysystem-gridfs",
-        "version": "^1.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "league/flysystem-rackspace",
-        "version": "^1.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "league/flysystem-sftp",
-        "version": "^1.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "league/flysystem-webdav",
-        "version": "^1.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "league/flysystem-vfs",
-        "version": "^1.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "league/flysystem-ziparchive",
-        "version": "^1.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "league/plates",
-        "version": "^3.1"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "mikey179/vfsStream",
-        "version": "^1.6"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "mouf/picotainer",
-        "version": "^1.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "narrowspark/php-cs-fixer-config",
-        "version": "^2.1"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "narrowspark/testing-helper",
-        "version": "^2.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "mockery/mockery",
-        "version": "^0.9.5"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "phpunit/phpunit",
-        "version": "^5.1"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "phpbench/phpbench",
-        "version": "^0.12"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "predis/predis",
-        "version": "^1.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "php-amqplib/php-amqplib",
-        "version": "^2.6"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "pda/pheanstalk",
-        "version": "^3.1"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "spatie/array-to-xml",
-        "version": "^2.1"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "twig/twig",
-        "version": "^1.24"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "sepia/po-parser",
-        "version": "^4.2"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "symfony/yaml",
-        "version": "^3.1"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "yosymfony/toml",
-        "version": "^0.3"
-      }
-    ],
-    "runtime": [
-      {
-        "type": "phpcomposer",
-        "name": "php",
-        "version": "7.0.0 - 7.0.5 || ^7.0.7"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "ext-openssl",
-        "version": "*"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "cache/chain-adapter",
-        "version": "^0.4"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "cache/namespaced-cache",
-        "version": "^0.1"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "cakephp/chronos",
-        "version": "^1.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "classpreloader/classpreloader",
-        "version": "^3.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "container-interop/container-interop",
-        "version": "^1.1"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "container-interop/service-provider",
-        "version": "^0.3"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "danielstjules/stringy",
-        "version": "^2.3"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "defuse/php-encryption",
-        "version": "^2.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "doctrine/dbal",
-        "version": "^2.5"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "doctrine/migrations",
-        "version": "^1.4"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "egulias/email-validator",
-        "version": "^2.1"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "filp/whoops",
-        "version": "^2.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "http-interop/http-factory",
-        "version": "^0.2"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "http-interop/http-middleware",
-        "version": "^0.3"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "league/flysystem",
-        "version": "^1.0.27"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "monolog/monolog",
-        "version": "^1.17"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "narrowspark/arr",
-        "version": "^2.1"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "narrowspark/collection",
-        "version": "^0.1"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "narrowspark/http-status",
-        "version": "^2.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "mtdowling/cron-expression",
-        "version": "^1.1"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "opis/closure",
-        "version": "^2.2.1"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "ocramius/proxy-manager",
-        "version": "^2"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "php-di/invoker",
-        "version": "^1.3"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "paragonie/password_lock",
-        "version": "^3.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "psr/http-message",
-        "version": "^1.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "psy/psysh",
-        "version": "^0.6"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "ramsey/uuid",
-        "version": "^3.4"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "respect/validation",
-        "version": "^1.1"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "schnittstabil/csrf-tokenservice",
-        "version": "^2.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "stecman/symfony-console-completion",
-        "version": "^0.6"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "symfony/console",
-        "version": "^3.1"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "symfony/debug",
-        "version": "^3.1"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "symfony/finder",
-        "version": "^3.1"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "symfony/filesystem",
-        "version": "^3.1"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "symfony/polyfill-intl-icu",
-        "version": "^1.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "symfony/polyfill-mbstring",
-        "version": "^1.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "symfony/var-dumper",
-        "version": "^3.1"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "swiftmailer/swiftmailer",
-        "version": "^5.4"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "vlucas/phpdotenv",
-        "version": "^2.3"
-      }
-    ]
-  },
+  "dependencies": [
+    {
+      "identifier": "composer:php",
+      "requirement": "7.0.0 - 7.0.5 || ^7.0.7",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:ext-openssl",
+      "requirement": "*",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:cache/chain-adapter",
+      "requirement": "^0.4",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:cache/namespaced-cache",
+      "requirement": "^0.1",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:cakephp/chronos",
+      "requirement": "^1.0",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:classpreloader/classpreloader",
+      "requirement": "^3.0",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:container-interop/container-interop",
+      "requirement": "^1.1",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:container-interop/service-provider",
+      "requirement": "^0.3",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:danielstjules/stringy",
+      "requirement": "^2.3",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:defuse/php-encryption",
+      "requirement": "^2.0",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:doctrine/dbal",
+      "requirement": "^2.5",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:doctrine/migrations",
+      "requirement": "^1.4",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:egulias/email-validator",
+      "requirement": "^2.1",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:filp/whoops",
+      "requirement": "^2.0",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:http-interop/http-factory",
+      "requirement": "^0.2",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:http-interop/http-middleware",
+      "requirement": "^0.3",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:league/flysystem",
+      "requirement": "^1.0.27",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:monolog/monolog",
+      "requirement": "^1.17",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:narrowspark/arr",
+      "requirement": "^2.1",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:narrowspark/collection",
+      "requirement": "^0.1",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:narrowspark/http-status",
+      "requirement": "^2.0",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:mtdowling/cron-expression",
+      "requirement": "^1.1",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:opis/closure",
+      "requirement": "^2.2.1",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:ocramius/proxy-manager",
+      "requirement": "^2",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:php-di/invoker",
+      "requirement": "^1.3",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:paragonie/password_lock",
+      "requirement": "^3.0",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:psr/http-message",
+      "requirement": "^1.0",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:psy/psysh",
+      "requirement": "^0.6",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:ramsey/uuid",
+      "requirement": "^3.4",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:respect/validation",
+      "requirement": "^1.1",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:schnittstabil/csrf-tokenservice",
+      "requirement": "^2.0",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:stecman/symfony-console-completion",
+      "requirement": "^0.6",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:symfony/console",
+      "requirement": "^3.1",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:symfony/debug",
+      "requirement": "^3.1",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:symfony/finder",
+      "requirement": "^3.1",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:symfony/filesystem",
+      "requirement": "^3.1",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:symfony/polyfill-intl-icu",
+      "requirement": "^1.0",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:symfony/polyfill-mbstring",
+      "requirement": "^1.0",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:symfony/var-dumper",
+      "requirement": "^3.1",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:swiftmailer/swiftmailer",
+      "requirement": "^5.4",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:vlucas/phpdotenv",
+      "requirement": "^2.3",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:aws/aws-sdk-php",
+      "requirement": "^3.18",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:cache/array-adapter",
+      "requirement": "^0.4",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:cache/filesystem-adapter",
+      "requirement": "^0.3",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:cache/session-handler",
+      "requirement": "^0.2",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:cache/void-adapter",
+      "requirement": "^0.3",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:guzzlehttp/guzzle",
+      "requirement": "^6.0",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:league/flysystem-aws-s3-v3",
+      "requirement": "^1.0",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:league/flysystem-cached-adapter",
+      "requirement": "^1.0.3",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:league/flysystem-dropbox",
+      "requirement": "^1.0",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:league/flysystem-gridfs",
+      "requirement": "^1.0",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:league/flysystem-rackspace",
+      "requirement": "^1.0",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:league/flysystem-sftp",
+      "requirement": "^1.0",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:league/flysystem-webdav",
+      "requirement": "^1.0",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:league/flysystem-vfs",
+      "requirement": "^1.0",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:league/flysystem-ziparchive",
+      "requirement": "^1.0",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:league/plates",
+      "requirement": "^3.1",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:mikey179/vfsStream",
+      "requirement": "^1.6",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:mouf/picotainer",
+      "requirement": "^1.0",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:narrowspark/php-cs-fixer-config",
+      "requirement": "^2.1",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:narrowspark/testing-helper",
+      "requirement": "^2.0",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:mockery/mockery",
+      "requirement": "^0.9.5",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:phpunit/phpunit",
+      "requirement": "^5.1",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:phpbench/phpbench",
+      "requirement": "^0.12",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:predis/predis",
+      "requirement": "^1.0",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:php-amqplib/php-amqplib",
+      "requirement": "^2.6",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:pda/pheanstalk",
+      "requirement": "^3.1",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:spatie/array-to-xml",
+      "requirement": "^2.1",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:twig/twig",
+      "requirement": "^1.24",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:sepia/po-parser",
+      "requirement": "^4.2",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:symfony/yaml",
+      "requirement": "^3.1",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:yosymfony/toml",
+      "requirement": "^0.3",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:container-interop/container-interop-implementation",
+      "requirement": "^1.1",
+      "scope": "provide",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:psr/cache-implementation",
+      "requirement": "^1.0",
+      "scope": "provide",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:psr/container-implementation",
+      "requirement": "^1.0",
+      "scope": "provide",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:psr/http-message",
+      "requirement": "^1.0",
+      "scope": "provide",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:psr/http-message-implementation",
+      "requirement": "^1.0",
+      "scope": "provide",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:psr/log-implementation",
+      "requirement": "^1.0",
+      "scope": "provide",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:viserio/cache",
+      "requirement": "self.version",
+      "scope": "replace",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:viserio/conifg",
+      "requirement": "self.version",
+      "scope": "replace",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:viserio/console",
+      "requirement": "self.version",
+      "scope": "replace",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:viserio/container",
+      "requirement": "self.version",
+      "scope": "replace",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:viserio/contracts",
+      "requirement": "self.version",
+      "scope": "replace",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:viserio/cookie",
+      "requirement": "self.version",
+      "scope": "replace",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:viserio/database",
+      "requirement": "self.version",
+      "scope": "replace",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:viserio/encrypter",
+      "requirement": "self.version",
+      "scope": "replace",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:viserio/events",
+      "requirement": "self.version",
+      "scope": "replace",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:viserio/exception",
+      "requirement": "self.version",
+      "scope": "replace",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:viserio/filessystem",
+      "requirement": "self.version",
+      "scope": "replace",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:viserio/hashing",
+      "requirement": "self.version",
+      "scope": "replace",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:viserio/http",
+      "requirement": "self.version",
+      "scope": "replace",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:viserio/http-factory",
+      "requirement": "self.version",
+      "scope": "replace",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:viserio/log",
+      "requirement": "self.version",
+      "scope": "replace",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:viserio/mail",
+      "requirement": "self.version",
+      "scope": "replace",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:viserio/parsers",
+      "requirement": "self.version",
+      "scope": "replace",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:viserio/pipeline",
+      "requirement": "self.version",
+      "scope": "replace",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:viserio/routing",
+      "requirement": "self.version",
+      "scope": "replace",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:viserio/session",
+      "requirement": "self.version",
+      "scope": "replace",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:viserio/statical-proxy",
+      "requirement": "self.version",
+      "scope": "replace",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:viserio/support",
+      "requirement": "self.version",
+      "scope": "replace",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:viserio/translator",
+      "requirement": "self.version",
+      "scope": "replace",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:viserio/validation",
+      "requirement": "self.version",
+      "scope": "replace",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:viserio/view",
+      "requirement": "self.version",
+      "scope": "replace",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:alcaeus/mongo-php-adapter",
+      "requirement": "Required to use the ext-mongo interface on ext-mongodb interface (^1.0).",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:aws/aws-sdk-php",
+      "requirement": "Required to use the SQS queue driver and SES mail driver (^3.18).",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:cache/apc-adapter",
+      "requirement": "Required to use the Apc cache (^0.3).",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:cache/apcu-adapter",
+      "requirement": "Required to use the Apcu cache (^0.3).",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:cache/array-adapter",
+      "requirement": "Required to use the Array cache (^0.2)",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:cache/filesystem-adapter",
+      "requirement": "Required to use the Filesystem cache (^0.3).",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:cache/memcache-adapter",
+      "requirement": "Required to use the Memcache cache (^0.3).",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:cache/memcached-adapter",
+      "requirement": "Required to use the Memcached cache (^0.3).",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:cache/mongodb-adapter",
+      "requirement": "Required to use the Mongodb cache (^0.2).",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:cache/predis-adapter",
+      "requirement": "Required to use the Predis cache (^0.4).",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:cache/session-handler",
+      "requirement": "Required to use the Session cache (^0.1).",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:cache/void-adapter",
+      "requirement": "Required to use the Void cache (^0.3).",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:ext-pdo",
+      "requirement": "Required to use PDO adapters",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:ext-pdo_dblib",
+      "requirement": "Required to use MSSQL databases on Liunx/UNIX platform",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:ext-pdo-firebird",
+      "requirement": "Required to use Firebird databases",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:ext-pdo-mysql",
+      "requirement": "Required to use MySQL or MariaDB databases",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:ext-pdo-pqsql",
+      "requirement": "Required to use PostgreSQL databases",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:ext-pdo-sqlite",
+      "requirement": "Required to use SQLite databases",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:ext-pdo_sqlsrv",
+      "requirement": "Required to use MSSQL databases on Windows platform",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:guzzlehttp/guzzle",
+      "requirement": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (^6.0).",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:league/flysystem-aws-s3-v3",
+      "requirement": "Required to use the Flysystem S3 adapter (^1.0).",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:league/flysystem-cached-adapter",
+      "requirement": "Required to use the Flysystem Caching adapter (^1.0.3).",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:league/flysystem-dropbox",
+      "requirement": "Required to use the Flysystem Dropbox adapter (^1.0).",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:league/flysystem-gridfs",
+      "requirement": "Required to use the Flysystem GridFS adapter (^1.0).",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:league/flysystem-rackspace",
+      "requirement": "Required to use the Flysystem Rackspace adapter (^1.0).",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:league/flysystem-replicate-adapter",
+      "requirement": "Required to use the Flysystem Replicate adapter (^1.0).",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:league/flysystem-sftp",
+      "requirement": "Required to use the Flysystem SFTP adapter (^1.0).",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:league/flysystem-webdav",
+      "requirement": "Required to use the Flysystem WebDav adapter (^1.0).",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:league/flysystem-vfs",
+      "requirement": "Required to use the Flysystem VFS adapter (^1.0).",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:league/flysystem-ziparchive",
+      "requirement": "Required to use the Flysystem ZipArchive adapter (^1.0).",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:league/plates",
+      "requirement": "Required to use the League Plates view adapter (^3.1).",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:pda/pheanstalk",
+      "requirement": "Required to use the Beanstalk queue driver (^3.0).",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:predis/predis",
+      "requirement": "Required to use the Redis cache and Queue drivers (^1.0).",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:twig/twig",
+      "requirement": "Required to use the Twig view adapter (^1.24).",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:spatie/array-to-xml",
+      "requirement": "Required to use the XML dump (^2.1.1).",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:yosymfony/toml",
+      "requirement": "Required to use the TOML parser (^0.3).",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:symfony/yaml",
+      "requirement": "Required to use the Yaml parser (^3.1).",
+      "scope": "suggest",
+      "is_runtime": true,
+      "is_optional": true,
+      "is_resolved": null
+    }
+  ],
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/phpcomposer/modern/composer.json.expected b/tests/packagedcode/data/phpcomposer/modern/composer.json.expected
index 20e6cd09fd3..21c350f74de 100644
--- a/tests/packagedcode/data/phpcomposer/modern/composer.json.expected
+++ b/tests/packagedcode/data/phpcomposer/modern/composer.json.expected
@@ -1,7 +1,10 @@
 {
-  "type": "phpcomposer",
+  "type": "composer",
+  "namespace": "",
   "name": "integration-hub",
   "version": null,
+  "qualifiers": null,
+  "path": null,
   "primary_language": "PHP",
   "code_type": null,
   "description": null,
@@ -18,169 +21,258 @@
   "vcs_repository": "https://github.com/somegroup/Symfony3-custom",
   "vcs_revision": null,
   "copyright": null,
-  "asserted_license": "proprietary",
   "license_expression": null,
+  "asserted_license": "proprietary",
   "notice_text": null,
-  "dependencies": {
-    "development": [
-      {
-        "type": "phpcomposer",
-        "name": "sensio/generator-bundle",
-        "version": "^3.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "symfony/phpunit-bridge",
-        "version": "^3.2"
-      }
-    ],
-    "runtime": [
-      {
-        "type": "phpcomposer",
-        "name": "php",
-        "version": "7.1.*"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "symfony/symfony",
-        "version": "3.2.*"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "sensio/distribution-bundle",
-        "version": "^5.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "doctrine/orm",
-        "version": "^2.5"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "doctrine/doctrine-bundle",
-        "version": "^1.6"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "doctrine/doctrine-cache-bundle",
-        "version": "^1.2"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "symfony/swiftmailer-bundle",
-        "version": "^2.3.10"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "symfony/monolog-bundle",
-        "version": "^3.0.2"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "symfony/polyfill-apcu",
-        "version": "^1.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "sensio/framework-extra-bundle",
-        "version": "^3.0.2"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "incenteev/composer-parameter-handler",
-        "version": "^2.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "twig/twig",
-        "version": "^1.0||^2.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "doctrine/doctrine-migrations-bundle",
-        "version": "^1.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "greenlion/php-sql-parser",
-        "version": "^4.1"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "eightpoints/guzzle-bundle",
-        "version": "^5.3"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "jms/serializer-bundle",
-        "version": "^1.1"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "friendsofsymfony/rest-bundle",
-        "version": "^2.1"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "nelmio/api-doc-bundle",
-        "version": "^2.13"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "snc/redis-bundle",
-        "version": "^2.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "predis/predis",
-        "version": "^1.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "paragonie/halite",
-        "version": "^3.2"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "knplabs/knp-paginator-bundle",
-        "version": "^2.5"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "egeloen/base64-file-bundle",
-        "version": "^1.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "liip/imagine-bundle",
-        "version": "^1.7"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "sonata-project/admin-bundle",
-        "version": "^3.17"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "sonata-project/doctrine-orm-admin-bundle",
-        "version": "^3.1"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "doctrine/doctrine-fixtures-bundle",
-        "version": "^2.3"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "php-amqplib/rabbitmq-bundle",
-        "version": "^1.12"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "mtdowling/cron-expression",
-        "version": "^1.2"
-      }
-    ]
-  },
+  "dependencies": [
+    {
+      "identifier": "composer:php",
+      "requirement": "7.1.*",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:symfony/symfony",
+      "requirement": "3.2.*",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:sensio/distribution-bundle",
+      "requirement": "^5.0",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:doctrine/orm",
+      "requirement": "^2.5",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:doctrine/doctrine-bundle",
+      "requirement": "^1.6",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:doctrine/doctrine-cache-bundle",
+      "requirement": "^1.2",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:symfony/swiftmailer-bundle",
+      "requirement": "^2.3.10",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:symfony/monolog-bundle",
+      "requirement": "^3.0.2",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:symfony/polyfill-apcu",
+      "requirement": "^1.0",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:sensio/framework-extra-bundle",
+      "requirement": "^3.0.2",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:incenteev/composer-parameter-handler",
+      "requirement": "^2.0",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:twig/twig",
+      "requirement": "^1.0||^2.0",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:doctrine/doctrine-migrations-bundle",
+      "requirement": "^1.0",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:greenlion/php-sql-parser",
+      "requirement": "^4.1",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:eightpoints/guzzle-bundle",
+      "requirement": "^5.3",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:jms/serializer-bundle",
+      "requirement": "^1.1",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:friendsofsymfony/rest-bundle",
+      "requirement": "^2.1",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:nelmio/api-doc-bundle",
+      "requirement": "^2.13",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:snc/redis-bundle",
+      "requirement": "^2.0",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:predis/predis",
+      "requirement": "^1.0",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:paragonie/halite",
+      "requirement": "^3.2",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:knplabs/knp-paginator-bundle",
+      "requirement": "^2.5",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:egeloen/base64-file-bundle",
+      "requirement": "^1.0",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:liip/imagine-bundle",
+      "requirement": "^1.7",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:sonata-project/admin-bundle",
+      "requirement": "^3.17",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:sonata-project/doctrine-orm-admin-bundle",
+      "requirement": "^3.1",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:doctrine/doctrine-fixtures-bundle",
+      "requirement": "^2.3",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:php-amqplib/rabbitmq-bundle",
+      "requirement": "^1.12",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:mtdowling/cron-expression",
+      "requirement": "^1.2",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:sensio/generator-bundle",
+      "requirement": "^3.0",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:symfony/phpunit-bridge",
+      "requirement": "^3.2",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    }
+  ],
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/data/phpcomposer/slim/composer.json.expected b/tests/packagedcode/data/phpcomposer/slim/composer.json.expected
index 177f6906620..cae7d673ca5 100644
--- a/tests/packagedcode/data/phpcomposer/slim/composer.json.expected
+++ b/tests/packagedcode/data/phpcomposer/slim/composer.json.expected
@@ -1,7 +1,10 @@
 {
-  "type": "phpcomposer",
-  "name": "slim/slim",
+  "type": "composer",
+  "namespace": "slim",
+  "name": "slim",
   "version": null,
+  "qualifiers": null,
+  "path": null,
   "primary_language": "PHP",
   "code_type": null,
   "description": null,
@@ -59,49 +62,74 @@
   "vcs_repository": null,
   "vcs_revision": null,
   "copyright": null,
-  "asserted_license": "MIT",
   "license_expression": null,
+  "asserted_license": "MIT",
   "notice_text": null,
-  "dependencies": {
-    "development": [
-      {
-        "type": "phpcomposer",
-        "name": "squizlabs/php_codesniffer",
-        "version": "^2.5"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "phpunit/phpunit",
-        "version": "^4.0"
-      }
-    ],
-    "runtime": [
-      {
-        "type": "phpcomposer",
-        "name": "php",
-        "version": ">=5.5.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "pimple/pimple",
-        "version": "^3.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "psr/http-message",
-        "version": "^1.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "nikic/fast-route",
-        "version": "^1.0"
-      },
-      {
-        "type": "phpcomposer",
-        "name": "container-interop/container-interop",
-        "version": "^1.1"
-      }
-    ]
-  },
+  "dependencies": [
+    {
+      "identifier": "composer:php",
+      "requirement": ">=5.5.0",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:pimple/pimple",
+      "requirement": "^3.0",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:psr/http-message",
+      "requirement": "^1.0",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:nikic/fast-route",
+      "requirement": "^1.0",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:container-interop/container-interop",
+      "requirement": "^1.1",
+      "scope": "require",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:squizlabs/php_codesniffer",
+      "requirement": "^2.5",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:phpunit/phpunit",
+      "requirement": "^4.0",
+      "scope": "require-dev",
+      "is_runtime": false,
+      "is_optional": true,
+      "is_resolved": null
+    },
+    {
+      "identifier": "composer:psr/http-message-implementation",
+      "requirement": "1.0",
+      "scope": "provide",
+      "is_runtime": true,
+      "is_optional": null,
+      "is_resolved": null
+    }
+  ],
   "related_packages": []
 }
\ No newline at end of file
diff --git a/tests/packagedcode/test_maven.py b/tests/packagedcode/test_maven.py
index b5879a2bff9..612dc340e27 100644
--- a/tests/packagedcode/test_maven.py
+++ b/tests/packagedcode/test_maven.py
@@ -230,7 +230,7 @@ def test_parse_to_package(self):
                 OrderedDict([('type', u'Apache Maven POM'), ('name', u'org.springframework:spring-core'), ('version', u'4.2.2.RELEASE')]),
                 OrderedDict([('type', u'Apache Maven POM'), ('name', u'org.yaml:snakeyaml'), ('version',  u'1.16')]),
             ]}),
-            ('related_packages', [])
+            ('related_packages', []) 
         ]
         assert expected == package.to_dict().items()
         package.validate()
diff --git a/tests/packagedcode/test_nuget.py b/tests/packagedcode/test_nuget.py
index 5e9db86109b..37a84dd2d40 100644
--- a/tests/packagedcode/test_nuget.py
+++ b/tests/packagedcode/test_nuget.py
@@ -109,47 +109,53 @@ def test_parse_creates_package_from_nuspec(self):
         test_file = self.get_test_loc('nuget/Microsoft.Net.Http.nuspec')
         package = nuget.parse(test_file)
         expected = OrderedDict([
-            ('type', u'Nuget'),
-            ('name', u'Microsoft.Net.Http'),
-            ('version', u'2.2.29'),
-            ('primary_language', None),
-            ('code_type', None),
-            ('description',
+            (b'type', u'nuget'),
+            (b'namespace', None),
+            (b'name', u'Microsoft.Net.Http'),
+            (b'version', u'2.2.29'),
+            (b'qualifiers', None),
+            (b'path', None),
+            (b'primary_language', None),
+            (b'code_type', None),
+            (b'description',
                 u'Microsoft HTTP Client Libraries\n'
                 u'This package includes HttpClient for sending requests over HTTP, as well as HttpRequestMessage and HttpResponseMessage for '
                 u'processing HTTP messages.\n\nThis package is not supported in Visual Studio 2010, and is only required for projects targeting'
                 u' .NET Framework 4.5, Windows 8, or Windows Phone 8.1 when consuming a library that uses this package.\n\nSupported Platforms:'
                 u'\n- .NET Framework 4\n- Windows 8\n- Windows Phone 8.1\n- Windows Phone Silverlight 7.5\n- Silverlight 4\n- Portable Class Libraries'),
-            ('size', None),
-            ('release_date', None),
-            ('parties', [
+            (b'size', None),
+            (b'release_date', None),
+            (b'parties', [
                 OrderedDict([
-                    ('type', None),
-                    ('role', 'author'),
-                    ('name', u'Microsoft'),
-                    ('email', None),
-                    ('url', None)
+                    (b'type', None),
+                    (b'role', 'author'),
+                    (b'name', u'Microsoft'),
+                    (b'email', None),
+                    (b'url', None)
                 ]),
                 OrderedDict([
-                    ('type', None),
-                    ('role', 'owner'),
-                    ('name', u'Microsoft'),
-                    ('email', None),
-                    ('url', None)
+                    (b'type', None),
+                    (b'role', 'owner'),
+                    (b'name', u'Microsoft'),
+                    (b'email', None),
+                    (b'url', None)
                 ])
             ]),
-            ('keywords', []),
-            ('homepage_url', u'http://go.microsoft.com/fwlink/?LinkID=280055'),
-            ('download_url', None),
-            ('download_checksums', []),
-            ('bug_tracking_url', None),
-            ('code_view_url', None),
-            ('vcs_tool', None), ('vcs_repository', None), ('vcs_revision', None),
-            ('copyright', u'Copyright \xa9 Microsoft Corporation'),
-            ('asserted_license', u'http://go.microsoft.com/fwlink/?LinkId=329770'),
-            ('license_expression', None),
-            ('notice_text', None),
-            ('dependencies', {}), ('related_packages', [])])
+            (b'keywords', []),
+            (b'homepage_url', u'http://go.microsoft.com/fwlink/?LinkID=280055'),
+            (b'download_url', None),
+            (b'download_checksums', []),
+            (b'bug_tracking_url', None),
+            (b'code_view_url', None),
+            (b'vcs_tool', None), 
+            (b'vcs_repository', None), 
+            (b'vcs_revision', None),
+            (b'copyright', u'Copyright \xa9 Microsoft Corporation'),
+            (b'license_expression', None),
+            (b'asserted_license', u'http://go.microsoft.com/fwlink/?LinkId=329770'),
+            (b'notice_text', None),
+            (b'dependencies', []), 
+            (b'related_packages', [])])
 
 
         assert expected.items() == package.to_dict().items()
diff --git a/tests/packagedcode/test_package_models.py b/tests/packagedcode/test_package_models.py
index 5bb099af35f..4880ed7bbc1 100644
--- a/tests/packagedcode/test_package_models.py
+++ b/tests/packagedcode/test_package_models.py
@@ -42,8 +42,11 @@ def test_model_creation_and_dump(self):
         package = models.AndroidApp(name='someAndroidPAcakge')
         expected = [
             ('type', u'android'),
+            ('namespace', None),
             ('name', u'someAndroidPAcakge'),
             ('version', None),
+            ('qualifiers', None),
+            ('path', None),
             ('primary_language', u'Java'),
             ('code_type', None),
             ('description', None),
@@ -60,10 +63,10 @@ def test_model_creation_and_dump(self):
             ('vcs_repository', None),
             ('vcs_revision', None),
             ('copyright', None),
-            ('asserted_license', None),
             ('license_expression', None),
+            ('asserted_license', None),
             ('notice_text', None),
-            ('dependencies', {}),
+            ('dependencies', []),
             ('related_packages', [])
         ]
         assert expected == package.to_dict().items()
@@ -85,9 +88,12 @@ def test_validate_package(self):
             asserted_license='apache-2.0'
         )
         expected = [
-            ('type', 'rpm'),
+            ('type', u'rpm'),
+            ('namespace', None),
             ('name', u'Sample'),
             ('version', None),
+            ('qualifiers', None),
+            ('path', None),
             ('primary_language', None),
             ('code_type', None),
             ('description', u'Some package'),
@@ -96,7 +102,7 @@ def test_validate_package(self):
             ('parties', [
                 OrderedDict([
                     ('type', None),
-                    ('role', 'author'),
+                    ('role', u'author'),
                     ('name', u'Some Author'),
                     ('email', u'some@email.com'),
                     ('url', None)
@@ -112,10 +118,10 @@ def test_validate_package(self):
             ('vcs_repository', None),
             ('vcs_revision', None),
             ('copyright', None),
-            ('asserted_license', u'apache-2.0'),
             ('license_expression', None),
+            ('asserted_license', u'apache-2.0'),
             ('notice_text', None),
-            ('dependencies', {}),
+            ('dependencies', []),
             ('related_packages', [])
         ]
         assert expected == package.to_dict().items()
diff --git a/tests/packagedcode/test_rpm.py b/tests/packagedcode/test_rpm.py
index de6aeb20039..bca993dd865 100644
--- a/tests/packagedcode/test_rpm.py
+++ b/tests/packagedcode/test_rpm.py
@@ -40,9 +40,12 @@ def test_parse_to_package(self):
         test_file = self.get_test_loc('rpm/header/libproxy-bin-0.3.0-4.el6_3.x86_64.rpm')
         package = rpm.parse(test_file)
         expected = [
-            ('type', u'RPM'),
+            ('type', u'rpm'),
+            ('namespace', None),
             ('name', u'libproxy-bin'),
             ('version', u'0.3.0-4.el6_3'),
+            (b'qualifiers', None),
+            (b'path', None),
             ('primary_language', None),
             ('code_type', None),
             ('description',
@@ -53,7 +56,7 @@ def test_parse_to_package(self):
             ('parties', [
                 OrderedDict([
                     ('type', None),
-                    ('role', 'vendor'),
+                    ('role', u'vendor'),
                     ('name', u'CentOS'),
                     ('email', None),
                     ('url', None)])
@@ -68,17 +71,17 @@ def test_parse_to_package(self):
             ('vcs_repository', None),
             ('vcs_revision', None),
             ('copyright', None),
-            ('asserted_license', u'LGPLv2+'),
             ('license_expression', None),
+            ('asserted_license', u'LGPLv2+'),
             ('notice_text', None),
-            ('dependencies', {}),
-            ('related_packages',
-             [OrderedDict([
-                 ('type', u'RPM'),
-                 ('name', u'libproxy'),
-                 ('version', u'0.3.0-4.el6_3')])])
+            ('dependencies', []),
+            ('related_packages', [
+                OrderedDict([
+                    ('from_pid', u'rpm:libproxy@0.3.0-4.el6_3?arch=src'),
+                    ('relationship', u'source_of'),
+                    ('to_pid', u'rpm:libproxy-bin@0.3.0-4.el6_3?arch=x86_64')])
+            ])
         ]
-
         assert expected == package.to_dict().items()
         package.validate()
 
diff --git a/tests/scancode/data/composer/composer.expected.json b/tests/scancode/data/composer/composer.expected.json
index 5325b4f760a..0e5c36d87bb 100644
--- a/tests/scancode/data/composer/composer.expected.json
+++ b/tests/scancode/data/composer/composer.expected.json
@@ -12,9 +12,12 @@
       "type": "file",
       "packages": [
         {
-          "type": "phpcomposer",
-          "name": "laravel/laravel",
+          "type": "composer",
+          "namespace": "laravel",
+          "name": "laravel",
           "version": null,
+          "qualifiers": null,
+          "path": null,
           "primary_language": "PHP",
           "code_type": null,
           "description": null,
@@ -42,55 +45,75 @@
           "vcs_repository": null,
           "vcs_revision": null,
           "copyright": null,
-          "asserted_license": "MIT",
           "license_expression": null,
+          "asserted_license": "MIT",
           "notice_text": null,
-          "dependencies": {
-            "development": [
-              {
-                "type": "phpcomposer",
-                "name": "filp/whoops",
-                "version": "~2.0"
-              },
-              {
-                "type": "phpcomposer",
-                "name": "fzaninotto/faker",
-                "version": "~1.4"
-              },
-              {
-                "type": "phpcomposer",
-                "name": "mockery/mockery",
-                "version": "0.9.*"
-              },
-              {
-                "type": "phpcomposer",
-                "name": "phpunit/phpunit",
-                "version": "~6.0"
-              }
-            ],
-            "runtime": [
-              {
-                "type": "phpcomposer",
-                "name": "php",
-                "version": ">=7.0.0"
-              },
-              {
-                "type": "phpcomposer",
-                "name": "fideloper/proxy",
-                "version": "~3.3"
-              },
-              {
-                "type": "phpcomposer",
-                "name": "laravel/framework",
-                "version": "5.5.*"
-              },
-              {
-                "type": "phpcomposer",
-                "name": "laravel/tinker",
-                "version": "~1.0"
-              }
-            ]
-          },
+          "dependencies": [
+            {
+              "identifier": "composer:php",
+              "requirement": ">=7.0.0",
+              "scope": "require",
+              "is_runtime": true,
+              "is_optional": null,
+              "is_resolved": null
+            },
+            {
+              "identifier": "composer:fideloper/proxy",
+              "requirement": "~3.3",
+              "scope": "require",
+              "is_runtime": true,
+              "is_optional": null,
+              "is_resolved": null
+            },
+            {
+              "identifier": "composer:laravel/framework",
+              "requirement": "5.5.*",
+              "scope": "require",
+              "is_runtime": true,
+              "is_optional": null,
+              "is_resolved": null
+            },
+            {
+              "identifier": "composer:laravel/tinker",
+              "requirement": "~1.0",
+              "scope": "require",
+              "is_runtime": true,
+              "is_optional": null,
+              "is_resolved": null
+            },
+            {
+              "identifier": "composer:filp/whoops",
+              "requirement": "~2.0",
+              "scope": "require-dev",
+              "is_runtime": false,
+              "is_optional": true,
+              "is_resolved": null
+            },
+            {
+              "identifier": "composer:fzaninotto/faker",
+              "requirement": "~1.4",
+              "scope": "require-dev",
+              "is_runtime": false,
+              "is_optional": true,
+              "is_resolved": null
+            },
+            {
+              "identifier": "composer:mockery/mockery",
+              "requirement": "0.9.*",
+              "scope": "require-dev",
+              "is_runtime": false,
+              "is_optional": true,
+              "is_resolved": null
+            },
+            {
+              "identifier": "composer:phpunit/phpunit",
+              "requirement": "~6.0",
+              "scope": "require-dev",
+              "is_runtime": false,
+              "is_optional": true,
+              "is_resolved": null
+            }
+          ],
           "related_packages": []
         }
       ],
diff --git a/tests/scancode/data/only_findings/expected.json b/tests/scancode/data/only_findings/expected.json
index f6a83285cdf..dc9c977494c 100644
--- a/tests/scancode/data/only_findings/expected.json
+++ b/tests/scancode/data/only_findings/expected.json
@@ -18,8 +18,11 @@
       "packages": [
         {
           "type": "tarball",
+          "namespace": null,
           "name": null,
           "version": null,
+          "qualifiers": null,
+          "path": null,
           "primary_language": null,
           "code_type": null,
           "description": null,
@@ -36,10 +39,10 @@
           "vcs_repository": null,
           "vcs_revision": null,
           "copyright": null,
-          "asserted_license": null,
           "license_expression": null,
+          "asserted_license": null,
           "notice_text": null,
-          "dependencies": {},
+          "dependencies": [],
           "related_packages": []
         }
       ]
diff --git a/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json b/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json
index 78432a304e8..6be72b671e5 100644
--- a/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json
+++ b/tests/scancode/data/rpm/fping-2.4-0.b2.rhfc1.dag.i386.rpm.expected.json
@@ -12,9 +12,12 @@
       "type": "file",
       "packages": [
         {
-          "type": "RPM",
+          "type": "rpm",
+          "namespace": null,
           "name": "fping",
           "version": "2.4-0.b2.rhfc1.dag",
+          "qualifiers": null,
+          "path": null,
           "primary_language": null,
           "code_type": null,
           "description": "A utility to ping multiple hosts at once.\nfping is a ping-like program which uses the Internet Control Message\nProtocol (ICMP) echo request to determine if a target host is responding.\n\nfping is different from ping in that you can specify any number of hosts\non the command line, or specify a file containing the lists of hosts to\nping. Instead of trying one host until it timeouts or replies, fping will\nsend out a ping packet and move on to the next host in a round-robin fashion.\nIf a host replies, it is noted and removed from the list of hosts to check.\nIf a host does not respond within a certain time limit and/or retry limit it\nwill be considered unreachable.",
@@ -39,15 +42,15 @@
           "vcs_repository": null,
           "vcs_revision": null,
           "copyright": null,
-          "asserted_license": "distributable",
           "license_expression": null,
+          "asserted_license": "distributable",
           "notice_text": null,
-          "dependencies": {},
+          "dependencies": [],
           "related_packages": [
             {
-              "type": "RPM",
-              "name": "fping",
-              "version": "2.4-0.b2.rhfc1.dag"
+              "from_pid": "rpm:fping@2.4-0.b2.rhfc1.dag?arch=src",
+              "relationship": "source_of",
+              "to_pid": "rpm:fping@2.4-0.b2.rhfc1.dag?arch=i386"
             }
           ]
         }