diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c529d5befe..ed9b0413be1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -55,6 +55,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - In case the library contains empty entries, they are not written to disk. [#8645](https://github.com/JabRef/jabref/issues/8645)
 - The formatter `remove_unicode_ligatures` is now called `replace_unicode_ligatures`. [#9890](https://github.com/JabRef/jabref/pull/9890)
 
+
 ### Fixed
 
 - We fixed an issue where the browser import would add ' characters before the BibTeX entry on Linux. [#9588](https://github.com/JabRef/jabref/issues/9588)
diff --git a/build.gradle b/build.gradle
index 34ab610c984..6877e3b17df 100644
--- a/build.gradle
+++ b/build.gradle
@@ -261,7 +261,6 @@ processResources {
 
 task generateSource(dependsOn: ["generateBstGrammarSource",
                                 "generateSearchGrammarSource",
-                                "generateEndnoteSource",
                                 "generateCitaviSource"]) {
     group = 'JabRef'
     description 'Generates all necessary (Java) source files.'
@@ -289,14 +288,7 @@ tasks.register("generateSearchGrammarSource", JavaExec) {
     args  = ["-o","src-gen/main/java/org/jabref/search" , "-visitor", "-no-listener", "-package", "org.jabref.search", "$projectDir/src/main/antlr4/org/jabref/search/Search.g4"]
 }
 
-task generateEndnoteSource(type: XjcTask) {
-    group = 'JabRef'
-    description = "Generates java files for the endnote importer."
 
-    schemaFile = "src/main/resources/xjc/endnote/endnote.xsd"
-    outputDirectory = "src-gen/main/java/"
-    javaPackage = "org.jabref.logic.importer.fileformat.endnote"
-}
 
 task generateCitaviSource(type: XjcTask) {
     group = 'JabRef'
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporter.java
index 8ba682156cc..9134f9288e6 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporter.java
@@ -7,61 +7,38 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
 
+import javax.xml.XMLConstants;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.events.XMLEvent;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.Importer;
+import org.jabref.logic.importer.ParseException;
 import org.jabref.logic.importer.Parser;
 import org.jabref.logic.importer.ParserResult;
-import org.jabref.logic.importer.fileformat.endnote.Abstract;
-import org.jabref.logic.importer.fileformat.endnote.Authors;
-import org.jabref.logic.importer.fileformat.endnote.Contributors;
-import org.jabref.logic.importer.fileformat.endnote.Dates;
-import org.jabref.logic.importer.fileformat.endnote.ElectronicResourceNum;
-import org.jabref.logic.importer.fileformat.endnote.Isbn;
-import org.jabref.logic.importer.fileformat.endnote.Keyword;
-import org.jabref.logic.importer.fileformat.endnote.Keywords;
-import org.jabref.logic.importer.fileformat.endnote.Label;
-import org.jabref.logic.importer.fileformat.endnote.Notes;
-import org.jabref.logic.importer.fileformat.endnote.Number;
-import org.jabref.logic.importer.fileformat.endnote.Pages;
-import org.jabref.logic.importer.fileformat.endnote.PdfUrls;
-import org.jabref.logic.importer.fileformat.endnote.Publisher;
-import org.jabref.logic.importer.fileformat.endnote.Record;
-import org.jabref.logic.importer.fileformat.endnote.RefType;
-import org.jabref.logic.importer.fileformat.endnote.RelatedUrls;
-import org.jabref.logic.importer.fileformat.endnote.SecondaryTitle;
-import org.jabref.logic.importer.fileformat.endnote.Style;
-import org.jabref.logic.importer.fileformat.endnote.Title;
-import org.jabref.logic.importer.fileformat.endnote.Titles;
-import org.jabref.logic.importer.fileformat.endnote.Url;
-import org.jabref.logic.importer.fileformat.endnote.Urls;
-import org.jabref.logic.importer.fileformat.endnote.Volume;
-import org.jabref.logic.importer.fileformat.endnote.Xml;
-import org.jabref.logic.importer.fileformat.endnote.Year;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.KeywordList;
 import org.jabref.model.entry.LinkedFile;
+import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.IEEETranEntryType;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.strings.StringUtil;
-import org.jabref.model.util.OptionalUtil;
 
-import jakarta.xml.bind.JAXBContext;
-import jakarta.xml.bind.JAXBException;
-import jakarta.xml.bind.Unmarshaller;
+import com.google.common.base.Joiner;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -74,12 +51,15 @@ public class EndnoteXmlImporter extends Importer implements Parser {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(EndnoteXmlImporter.class);
     private final ImportFormatPreferences preferences;
-    private Unmarshaller unmarshaller;
 
     public EndnoteXmlImporter(ImportFormatPreferences preferences) {
         this.preferences = preferences;
     }
 
+    private static String join(List<String> list, String string) {
+        return Joiner.on(string).join(list);
+    }
+
     @Override
     public String getName() {
         return "EndNote XML";
@@ -115,47 +95,110 @@ public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader) throws IOException {
-        Objects.requireNonNull(reader);
+    public ParserResult importDatabase(BufferedReader input) throws IOException {
+        Objects.requireNonNull(input);
+
+        List<BibEntry> bibItems = new ArrayList<>();
+
         try {
-            Object unmarshalledObject = unmarshallRoot(reader);
-            if (unmarshalledObject instanceof Xml root) {
-                // We have an article set, an article, a book article or a book article set
-                List<BibEntry> bibEntries = root
-                        .getRecords().getRecord()
-                        .stream()
-                        .map(this::parseRecord)
-                        .collect(Collectors.toList());
-                return new ParserResult(bibEntries);
-            } else {
-                return ParserResult.fromErrorMessage("File does not start with xml tag.");
+            XMLInputFactory xmlInputFactory = XMLInputFactory.newInstance();
+
+            // prevent xxe (https://rules.sonarsource.com/java/RSPEC-2755)
+            xmlInputFactory.setProperty(XMLConstants.ACCESS_EXTERNAL_SCHEMA, "");
+            // required for reading Unicode characters such as &#xf6;
+            xmlInputFactory.setProperty(XMLInputFactory.IS_COALESCING, true);
+
+            XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(input);
+
+            while (reader.hasNext()) {
+                reader.next();
+                if (isStartXMLEvent(reader)) {
+                    String elementName = reader.getName().getLocalPart();
+                    if ("record".equals(elementName)) {
+                         parseRecord(reader, bibItems, elementName);
+                    }
+                }
             }
-        } catch (JAXBException | XMLStreamException e) {
+        } catch (XMLStreamException e) {
             LOGGER.debug("could not parse document", e);
             return ParserResult.fromError(e);
         }
+        return new ParserResult(bibItems);
     }
 
-    private Object unmarshallRoot(BufferedReader reader) throws XMLStreamException, JAXBException {
-        initUnmarshaller();
-
-        XMLInputFactory xmlInputFactory = XMLInputFactory.newFactory();
-        XMLStreamReader xmlStreamReader = xmlInputFactory.createXMLStreamReader(reader);
-
-        // Go to the root element
-        while (!xmlStreamReader.isStartElement()) {
-            xmlStreamReader.next();
+    private void parseRecord(XMLStreamReader reader, List<BibEntry> bibItems, String startElement)
+        throws XMLStreamException {
+
+        Map<Field, String> fields = new HashMap<>();
+        EntryType entryType = StandardEntryType.Article;
+
+        KeywordList keywordList = new KeywordList();
+        List<LinkedFile> linkedFiles = new ArrayList<>();
+
+        while (reader.hasNext()) {
+            reader.next();
+            if (isStartXMLEvent(reader)) {
+                String elementName = reader.getName().getLocalPart();
+                switch (elementName) {
+                    case "ref-type" -> {
+                        String type = reader.getAttributeValue(null, "name");
+                        entryType = convertRefNameToType(type);
+                    }
+                    case "contributors" -> {
+                        handleAuthorList(reader, fields, elementName);
+                    }
+                    case "titles" -> {
+                        handleTitles(reader, fields, elementName);
+                    }
+                    case "pages" -> {
+                        parseStyleContent(reader, fields, StandardField.PAGES, elementName);
+                    }
+                    case "volume" -> {
+                        parseStyleContent(reader, fields, StandardField.VOLUME, elementName);
+                    }
+                    case "number" -> {
+                        parseStyleContent(reader, fields, StandardField.NUMBER, elementName);
+                    }
+                    case "dates" -> {
+                        parseYear(reader, fields);
+                    }
+                    case "notes" -> {
+                        parseStyleContent(reader, fields, StandardField.NOTE, elementName);
+                    }
+                    case "urls" -> {
+                       handleUrlList(reader, fields, linkedFiles);
+                    }
+                    case "keywords" -> {
+                        handleKeywordsList(reader, keywordList, elementName);
+                    }
+                    case "abstract" -> {
+                        parseStyleContent(reader, fields, StandardField.ABSTRACT, elementName);
+                    }
+                    case "isbn" -> {
+                        parseStyleContent(reader, fields, StandardField.ISBN, elementName);
+                    }
+                    case "electronic-resource-num" -> {
+                        parseStyleContent(reader, fields, StandardField.DOI, elementName);
+                    }
+                    case "publisher" -> {
+                        parseStyleContent(reader, fields, StandardField.PUBLISHER, elementName);
+                    }
+                    case "label" -> {
+                        parseStyleContent(reader, fields, new UnknownField("endnote-label"), elementName);
+                    }
+                }
+            }
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
+                break;
+            }
         }
 
-        return unmarshaller.unmarshal(xmlStreamReader);
-    }
+        BibEntry entry = new BibEntry(entryType);
+        entry.putKeywords(keywordList, preferences.bibEntryPreferences().getKeywordSeparator());
 
-    private void initUnmarshaller() throws JAXBException {
-        if (unmarshaller == null) {
-            // Lazy init because this is expensive
-            JAXBContext context = JAXBContext.newInstance("org.jabref.logic.importer.fileformat.endnote");
-            unmarshaller = context.createUnmarshaller();
-        }
+        entry.setField(fields);
+        entry.setFiles(linkedFiles);
+        bibItems.add(entry);
     }
 
     private static EntryType convertRefNameToType(String refName) {
@@ -170,156 +213,258 @@ private static EntryType convertRefNameToType(String refName) {
         };
     }
 
-    private BibEntry parseRecord(Record endNoteRecord) {
-        BibEntry entry = new BibEntry();
-
-        entry.setType(getType(endNoteRecord));
-        Optional.ofNullable(getAuthors(endNoteRecord))
-                .ifPresent(value -> entry.setField(StandardField.AUTHOR, value));
-        Optional.ofNullable(endNoteRecord.getTitles())
-                .map(Titles::getTitle)
-                .map(Title::getStyle)
-                .map(this::mergeStyleContents)
-                .ifPresent(value -> entry.setField(StandardField.TITLE, clean(value)));
-        Optional.ofNullable(endNoteRecord.getTitles())
-                .map(Titles::getSecondaryTitle)
-                .map(SecondaryTitle::getStyle)
-                .map(Style::getContent)
-                .ifPresent(value -> entry.setField(StandardField.JOURNAL, clean(value)));
-        Optional.ofNullable(endNoteRecord.getPages())
-                .map(Pages::getStyle)
-                .map(Style::getContent)
-                .ifPresent(value -> entry.setField(StandardField.PAGES, value));
-        Optional.ofNullable(endNoteRecord.getNumber())
-                .map(Number::getStyle)
-                .map(Style::getContent)
-                .ifPresent(value -> entry.setField(StandardField.NUMBER, value));
-        Optional.ofNullable(endNoteRecord.getVolume())
-                .map(Volume::getStyle)
-                .map(Style::getContent)
-                .ifPresent(value -> entry.setField(StandardField.VOLUME, value));
-        Optional.ofNullable(endNoteRecord.getDates())
-                .map(Dates::getYear)
-                .map(Year::getStyle)
-                .map(Style::getContent)
-                .ifPresent(value -> entry.setField(StandardField.YEAR, value));
-        Optional.ofNullable(endNoteRecord.getNotes())
-                .map(Notes::getStyle)
-                .map(Style::getContent)
-                .ifPresent(value -> entry.setField(StandardField.NOTE, value.trim()));
-        getUrl(endNoteRecord)
-                .ifPresent(value -> entry.setField(StandardField.URL, value));
-        entry.putKeywords(getKeywords(endNoteRecord), preferences.bibEntryPreferences().getKeywordSeparator());
-        Optional.ofNullable(endNoteRecord.getAbstract())
-                .map(Abstract::getStyle)
-                .map(Style::getContent)
-                .ifPresent(value -> entry.setField(StandardField.ABSTRACT, value.trim()));
-        entry.setFiles(getLinkedFiles(endNoteRecord));
-        Optional.ofNullable(endNoteRecord.getIsbn())
-                .map(Isbn::getStyle)
-                .map(Style::getContent)
-                .ifPresent(value -> entry.setField(StandardField.ISBN, clean(value)));
-        Optional.ofNullable(endNoteRecord.getElectronicResourceNum())
-                .map(ElectronicResourceNum::getStyle)
-                .map(Style::getContent)
-                .ifPresent(doi -> entry.setField(StandardField.DOI, doi.trim()));
-        Optional.ofNullable(endNoteRecord.getPublisher())
-                .map(Publisher::getStyle)
-                .map(Style::getContent)
-                .ifPresent(value -> entry.setField(StandardField.PUBLISHER, value));
-        Optional.ofNullable(endNoteRecord.getLabel())
-                .map(Label::getStyle)
-                .map(Style::getContent)
-                .ifPresent(value -> entry.setField(new UnknownField("endnote-label"), value));
-
-        return entry;
+    private void handleAuthorList(XMLStreamReader reader, Map<Field, String> fields, String startElement) throws XMLStreamException {
+        List<String> authorNames = new ArrayList<>();
+
+        while (reader.hasNext()) {
+            reader.next();
+            if (isStartXMLEvent(reader)) {
+                String elementName = reader.getName().getLocalPart();
+                switch (elementName) {
+                    case "author" -> {
+                        parseAuthor(reader, authorNames);
+                    }
+                }
+            }
+
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
+                break;
+            }
+        }
+        fields.put(StandardField.AUTHOR, join(authorNames, " and "));
+    }
+
+    private void parseAuthor(XMLStreamReader reader, List<String> authorNames) throws XMLStreamException {
+
+        while (reader.hasNext()) {
+            reader.next();
+            if (isStartXMLEvent(reader)) {
+                String elementName = reader.getName().getLocalPart();
+                switch (elementName) {
+                    case "style" -> {
+                        reader.next();
+                        if (isCharacterXMLEvent(reader)) {
+                            authorNames.add(reader.getText());
+                        }
+                    }
+                }
+            }
+
+            if (isEndXMLEvent(reader) && "author".equals(reader.getName().getLocalPart())) {
+                break;
+            }
+        }
     }
 
-    private EntryType getType(Record endNoteRecord) {
-        return Optional.ofNullable(endNoteRecord.getRefType())
-                       .map(RefType::getName)
-                       .map(EndnoteXmlImporter::convertRefNameToType)
-                       .orElse(StandardEntryType.Article);
+    private void parseStyleContent(XMLStreamReader reader, Map<Field, String> fields, Field field, String elementName) throws XMLStreamException {
+        while (reader.hasNext()) {
+            reader.next();
+            if (isStartXMLEvent(reader)) {
+                String tag = reader.getName().getLocalPart();
+                if ("style".equals(tag)) {
+                    reader.next();
+                    if (isCharacterXMLEvent(reader)) {
+                        if ("abstract".equals(elementName) || "electronic-resource-num".equals(elementName) || "notes".equals(elementName)) {
+                            putIfValueNotNull(fields, field, reader.getText().trim());
+                        } else if ("isbn".equals(elementName) || "secondary-title".equals(elementName)) {
+                            putIfValueNotNull(fields, field, clean(reader.getText()));
+                        } else {
+                            putIfValueNotNull(fields, field, reader.getText());
+                        }
+                    }
+                }
+            }
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(elementName)) {
+                break;
+            }
+        }
     }
 
-    private List<LinkedFile> getLinkedFiles(Record endNoteRecord) {
-        Optional<PdfUrls> urls = Optional.ofNullable(endNoteRecord.getUrls())
-                                         .map(Urls::getPdfUrls);
-        return OptionalUtil.toStream(urls)
-                           .flatMap(pdfUrls -> pdfUrls.getUrl().stream())
-                           .flatMap(url -> OptionalUtil.toStream(getUrlValue(url)))
-                           .map(url -> {
-                               try {
-                                   return new LinkedFile(new URL(url), "PDF");
-                               } catch (MalformedURLException e) {
-                                   LOGGER.info("Unable to parse {}", url);
-                                   return null;
-                               }
-                           })
-                           .collect(Collectors.toList());
+    private void parseYear(XMLStreamReader reader, Map<Field, String> fields) throws XMLStreamException {
+        while (reader.hasNext()) {
+            reader.next();
+            if (isStartXMLEvent(reader)) {
+                String elementName = reader.getName().getLocalPart();
+                switch (elementName) {
+                    case "style" -> {
+                        reader.next();
+                        if (isCharacterXMLEvent(reader)) {
+                            putIfValueNotNull(fields, StandardField.YEAR, reader.getText());
+                        }
+                    }
+                }
+            }
+
+            if (isEndXMLEvent(reader) && "year".equals(reader.getName().getLocalPart())) {
+                break;
+            }
+        }
+    }
+
+    private void handleKeywordsList(XMLStreamReader reader, KeywordList keywordList, String startElement) throws XMLStreamException {
+
+        while (reader.hasNext()) {
+            reader.next();
+            if (isStartXMLEvent(reader)) {
+                String elementName = reader.getName().getLocalPart();
+                switch (elementName) {
+                    case "keyword" -> {
+                        parseKeyword(reader, keywordList);
+                    }
+                }
+            }
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
+                break;
+            }
+        }
     }
 
-    private Optional<String> getUrl(Record endNoteRecord) {
-        Optional<RelatedUrls> urls = Optional.ofNullable(endNoteRecord.getUrls())
-                                             .map(Urls::getRelatedUrls);
-        return OptionalUtil.toStream(urls)
-                           .flatMap(url -> url.getUrl().stream())
-                           .flatMap(url -> OptionalUtil.toStream(getUrlValue(url)))
-                           .findFirst();
+    private void parseKeyword(XMLStreamReader reader, KeywordList keywordList) throws XMLStreamException {
+
+        while (reader.hasNext()) {
+            reader.next();
+            if (isStartXMLEvent(reader)) {
+                String elementName = reader.getName().getLocalPart();
+                switch (elementName) {
+                    case "style" -> {
+                        reader.next();
+                        if (isCharacterXMLEvent(reader)) {
+                            if (reader.getText() != null) {
+                                keywordList.add(reader.getText());
+                            }
+                        }
+                    }
+                }
+            }
+
+            if (isEndXMLEvent(reader) && "keyword".equals(reader.getName().getLocalPart())) {
+                break;
+            }
+        }
     }
 
-    private String mergeStyleContents(List<Style> styles) {
-        return styles.stream().map(Style::getContent).collect(Collectors.joining());
+    private void handleTitles(XMLStreamReader reader, Map<Field, String> fields, String startElement) throws XMLStreamException {
+
+        while (reader.hasNext()) {
+            reader.next();
+            if (isStartXMLEvent(reader)) {
+                String elementName = reader.getName().getLocalPart();
+                switch (elementName) {
+                    case "title" -> {
+                        List<String> titleStyleContent = new ArrayList<>();
+                        while (reader.hasNext()) {
+                            reader.next();
+                            if (isStartXMLEvent(reader)) {
+                                String tag = reader.getName().getLocalPart();
+                                if ("style".equals(tag)) {
+                                    reader.next();
+                                    if (isCharacterXMLEvent(reader)) {
+                                        if (reader.getText() != null) {
+                                            titleStyleContent.add((reader.getText()));
+                                        }
+                                    }
+                                }
+                            }
+                            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(elementName)) {
+                                break;
+                            }
+                        }
+                        putIfValueNotNull(fields, StandardField.TITLE, clean(join(titleStyleContent, "")));
+                    }
+                    case "secondary-title" -> {
+                        parseStyleContent(reader, fields, StandardField.JOURNAL, elementName);
+                    }
+                }
+            }
+
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
+                break;
+            }
+        }
     }
 
-    private Optional<String> getUrlValue(Url url) {
-        Optional<List<Object>> urlContent = Optional.ofNullable(url).map(Url::getContent);
-        List<Object> list = urlContent.orElse(Collections.emptyList());
-        Optional<String> ret;
-        if (list.size() == 0) {
-            return Optional.empty();
-        } else {
-            boolean isStyleExist = false;
-            int style_index = -1;
-            for (int i = 0; i < list.size(); i++) {
-                if (list.get(i) instanceof Style) {
-                    isStyleExist = true;
-                    style_index = i;
+    private void handleUrlList(XMLStreamReader reader, Map<Field, String> fields, List<LinkedFile> linkedFiles) throws XMLStreamException {
+        while (reader.hasNext()) {
+            reader.next();
+            if (isStartXMLEvent(reader)) {
+                String elementName = reader.getName().getLocalPart();
+                switch (elementName) {
+                    case "related-urls" -> {
+                        parseRelatedUrls(reader, fields);
+                    }
+                    case "pdf-urls" -> {
+                        parsePdfUrls(reader, fields, linkedFiles);
+                    }
                 }
             }
-            if (!isStyleExist) {
-                ret = Optional.ofNullable((String) list.get(0))
-                        .map(this::clean);
-            } else {
-                ret = Optional.ofNullable((Style) list.get(style_index))
-                        .map(Style::getContent)
-                        .map(this::clean);
+
+            if (isEndXMLEvent(reader) && "urls".equals(reader.getName().getLocalPart())) {
+                break;
             }
         }
-        return ret;
     }
 
-    private List<String> getKeywords(Record endNoteRecord) {
-        Keywords keywords = endNoteRecord.getKeywords();
-        if (keywords != null) {
-            return keywords.getKeyword()
-                           .stream()
-                           .map(Keyword::getStyle)
-                           .filter(Objects::nonNull)
-                           .map(Style::getContent)
-                           .collect(Collectors.toList());
-        } else {
-            return Collections.emptyList();
+    private void parseRelatedUrls(XMLStreamReader reader, Map<Field, String> fields) throws XMLStreamException {
+
+        while (reader.hasNext()) {
+            reader.next();
+            if (isStartXMLEvent(reader)) {
+                String elementName = reader.getName().getLocalPart();
+                if ("style".equals(elementName)) {
+                    reader.next();
+                    if (isCharacterXMLEvent(reader)) {
+                        putIfValueNotNull(fields, StandardField.URL, reader.getText());
+                    }
+                }
+            } else if (isCharacterXMLEvent(reader)) {
+                String value = clean(reader.getText());
+                if (value.length() > 0) {
+                    putIfValueNotNull(fields, StandardField.URL, clean(value));
+                }
+            }
+
+            if (isEndXMLEvent(reader) && "related-urls".equals(reader.getName().getLocalPart())) {
+                break;
+            }
         }
     }
 
-    private String getAuthors(Record endNoteRecord) {
-        Optional<Authors> authors = Optional.ofNullable(endNoteRecord.getContributors())
-                                            .map(Contributors::getAuthors);
-        return OptionalUtil.toStream(authors)
-                           .flatMap(value -> value.getAuthor().stream())
-                           .map(author -> author.getStyle().getContent())
-                           .collect(Collectors.joining(" and "));
+    private void parsePdfUrls(XMLStreamReader reader, Map<Field, String> fields, List<LinkedFile> linkedFiles) throws XMLStreamException {
+
+        while (reader.hasNext()) {
+            reader.next();
+            if (isStartXMLEvent(reader)) {
+                String elementName = reader.getName().getLocalPart();
+                if ("url".equals(elementName)) {
+                    reader.next();
+                    if (isStartXMLEvent(reader)) {
+                        String tagName = reader.getName().getLocalPart();
+                        if ("style".equals(tagName)) {
+                            reader.next();
+                            if (isCharacterXMLEvent(reader)) {
+                                try {
+                                    linkedFiles.add(new LinkedFile(new URL(reader.getText()), "PDF"));
+                                } catch (
+                                        MalformedURLException e) {
+                                    LOGGER.info("Unable to parse {}", reader.getText());
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            if (isCharacterXMLEvent(reader)) {
+                try {
+                    linkedFiles.add(new LinkedFile(new URL(reader.getText()), "PDF"));
+                } catch (
+                        MalformedURLException e) {
+                    LOGGER.info("Unable to parse {}", reader.getText());
+                }
+            }
+            if (isEndXMLEvent(reader) && "pdf-urls".equals(reader.getName().getLocalPart())) {
+                break;
+            }
+        }
     }
 
     private String clean(String input) {
@@ -328,8 +473,26 @@ private String clean(String input) {
                          .replaceAll(" +", " ");
     }
 
+    private void putIfValueNotNull(Map<Field, String> fields, Field field, String value) {
+        if (value != null) {
+            fields.put(field, value);
+        }
+    }
+
+    private boolean isCharacterXMLEvent(XMLStreamReader reader) {
+        return reader.getEventType() == XMLEvent.CHARACTERS;
+    }
+
+    private boolean isStartXMLEvent(XMLStreamReader reader) {
+        return reader.getEventType() == XMLEvent.START_ELEMENT;
+    }
+
+    private boolean isEndXMLEvent(XMLStreamReader reader) {
+        return reader.getEventType() == XMLEvent.END_ELEMENT;
+    }
+
     @Override
-    public List<BibEntry> parseEntries(InputStream inputStream) {
+    public List<BibEntry> parseEntries(InputStream inputStream) throws ParseException {
         try {
             return importDatabase(
                     new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))).getDatabase().getEntries();
@@ -339,3 +502,8 @@ public List<BibEntry> parseEntries(InputStream inputStream) {
         return Collections.emptyList();
     }
 }
+
+
+
+
+
diff --git a/src/main/resources/xjc/endnote/endnote.xsd b/src/main/resources/xjc/endnote/endnote.xsd
deleted file mode 100644
index 1367fdf433d..00000000000
--- a/src/main/resources/xjc/endnote/endnote.xsd
+++ /dev/null
@@ -1,790 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xs:element name="xml">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="records"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="records">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="record"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="record">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="database"/>
-                <xs:element minOccurs="0" ref="source-app"/>
-                <xs:element minOccurs="0" ref="rec-number"/>
-                <xs:element minOccurs="0" ref="ref-type"/>
-                <xs:element minOccurs="0" ref="contributors"/>
-                <xs:element minOccurs="0" ref="auth-address"/>
-                <xs:element minOccurs="0" ref="auth-affiliaton"/>
-                <xs:element minOccurs="0" ref="titles"/>
-                <xs:element minOccurs="0" ref="periodical"/>
-                <xs:element minOccurs="0" ref="pages"/>
-                <xs:element minOccurs="0" ref="volume"/>
-                <xs:element minOccurs="0" ref="number"/>
-                <xs:element minOccurs="0" ref="issue"/>
-                <xs:element minOccurs="0" ref="secondary-volume"/>
-                <xs:element minOccurs="0" ref="secondary-issue"/>
-                <xs:element minOccurs="0" ref="num-vols"/>
-                <xs:element minOccurs="0" ref="edition"/>
-                <xs:element minOccurs="0" ref="section"/>
-                <xs:element minOccurs="0" ref="reprint-edition"/>
-                <xs:element minOccurs="0" ref="reprint-status"/>
-                <xs:element minOccurs="0" ref="keywords"/>
-                <xs:element minOccurs="0" ref="dates"/>
-                <xs:element minOccurs="0" ref="pub-location"/>
-                <xs:element minOccurs="0" ref="publisher"/>
-                <xs:element minOccurs="0" ref="orig-pub"/>
-                <xs:element minOccurs="0" ref="isbn"/>
-                <xs:element minOccurs="0" ref="accession-num"/>
-                <xs:element minOccurs="0" ref="call-num"/>
-                <xs:element minOccurs="0" ref="report-id"/>
-                <xs:element minOccurs="0" ref="coden"/>
-                <xs:element minOccurs="0" ref="electronic-resource-num"/>
-                <xs:element minOccurs="0" ref="abstract"/>
-                <xs:element minOccurs="0" ref="label"/>
-                <xs:element minOccurs="0" ref="image"/>
-                <xs:element minOccurs="0" ref="caption"/>
-                <xs:element minOccurs="0" ref="notes"/>
-                <xs:element minOccurs="0" ref="research-notes"/>
-                <xs:element minOccurs="0" ref="work-type"/>
-                <xs:element minOccurs="0" ref="reviewed-item"/>
-                <xs:element minOccurs="0" ref="availability"/>
-                <xs:element minOccurs="0" ref="remote-source"/>
-                <xs:element minOccurs="0" ref="meeting-place"/>
-                <xs:element minOccurs="0" ref="work-location"/>
-                <xs:element minOccurs="0" ref="work-extent"/>
-                <xs:element minOccurs="0" ref="pack-method"/>
-                <xs:element minOccurs="0" ref="size"/>
-                <xs:element minOccurs="0" ref="repro-ratio"/>
-                <xs:element minOccurs="0" ref="remote-database-name"/>
-                <xs:element minOccurs="0" ref="remote-database-provider"/>
-                <xs:element minOccurs="0" ref="language"/>
-                <xs:element minOccurs="0" ref="urls"/>
-                <xs:element minOccurs="0" ref="access-date"/>
-                <xs:element minOccurs="0" ref="modified-date"/>
-                <xs:element minOccurs="0" ref="custom1"/>
-                <xs:element minOccurs="0" ref="custom2"/>
-                <xs:element minOccurs="0" ref="custom3"/>
-                <xs:element minOccurs="0" ref="custom4"/>
-                <xs:element minOccurs="0" ref="custom5"/>
-                <xs:element minOccurs="0" ref="custom6"/>
-                <xs:element minOccurs="0" ref="custom7"/>
-                <xs:element minOccurs="0" ref="misc1"/>
-                <xs:element minOccurs="0" ref="misc2"/>
-                <xs:element minOccurs="0" ref="misc3"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="database">
-        <xs:complexType mixed="true">
-            <xs:attribute name="name"/>
-            <xs:attribute name="path"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="source-app">
-        <xs:complexType mixed="true">
-            <xs:attribute name="name"/>
-            <xs:attribute name="version"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="rec-number" type="xs:string"/>
-    <xs:element name="ref-type">
-        <xs:complexType mixed="true">
-            <xs:attribute name="name" use="required"/>
-        </xs:complexType>
-    </xs:element>
-    <!-- Author information -->
-    <xs:element name="contributors">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="authors"/>
-                <xs:element minOccurs="0" ref="secondary-authors"/>
-                <xs:element minOccurs="0" ref="tertiary-authors"/>
-                <xs:element minOccurs="0" ref="subsidiary-authors"/>
-                <xs:element minOccurs="0" ref="translated-authors"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="authors">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="author"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="secondary-authors">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="author"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="tertiary-authors">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="author"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="subsidiary-authors">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="author"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="translated-authors">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="author"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="author">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-            <xs:attribute name="corp-name"/>
-            <xs:attribute name="first-name"/>
-            <xs:attribute name="initials"/>
-            <xs:attribute name="last-name"/>
-            <xs:attribute name="middle-initial"/>
-            <xs:attribute name="role"/>
-            <xs:attribute name="salutation"/>
-            <xs:attribute name="suffix"/>
-            <xs:attribute name="title"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="auth-address">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="auth-affiliaton">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <!-- Title information -->
-    <xs:element name="titles">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="title"/>
-                <xs:element minOccurs="0" ref="secondary-title"/>
-                <xs:element minOccurs="0" ref="tertiary-title"/>
-                <xs:element minOccurs="0" ref="alt-title"/>
-                <xs:element minOccurs="0" ref="short-title"/>
-                <xs:element minOccurs="0" ref="translated-title"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="title">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="secondary-title">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="tertiary-title">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="alt-title">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="short-title">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="translated-title">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <!-- Periodical information -->
-    <xs:element name="periodical">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="full-title"/>
-                <xs:element minOccurs="0" ref="abbr-1"/>
-                <xs:element minOccurs="0" ref="abbr-2"/>
-                <xs:element minOccurs="0" ref="abbr-3"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="full-title">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="abbr-1">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="abbr-2">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="abbr-3">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <!-- Page range information -->
-    <xs:element name="pages">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-            <xs:attribute name="end"/>
-            <xs:attribute name="start"/>
-        </xs:complexType>
-    </xs:element>
-    <!-- Volume, issue, and edition information -->
-    <xs:element name="volume">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="number">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="issue">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="secondary-volume">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="secondary-issue">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="num-vols">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="edition">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="section">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="reprint-edition">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="reprint-status">
-        <xs:complexType>
-            <xs:attribute name="date"/>
-            <xs:attribute name="status" use="required">
-                <xs:simpleType>
-                    <xs:restriction base="xs:token">
-                        <xs:enumeration value="in-file"/>
-                        <xs:enumeration value="no-file"/>
-                        <xs:enumeration value="on-request"/>
-                    </xs:restriction>
-                </xs:simpleType>
-            </xs:attribute>
-        </xs:complexType>
-    </xs:element>
-    <!-- Keywords -->
-    <xs:element name="keywords">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="keyword"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="keyword">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <!-- Date information -->
-    <xs:element name="dates">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="year"/>
-                <xs:element minOccurs="0" ref="pub-dates"/>
-                <xs:element minOccurs="0" ref="copyright-dates"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="year">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-            <xs:attribute name="day"/>
-            <xs:attribute name="julian"/>
-            <xs:attribute name="month"/>
-            <xs:attribute name="year"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="pub-dates">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="date"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="copyright-dates">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="date"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="date">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-            <xs:attribute name="day"/>
-            <xs:attribute name="julian"/>
-            <xs:attribute name="month"/>
-            <xs:attribute name="year"/>
-        </xs:complexType>
-    </xs:element>
-    <!-- Publisher information -->
-    <xs:element name="pub-location">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="publisher">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="orig-pub">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <!-- Identifying numbers -->
-    <xs:element name="isbn">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="accession-num">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="call-num">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="report-id">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="coden">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="electronic-resource-num">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <!-- Abstract, notes, images, etc. -->
-    <xs:element name="abstract">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="label">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="image">
-        <xs:complexType mixed="true">
-            <xs:attribute name="file"/>
-            <xs:attribute name="name"/>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="caption">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="notes">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="research-notes">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <!-- Other detailed information on item -->
-    <xs:element name="work-type">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="reviewed-item">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="availability">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="remote-source">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="meeting-place">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="work-location">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="work-extent">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="pack-method">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="size">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="repro-ratio">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="remote-database-name">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="remote-database-provider">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="language">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <!-- URL information -->
-    <xs:element name="urls">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="web-urls"/>
-                <xs:element minOccurs="0" ref="pdf-urls"/>
-                <xs:element minOccurs="0" ref="text-urls"/>
-                <xs:element minOccurs="0" ref="related-urls"/>
-                <xs:element minOccurs="0" ref="image-urls"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="web-urls">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="url"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="pdf-urls">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="url"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="text-urls">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="url"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="related-urls">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="url"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="image-urls">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" ref="url"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="url">
-        <xs:complexType mixed="true">
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-            <xs:attribute name="has-ut">
-                <xs:simpleType>
-                    <xs:restriction base="xs:token">
-                        <xs:enumeration value="yes"/>
-                        <xs:enumeration value="no"/>
-                    </xs:restriction>
-                </xs:simpleType>
-            </xs:attribute>
-            <xs:attribute name="ppv-app"/>
-            <xs:attribute name="ppv-ref">
-                <xs:simpleType>
-                    <xs:restriction base="xs:token">
-                        <xs:enumeration value="yes"/>
-                        <xs:enumeration value="no"/>
-                    </xs:restriction>
-                </xs:simpleType>
-            </xs:attribute>
-            <xs:attribute name="ppv-ut"/>
-        </xs:complexType>
-    </xs:element>
-    <!-- Information about record -->
-    <xs:element name="access-date">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="modified-date">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <!-- Custom and miscellaneous fields -->
-    <xs:element name="custom1">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="custom2">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="custom3">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="custom4">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="custom5">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="custom6">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="custom7">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="misc1">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="misc2">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <xs:element name="misc3">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element minOccurs="0" ref="style"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    <!-- Styled text handling -->
-    <xs:element name="style">
-        <xs:complexType mixed="true">
-            <xs:attribute name="color"/>
-            <xs:attribute name="face" default="normal"/>
-            <xs:attribute name="font" default="default"/>
-            <xs:attribute name="size"/>
-        </xs:complexType>
-    </xs:element>
-</xs:schema>
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/EndnoteXmlImporterTest_EmptyKeywordStyle.bib b/src/test/resources/org/jabref/logic/importer/fileformat/EndnoteXmlImporterTest_EmptyKeywordStyle.bib
index 480febafa60..8f3f4d58339 100644
--- a/src/test/resources/org/jabref/logic/importer/fileformat/EndnoteXmlImporterTest_EmptyKeywordStyle.bib
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/EndnoteXmlImporterTest_EmptyKeywordStyle.bib
@@ -12,6 +12,6 @@ @Article{
   volume   = {30},
   isbn     = {1933-6586},
   journal  = {Med Acupunct},
-  keywords = {anxiety; craving; dependency; destress; health restoration; },
+  keywords = {anxiety; craving; dependency; destress; health restoration},
   year     = {2018},
 }