diff --git a/src/main/resources/mycore-classifications/orcidWorkType.xml b/src/main/resources/mycore-classifications/orcidWorkType.xml
index d7004b0..ef29ac2 100644
--- a/src/main/resources/mycore-classifications/orcidWorkType.xml
+++ b/src/main/resources/mycore-classifications/orcidWorkType.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0"?>
-<mycoreclass ID="orcidWorkType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:noNamespaceSchemaLocation="MCRClassification.xsd">
+<mycoreclass ID="orcidWorkType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="MCRClassification.xsd">
   <!--
         https://info.orcid.org/ufaqs/what-work-types-does-orcid-support
 
         ORCID allows for the addition of several types of works. Below is a list of the work types that are currently
         supported, which is largely consistent with the CASRAI Output Standard.
    -->
-
   <label xml:lang="de" text="ORCID Werktyp"/>
   <label xml:lang="en" text="ORCID work type"/>
+
   <categories>
     <!-- Publication-->
     <category ID="book">
@@ -56,7 +55,6 @@
       <label xml:lang="de" text="Zeitschriftenartikel"/>
       <label xml:lang="en" text="Journal article"
              description="Articles in peer-reviewed publications that disseminate the results of original research and scholarship."/>
-      <label xml:lang="x-mapping-xpath" text="mods:genre[substring-after(@valueURI,'#')='article'] and mods:relatedItem[@type='host']/mods:genre[substring-after(@valueURI,'#')='journal']" />
     </category>
     <category ID="journal-issue">
       <label xml:lang="de" text="Zeitschriftenausgabe"/>
@@ -81,14 +79,11 @@
       <label xml:lang="de" text="Zeitungsartikel"/>
       <label xml:lang="en" text="Newspaper article"
              description="Articles in a daily, weekly or monthly publication reporting on news and social issues aimed at the public."/>
-      <label xml:lang="x-mapping-xpath" text="mods:genre[substring-after(@valueURI,'#')='article'] and mods:relatedItem[@type='host']/mods:genre[substring-after(@valueURI,'#')='newspaper']" />
     </category>
     <category ID="online-resource">
       <label xml:lang="de" text="Online Ressource"/>
       <label xml:lang="en" text="Online resource"
              description="Information accessible only on the web via traditional technical methods"/>
-      <label xml:lang="x-mapping-xpath" text="mods:genre[substring-after(@valueURI,'#')='article'] and (not(mods:relatedItem[@type='host']) or mods:relatedItem[@type='host']/mods:genre[substring-after(@valueURI,'#')='blog'])" />
-      <label xml:lang="x-mapping-xpathfb" text="mods:genre[substring-after(@valueURI,'#')='article']" />
     </category>
     <category ID="preprint">
       <label xml:lang="de" text="Preprint"/>
@@ -102,148 +97,157 @@
     </category>
     <category ID="research-tool">
       <label xml:lang="de" text="Forschungswerkzeug"/>
-      <label xml:lang="en" text="Research tool"
-             description="Series of observations, measurements or facts identified from the research."/>
+      <label xml:lang="en" text="Research tool" description="Series of observations, measurements or facts identified from the research."/>
     </category>
     <category ID="review">
       <label xml:lang="de" text="Review"/>
-      <label xml:lang="en" text="Review"
-             description="A formal assessment of another&#x2019;s work. This is only available with API v3.0+"/>
+      <label xml:lang="en" text="Review" description="A formal assessment of another&#x2019;s work. This is only available with API v3.0+"/>
     </category>
     <category ID="supervised-student-publication">
       <label xml:lang="de" text="Betreute studentische Publikation"/>
-      <label xml:lang="en" text="Supervised student publication"
-             description="Articles on research findings published jointly with or supervised by the thesis adviser."/>
+      <label xml:lang="en" text="Supervised student publication" description="Articles on research findings published jointly with or supervised by the thesis adviser."/>
     </category>
     <category ID="test">
       <label xml:lang="de" text="Test"/>
