diff --git a/doc/metadatamapping.md b/doc/metadatamapping.md
index 795f0ba..b63f377 100644
--- a/doc/metadatamapping.md
+++ b/doc/metadatamapping.md
@@ -1,31 +1,32 @@
 This is a mapping of the fields in `publication.cfg` to their counterparts in a TEI header
 
 # Mandatory values (according to database schema)
- - publicationdate: //t:teiHeader/t:fileDesc/t:publicationStmt/t:date/@when
- - language: //t:teiHeader/t:profileDesc/t:langUsage/t:language/@ident
- - license: //t:teiHeader/t:fileDesc/t:publicationStmt/t:availability/t:licence/text()
- - number: //t:teiHeader/t:fileDesc/t:titleStmt/t:title[@level='s']/@n
- - series: //t:teiHeader/t:fileDesc/t:titleStmt/t:title[@level='s']/text()
- - title: //t:teiHeader/t:fileDesc/t:titleStmt/t:title[@type='main']/text()
+ - PublicationDate: //t:teiHeader/t:fileDesc/t:publicationStmt/t:date/@when
+ - PublicationYear: //t:teiHeader/t:fileDesc/t:publicationStmt/t:date/@when truncate
+ - Language: //t:teiHeader/t:profileDesc/t:langUsage/t:language/@ident
+ - License: //t:teiHeader/t:fileDesc/t:publicationStmt/t:availability/t:licence/text()
+ - Number: //t:teiHeader/t:fileDesc/t:seriesStmt/t:idno[@type='number']/text()
+ - Serie: //t:teiHeader/t:fileDesc/t:seriesStmt/t:title/text()
+ - Title: //t:teiHeader/t:fileDesc/t:titleStmt/t:title[@type='main']/text()
 
 # Optional values (according to database schema)
- - subtitle: //t:teiHeader/t:fileDesc/t:titleStmt/t:title[@type='sub']/text()
- - isbn: //t:teiHeader/t:fileDesc/t:publicationStmt/t:idno[@type='ISBN']/text()
- - pages: //t:teiHeader/t:fileDesc/t:extent/t:measure[@commodity='pages']/@quantity
- - price: //t:teiHeader/t:fileDesc/t:extent/t:measure[@type='price']/@quantity
- - shoplink_url: //t:teiHeader/t:fileDesc/t:publicationStmt/t:idno[@type='shoplink']
- - brief_desc: //t:teiHeader/t:profileDesc/t:abstract[@n='BriefDescription']
- - detail_desc: //t:teiHeader/t:profileDesc/t:abstract[@n='DetailedDescription']
- - additional_info: //t:teiHeader/t:fileDesc/t:sourceDesc/t:abstract[@n='additionalinformation']
- - dedication: //t:text/t:front/t:div[@type='dedication']/t:ab/text()
- - submitters: //t:teiHeader/t:fileDesc/t:titleStmt/t:editor[@role='submitter']"
- - publicationmanagers: //t:teiHeader/t:fileDesc/t:titleStmt/t:editor[@role='publicationmanager']"
- - publicationassistants: //t:teiHeader/t:fileDesc/t:titleStmt/t:editor[@role='publicationassistant']"
- - editorialcoordinators: //t:teiHeader/t:fileDesc/t:titleStmt/t:editor[@role='editorialcoordinator']"
- - copyeditors: //t:teiHeader/t:fileDesc/t:titleStmt/t:editor[@role='copyeditor']"
- - translators: //t:teiHeader/t:fileDesc/t:titleStmt/t:editor[@role='translator']"
- - keywords: //t:teiHeader/t:profileDesc/t:textClass/t:keywords/t:list/t:item"
- - authors: //t:teiHeader/t:fileDesc/t:titleStmt/t:author"
- - editors: //t:teiHeader/t:fileDesc/t:titleStmt/t:editor[@role='volumeditor']"
- - zusatz: //t:teiHeader/t:fileDesc/t:titleStmt/t:editor"
- - suggestedcitation: //t:teiHeader/t:fileDesc/t:sourceDesc/t:bibl/text()
+ - Subtitle: //t:teiHeader/t:fileDesc/t:titleStmt/t:title[@type='sub']/text()
+ - ISBN: //t:teiHeader/t:fileDesc/t:publicationStmt/t:idno[@type='isbn']/text()
+ - Price: //t:teiHeader/t:fileDesc/t:extent/t:measure[@type='price']/@quantity + //t:teiHeader/t:fileDesc/t:extent/t:measure[@type='price']/@unit
+ - Pages: //t:teiHeader/t:fileDesc/t:extent/t:measure[@commodity='pages']/@quantity
+ - Shoplink: //t:teiHeader/t:fileDesc/t:publicationStmt/t:idno[@type='shoplink']/text() + //t:teiHeader/t:fileDesc/t:publicationStmt/t:distributor/t:orgName/text()
+ - BriefDescription: //t:teiHeader/t:profileDesc/t:abstract[@n='brief']/p/text()
+ - DetailedDescription: //t:teiHeader/t:profileDesc/t:abstract[@n='detailed']/p/text()
+ - Dedication: //t:text/t:front/t:div[@type='dedication']/t:ab/text()
+ - Submitter: //t:teiHeader/t:fileDesc/t:titleStmt/t:editor[@role='submitter']/@ref
+ - EditorialCoordination: //t:teiHeader/t:fileDesc/t:titleStmt/t:editor[@role='editorialcoordinator']/@ref
+ - Copyediting: //t:teiHeader/t:fileDesc/t:titleStmt/t:editor[@role='copyeditor']/@ref
+ - Translator: //t:teiHeader/t:fileDesc/t:titleStmt/t:editor[@role='translator']/@ref
+ - Author1..5: //t:teiHeader/t:fileDesc/t:titleStmt/t:author/@ref or //t:teiHeader/t:fileDesc/t:titleStmt/t:editor[@role='volumeeditor']/@ref
+ - Zusatz: set, if //t:teiHeader/t:fileDesc/t:titleStmt/t:editor[@role='volumeeditor']/@ref
+
+# Fields that are currently ignored  by publicationimport
+ - Keyword1..6: //t:teiHeader/t:profileDesc/t:textClass/t:keywords/t:list/t:item
+ - PublicationManagement: //t:teiHeader/t:fileDesc/t:titleStmt/t:editor[@role='publicationmanager']/@ref
+ - PublicationAssistants: //t:teiHeader/t:fileDesc/t:titleStmt/t:editor[@role='publicationassistant']/@ref
+ - AdditionalInformation: //t:teiHeader/t:profileDesc/t:abstract[@n='additional']/p/text()