diff --git a/SPDX-fields-maven-mapping.xlsx b/SPDX-fields-maven-mapping.xlsx
index 5d6af3e..30d70ca 100644
Binary files a/SPDX-fields-maven-mapping.xlsx and b/SPDX-fields-maven-mapping.xlsx differ
diff --git a/SpdxTools-POM-File-Example.xml b/SpdxTools-POM-File-Example.xml
new file mode 100644
index 0000000..4a3b257
--- /dev/null
+++ b/SpdxTools-POM-File-Example.xml
@@ -0,0 +1,455 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.spdx</groupId>
+	<artifactId>spdx-tools</artifactId>
+	<version>2.1.17-SNAPSHOT</version>
+	<name>SPDX tools</name>
+	<description>SPDX tools</description>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<url>http://spdx.org/tools</url>
+	<developers>
+		<developer>
+			<id>goneall</id>
+			<name>Gary O'Neall</name>
+			<email>gary@sourceauditor.com</email>
+			<organization>SPDX</organization>
+			<organizationUrl>http://spdx.org</organizationUrl>
+		</developer>
+	</developers>
+	<organization>
+		<name>Linux Foundation</name>
+		<url>http://www.linuxfoundation.org</url>
+	</organization>
+	<scm>
+		<url>https://github.com/spdx/tools</url>
+		<connection>scm:git:ssh://git@github.com:spdx/tools.git</connection>
+		<developerConnection>scm:git:ssh://git@github.com:spdx/tools.git</developerConnection>
+	</scm>
+	<distributionManagement>
+		<repository>
+			<id>bintray-spdx-spdx-tools</id>
+			<name>spdx-spdx-tools</name>
+        <url>https://api.bintray.com/maven/spdx/spdx-tools/spdx-tools-java/;publish=1</url>
+    </repository>
+	</distributionManagement>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<jena.version>3.10.0</jena.version>
+	</properties>
+	<dependencies>
+		<!-- JENA -->
+		<dependency>
+		<!-- Force the dependency version greater or equal to 0.11.0 for Jena - resolves vulnerability -->
+			<groupId>org.apache.thrift</groupId>
+			<artifactId>libthrift</artifactId>
+			<version>0.12.0</version>
+			<type>pom</type>
+		</dependency>
+		<dependency>
+		<!-- Force the dependency version to 2.9.8 for Jena - resolves vulnerability -->
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.9.8</version>
+		</dependency>
+		<dependency>
+		<!-- Force the dependency version to 1.18 for Jena - resolves vulnerability -->
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-compress</artifactId>
+			<version>1.18</version>
+		</dependency>
+		<dependency>
+		   <groupId>org.apache.jena</groupId>
+		   <artifactId>apache-jena-libs</artifactId>
+		   <version>${jena.version}</version>
+		   <type>pom</type>
+		</dependency>
+		<dependency>
+		   <groupId>org.apache.jena</groupId>
+		   <artifactId>jena-iri</artifactId>
+		   <version>${jena.version}</version>
+		   <type>jar</type>
+		 </dependency>
+		<dependency>
+			<groupId>org.antlr</groupId>
+			<artifactId>antlr</artifactId>
+			<version>3.4</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi</artifactId>
+			<version>3.17</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi-ooxml</artifactId>
+			<version>3.17</version>
+		</dependency>
+		<dependency>
+			<groupId>net.sf.opencsv</groupId>
+			<artifactId>opencsv</artifactId>
+			<version>2.3</version>
+		</dependency>
+		<dependency>
+			<groupId>nu.validator.htmlparser</groupId>
+			<artifactId>htmlparser</artifactId>
+			<version>1.4</version>
+		</dependency>
+		<dependency>
+			<groupId>net.sf.saxon</groupId>
+			<artifactId>saxon</artifactId>
+			<version>8.7</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jsoup</groupId>
+			<artifactId>jsoup</artifactId>
+			<version>1.11.3</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>24.1.1-jre</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.spullara.mustache.java</groupId>
+			<artifactId>compiler</artifactId>
+			<version>0.7.9</version>
+		</dependency>
+		<dependency>
+		    <groupId>org.apache.logging.log4j</groupId>
+		    <artifactId>log4j-api</artifactId>
+		    <version>2.10.0</version>
+		</dependency>
+		<dependency>
+		    <groupId>org.apache.logging.log4j</groupId>
+		    <artifactId>log4j-core</artifactId>
+		    <version>2.10.0</version>
+		</dependency>
+		<dependency>
+		    <groupId>org.apache.logging.log4j</groupId>
+		    <artifactId>log4j-slf4j-impl</artifactId>
+		    <version>2.10.0</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>2.8.0</version>
+		</dependency>
+		<dependency>
+			<groupId>net.sf.saxon</groupId>
+			<artifactId>saxon-dom</artifactId>
+			<version>8.7</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.cliftonlabs</groupId>
+			<artifactId>json-simple</artifactId>
+			<version>2.3.1</version>
+		</dependency>
+	</dependencies>
+	<profiles>
+		<profile>
+			<id>doclint-java8-disable</id>
+			<activation>
+				<jdk>[1.8,)</jdk>
+			</activation>
+			<properties>
+				<javadoc.opts>-Xdoclint:none</javadoc.opts>
+			</properties>
+		</profile>
+		<profile>
+			<id>gpg-signing</id>
+			<build>
+				<plugins>
+					<plugin>
+		      			<groupId>org.apache.maven.plugins</groupId>
+		      			<artifactId>maven-gpg-plugin</artifactId>
+		      			<version>1.6</version>
+		      			<executions>
+		        			<execution>
+		          				<id>sign-artifacts</id>
+		          				<phase>verify</phase>
+		          				<goals>
+		            				<goal>sign</goal>
+		          				</goals>
+		          				<configuration>
+		              				<keyname>${gpg.keyname}</keyname>
+		              				<passphraseServerId>${gpg.keyname}</passphraseServerId>
+		            			</configuration>
+		        			</execution>
+		      			</executions>
+	    			</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+
+	<build>
+		<sourceDirectory>src</sourceDirectory>
+		<testSourceDirectory>Test</testSourceDirectory>
+		<resources>
+			<resource>
+				<targetPath>resources</targetPath>
+				<filtering>false</filtering>
+				<directory>resources</directory>
+				<includes>
+					<include>**/*</include>
+				</includes>
+			</resource>
+			<resource>
+				<targetPath>META-INF</targetPath>
+				<filtering>false</filtering>
+				<directory>.</directory>
+				<includes>
+					<include>NOTICE</include>
+					<include>LICENSE</include>
+					<include>README.md</include>
+					<include>changelog</include>
+				</includes>
+			</resource>
+			<resource>
+				<directory>src</directory>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
+			</resource>
+		</resources>
+		<testResources>
+			<testResource>
+				<directory>Test</directory>
+				<excludes>
+					<exclude>**/*.java</exclude>
+				</excludes>
+			</testResource>
+			<testResource>
+				<filtering>false</filtering>
+				<directory>TestFiles</directory>
+				<includes>
+					<include>**/*</include>
+				</includes>
+			</testResource>
+		</testResources>
+
+		<plugins>
+			<plugin>
+				<groupId>org.spdx</groupId>
+					<artifactId>spdx-maven-plugin</artifactId>
+					<version>0.5.1</version>
+					<executions>
+						<execution>
+							<id>build-spdx</id>
+							<phase>prepare-package</phase>
+							<goals>
+								<goal>createSPDX</goal>
+							</goals>
+						</execution>
+					</executions>
+					<configuration>
+						<spdxFile>LICENSE.spdx</spdxFile>
+						<spdxDocumentNamespace>http://spdx.org/documents/spdx-tools{$version}</spdxDocumentNamespace>
+						<nonStandardLicenses>
+							<param>
+								<licenseId>LicenseRef-CyberNeko</licenseId>
+								<extractedText>The CyberNeko Software License, Version 1.0
+
+ 
+(C) Copyright 2002-2005, Andy Clark.  All rights reserved.
+ 
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer. 
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. The end-user documentation included with the redistribution,
+   if any, must include the following acknowledgment:  
+     "This product includes software developed by Andy Clark."
+   Alternately, this acknowledgment may appear in the software itself,
+   if and wherever such third-party acknowledgments normally appear.
+
+4. The names "CyberNeko" and "NekoHTML" must not be used to endorse
+   or promote products derived from this software without prior 
+   written permission. For written permission, please contact 
+   andyc@cyberneko.net.
+
+5. Products derived from this software may not be called "CyberNeko",
+   nor may "CyberNeko" appear in their name, without prior written
+   permission of the author.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR OTHER CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR 
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+====================================================================
+
+This license is based on the Apache Software License, version 1.1.</extractedText>
+							<name>The CyberNeko Software License, Version 1.0</name>
+						</param>
+					</nonStandardLicenses>
+					<defaultFileCopyright>Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017 Source Auditor Inc.</defaultFileCopyright>
+					<defaultFileContributors>
+						<param>Gary O'Neall</param>
+					</defaultFileContributors>
+					<defaultLicenseInformationInFile>Apache-2.0</defaultLicenseInformationInFile>
+					<defaultFileConcludedLicense>Apache-2.0</defaultFileConcludedLicense>
+					<defaultFileNotice>   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.</defaultFileNotice>
+					<licenseDeclared>Apache-2.0</licenseDeclared>
+					<licenseConcluded>(Apache-2.0 AND MIT AND LicenseRef-CyberNeko AND LGPL-2.1 AND BSD-3-Clause AND X11 AND MPL-1.0)</licenseConcluded>
+					<creators>
+						<param>Person: Gary O'Neall</param>
+					</creators>
+					<originator>Organization: Linux Foundation</originator>
+				</configuration>
+            </plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.6.1</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+					<encoding>${project.build.sourceEncoding}</encoding>
+					<showDeprecation>true</showDeprecation>
+					<showWarnings>true</showWarnings>
+					<optimize>true</optimize>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>2.6</version>
+				<configuration>
+					<encoding>${project.build.sourceEncoding}</encoding>
+				</configuration>
+			</plugin>
+			
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<version>2.2.1</version>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar-no-fork</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.9</version>
+				<configuration>
+					<quiet>true</quiet>				
+					<additionalparam>-Xdoclint:none</additionalparam>
+				</configuration>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<configuration>
+							<additionalparam>${javadoc.opts}</additionalparam>
+						</configuration>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+        			<groupId>org.apache.maven.plugins</groupId>
+        			<artifactId>maven-shade-plugin</artifactId>
+        			<configuration>
+          				<shadedArtifactAttached>true</shadedArtifactAttached>
+          				<shadedClassifierName>jar-with-dependencies</shadedClassifierName>
+          				<transformers>
+            				<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+              					<mainClass>org.spdx.tools.Main</mainClass>
+            				</transformer>
+            				<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+            				<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
+            				<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
+              					<addHeader>false</addHeader>
+              				</transformer>
+          				</transformers>
+          				<filters>
+          					<filter>
+          						<!--  Conflict with HTMLParser 1.4 -->
+          						<artifact>com.yevster.net.rootdev:java-rdfa</artifact>
+          						<excludes>
+          							<exclude>nu/validator/htmlparser/**</exclude>
+          						</excludes>
+          					</filter>
+            				<filter>
+              					<artifact>*:*</artifact>
+              					<excludes>
+                					<exclude>META-INF/*.SF</exclude>
+                					<exclude>META-INF/*.DSA</exclude>
+                					<exclude>META-INF/*.RSA</exclude>
+              					</excludes>
+            				</filter>
+          				</filters>
+        			</configuration>
+        			<executions>
+          				<execution>
+            				<phase>package</phase>
+            				<!--<phase /><!- - Switch off -->
+            				<goals>
+              					<goal>shade</goal>
+            				</goals>
+          				</execution>
+        			</executions>
+      			</plugin>
+		</plugins>
+	</build>
+	<reporting>
+    	<plugins>
+      		<plugin>
+        		<groupId>org.codehaus.mojo</groupId>
+        		<artifactId>findbugs-maven-plugin</artifactId>
+        		<version>3.0.1</version>
+      		</plugin>
+    	</plugins>
+  </reporting>
+</project>