-      <label xml:lang="en" text="Test"
-             description="Assessments that include tests designed for general university selection, selection into specific courses or other evaluation purposes."/>
+      <label xml:lang="en" text="Test" description="Assessments that include tests designed for general university selection, selection into specific courses or other evaluation purposes."/>
     </category>
     <category ID="translation">
       <label xml:lang="de" text="Übersetzung"/>
-      <label xml:lang="en" text="Translation"
-             description="Translations of books and articles that identify modifications to the original edition, such as a new or revised preface."/>
+      <label xml:lang="en" text="Translation" description="Translations of books and articles that identify modifications to the original edition, such as a new or revised preface."/>
     </category>
     <category ID="website">
       <label xml:lang="de" text="Website"/>
-      <label xml:lang="en" text="Website"
-             description="Stand-alone locations on the web where multiple types of information on a specific theme are available."/>
+      <label xml:lang="en" text="Website" description="Stand-alone locations on the web where multiple types of information on a specific theme are available."/>
     </category>
     <category ID="working-paper">
       <label xml:lang="de" text="Arbeitspapier"/>
-      <label xml:lang="en" text="working paper"
-             description="Preliminary versions of articles that have not undergone review but that may be shared for comment."/>
+      <label xml:lang="en" text="working paper" description="Preliminary versions of articles that have not undergone review but that may be shared for comment."/>
     </category>
 
     <!-- Conference -->
     <category ID="conference-abstract">
       <label xml:lang="de" text="Konferenz Abstrakt"/>
-      <label xml:lang="en" text="Conference abstract"
-             description="Texts of a specified length that states the issue to be discussed in a proposed conference paper."/>
+      <label xml:lang="en" text="Conference abstract" description="Texts of a specified length that states the issue to be discussed in a proposed conference paper."/>
     </category>
     <category ID="conference-paper">
       <label xml:lang="de" text="Konferenzpapier"/>
-      <label xml:lang="en" text="Conference paper"
-             description="Papers written alone or collaboratively, presented at an academic conference, and published in the proceedings (not in scholarly journals)."/>
+      <label xml:lang="en" text="Conference paper" description="Papers written alone or collaboratively, presented at an academic conference, and published in the proceedings (not in scholarly journals)."/>
     </category>
     <category ID="conference-poster">
       <label xml:lang="de" text="Konferenzposter"/>
-      <label xml:lang="en" text="Conference poster"
-             description="Posters displayed in a conference setting and conveying research highlights in an efficient manner by compelling graphics."/>
+      <label xml:lang="en" text="Conference poster" description="Posters displayed in a conference setting and conveying research highlights in an efficient manner by compelling graphics."/>
     </category>
 
     <!-- Intellectual Property -->
     <category ID="disclosure">
       <label xml:lang="de" text="Offenlegung"/>
-      <label xml:lang="en" text="Disclosure"
-             description="Publications that establish inventions as prior art thereby preventing others from patenting the same invention or concept."/>
+      <label xml:lang="en" text="Disclosure" description="Publications that establish inventions as prior art thereby preventing others from patenting the same invention or concept."/>
     </category>
     <category ID="license">
       <label xml:lang="de" text="Lizenz"/>
-      <label xml:lang="en" text="License"
-             description="Signed agreements to exploit a piece of IP such as a process, product, data, or software."/>
+      <label xml:lang="en" text="License" description="Signed agreements to exploit a piece of IP such as a process, product, data, or software."/>
     </category>
     <category ID="patent">
       <label xml:lang="de" text="Patent"/>
-      <label xml:lang="en" text="Patent"
-             description="A form of IP protection that defines the exclusive right by law for inventors and assignees to make use of and exploit their inventions, products or processes, for a limited period of time."/>
+      <label xml:lang="en" text="Patent" description="A form of IP protection that defines the exclusive right by law for inventors and assignees to make use of and exploit their inventions, products or processes, for a limited period of time."/>
     </category>
     <category ID="registered-copyright">
       <label xml:lang="de" text="eingetragenes Urheberrecht"/>
-      <label xml:lang="en" text="Registered copyright"
-             description="Registered ownership of rights under a system of laws for promoting both the creation of and access to artistic, literary, musical, dramatic and other creative works."/>
+      <label xml:lang="en" text="Registered copyright" description="Registered ownership of rights under a system of laws for promoting both the creation of and access to artistic, literary, musical, dramatic and other creative works."/>
     </category>
     <category ID="trademark">
       <label xml:lang="de" text="Warenzeichen"/>
-      <label xml:lang="en" text="Trademark"
-             description="Marks such as a name, word, phrase, logo, symbol, design, image of a product or service that indicates the source and provides the right to control the use of the identifier."/>
+      <label xml:lang="en" text="Trademark" description="Marks such as a name, word, phrase, logo, symbol, design, image of a product or service that indicates the source and provides the right to control the use of the identifier."/>
     </category>
 
     <!-- Other -->
     <category ID="annotation">
       <label xml:lang="de" text="Anmerkung"/>
-      <label xml:lang="en" text="Annotation"
-             description="Annotations contain comments or descriptions about another resource. This is only available with API v3.0+"/>
+      <label xml:lang="en" text="Annotation" description="Annotations contain comments or descriptions about another resource. This is only available with API v3.0+"/>
     </category>
     <category ID="artistic-performance">
       <label xml:lang="de" text="künstlerische Darbietung"/>
-      <label xml:lang="en" text="Artistic performance"
-             description="Collection of information records that, in combination, represent a full and up-to-date history of artistic or performance outputs resulting from, or related to, the person&#x2019;s research or scholarly activities."/>
+      <label xml:lang="en" text="Artistic performance" description="Collection of information records that, in combination, represent a full and up-to-date history of artistic or performance outputs resulting from, or related to, the person&#x2019;s research or scholarly activities."/>
     </category>
     <category ID="data-management-plan">
       <label xml:lang="de" text="Datenmanagementplan"/>
-      <label xml:lang="en" text="Data management plan"
-             description="A formal statement describing how research data will be managed and documented throughout a research project and the terms regarding the subsequent deposit of the data with a data repository for long-term management and preservation. This is only available with API v3.0+"/>
+      <label xml:lang="en" text="Data management plan" description="A formal statement describing how research data will be managed and documented throughout a research project and the terms regarding the subsequent deposit of the data with a data repository for long-term management and preservation. This is only available with API v3.0+"/>
     </category>
     <category ID="data-set">
       <label xml:lang="de" text="Datenset"/>
-      <label xml:lang="en" text="Data set"
-             description="A series of structured observations, measurements or facts identified from the research which can be stored in a database medium."/>
+      <label xml:lang="en" text="Data set" description="A series of structured observations, measurements or facts identified from the research which can be stored in a database medium."/>
     </category>
-    <category ID="inventio">
+    <category ID="invention">
       <label xml:lang="de" text="Erfindung"/>
-      <label xml:lang="en" text="Inventio" description="Practical and original outputs arising from research."/>
+      <label xml:lang="en" text="Invention" description="Practical and original outputs arising from research."/>
     </category>
     <category ID="lecture-speech">
       <label xml:lang="de" text="Vortragsrede"/>
-      <label xml:lang="en" text="Lecture speech"
-             description="An informative talk related to research delivered to an audience."/>
+      <label xml:lang="en" text="Lecture speech" description="An informative talk related to research delivered to an audience."/>
     </category>
     <category ID="physical-object">
       <label xml:lang="de" text="physisches Objekt"/>
-      <label xml:lang="en" text="Physical object"
-             description="A specimen, sample, or other physical object used for research purposes; an inanimate three-dimensional object or substance. This is only available with API v3.0+"/>
+      <label xml:lang="en" text="Physical object" description="A specimen, sample, or other physical object used for research purposes; an inanimate three-dimensional object or substance. This is only available with API v3.0+"/>
     </category>
     <category ID="research-technique">
       <label xml:lang="de" text="Forschungstechnik"/>
-      <label xml:lang="en" text="Research technique"
-             description="A practical methods or skills applied to particular tasks identified as part of the research."/>
+      <label xml:lang="en" text="Research technique" description="A practical methods or skills applied to particular tasks identified as part of the research."/>
     </category>
     <category ID="software">
       <label xml:lang="de" text="Software"/>
-      <label xml:lang="en" text="Software"
-             description="A program used to operate a computer or other technical device."/>
+      <label xml:lang="en" text="Software" description="A program used to operate a computer or other technical device."/>
     </category>
     <category ID="spin-off-company">
       <label xml:lang="de" text="Spin-off-Unternehmen"/>
-      <label xml:lang="en" text="Spin off company"
-             description="A company set up by a Research Organization to make commercial use of the results and findings of the Research project."/>
+      <label xml:lang="en" text="Spin off company" description="A company set up by a Research Organization to make commercial use of the results and findings of the Research project."/>
     </category>
     <category ID="standards-and-policy">
       <label xml:lang="de" text="Standards und Richtlinien"/>
-      <label xml:lang="en" text="Standards and policy"
-             description="The development of a rule or principle that is used as a basis for judgement."/>
+      <label xml:lang="en" text="Standards and policy" description="The development of a rule or principle that is used as a basis for judgement."/>
     </category>
     <category ID="technical-standard">
       <label xml:lang="de" text="technischer Standard"/>
-      <label xml:lang="en" text="Technical standard"
-             description="Technical Standards (industrial or otherwise) that have originated from the research projects in which new protocols, methods or materials may be developed."/>
+      <label xml:lang="en" text="Technical standard" description="Technical Standards (industrial or otherwise) that have originated from the research projects in which new protocols, methods or materials may be developed."/>
+    </category>
+    <category ID="conference-output">
+      <label xml:lang="de" text="Conference output"/>
+      <label xml:lang="en" text="Conference output" description="All kinds of digital resources contributed to a conference not covered by other more specific work types. For example conference reports, conference lectures, abstracts, demonstrations, workshops."/>
+    </category>
+    <category ID="Blog post">
+      <label xml:lang="de" text="Blog post"/>
+      <label xml:lang="en" text="Blog post" description="A piece of writing or other item of content published on a blog."/>
+    </category>
+    <category ID="encyclopedia-entry">
+      <label xml:lang="de" text="Encyclopedia entry"/>
+      <label xml:lang="en" text="Encyclopedia entry" description="Authored entries in a reference work or a compendium focusing on a particular domain or on all branches of knowledge."/>
+    </category>
+    <category ID="moving-image">
+      <label xml:lang="de" text="Moving image or video"/>
+      <label xml:lang="en" text="Moving image or video" description="A moving display, either generated dynamically by a computer program or formed from a series of pre-recorded still images imparting an impression of motion when shown in succession."/>
+    </category>
+    <category ID="conference-proceedings">
+      <label xml:lang="de" text="Conference proceedings"/>
+      <label xml:lang="en" text="Conference proceedings" description="Conference proceedings is the official record of a conference meeting. It is a collection of documents which corresponds to the presentations given at the conference. It may include additional content."/>
+    </category>
+    <category ID="public-speech">
+      <label xml:lang="de" text="Talk, interview, podcast or speech"/>
+      <label xml:lang="en" text="Talk, interview, podcast or speech" description="An oral presentation of information to the public. Including talks, interviews and podcasts."/>
+    </category>
+    <category ID="image">
+      <label xml:lang="de" text="Image"/>
+      <label xml:lang="en" text="Image" description="A visual representation other than text, a still image.A visual representation other than text, including all types of moving image and still image."/>
+    </category>
+    <category ID="musical-composition">
+      <label xml:lang="de" text="Musical composition"/>
+      <label xml:lang="en" text="Musical composition" description="Musical composition can refer to an original piece of music, the structure of a musical piece, or the process of creating a new piece of music."/>
+    </category>
+    <category ID="cartographic-material">
+      <label xml:lang="de" text="Cartographic material"/>
+      <label xml:lang="en" text="Cartographic material" description="Any material representing the whole or part of the earth or any celestial body at any scale. Cartographic materials include two- and three-dimensional maps and plans (including maps of imaginary places); aeronautical, navigational, and celestial charts; atlases; globes; block diagrams; sections; aerial photographs with a cartographic purpose; bird’s-eye views (map views), etc."/>
     </category>
     <category ID="other">
       <label xml:lang="de" text="Andere"/>
       <label xml:lang="en" text="Other" description="Any other type of work."/>
     </category>
-
   </categories>
 </mycoreclass>